Skip to content

Commit 42c72f2

Browse files
committed
refactor: remove extras.py and consolidate error types in utils/errors.py
- Moved all error type definitions (JSONRPCError, A2AError, etc.) to utils/errors.py - Updated all imports across 15 files to use a2a.utils.errors - Defined A2ARequest union inline in types/__init__.py - Deleted the now-redundant extras.py file - Re-exported error types from types/__init__.py for public API
1 parent 6462801 commit 42c72f2

16 files changed

Lines changed: 189 additions & 257 deletions

File tree

src/a2a/client/errors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from typing import Any
44

5-
from a2a.types.extras import A2AError
5+
from a2a.utils.errors import A2AError
66

77

88
class A2AClientError(Exception):

src/a2a/server/agent_execution/context.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
from a2a.types.a2a_pb2 import (
1010
Message,
1111
SendMessageConfiguration,
12+
SendMessageRequest,
1213
Task,
1314
)
14-
from a2a.types.extras import InvalidParamsError, SendMessageRequest
1515
from a2a.utils import get_message_text
16-
from a2a.utils.errors import ServerError
16+
from a2a.utils.errors import InvalidParamsError, ServerError
1717

1818

1919
class RequestContext:

src/a2a/server/apps/jsonrpc/jsonrpc_app.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from a2a.server.context import ServerCallContext
2222
from a2a.server.request_handlers.jsonrpc_handler import JSONRPCHandler
2323
from a2a.server.request_handlers.request_handler import RequestHandler
24+
from a2a.types import A2ARequest
2425
from a2a.types.a2a_pb2 import (
2526
AgentCard,
2627
CancelTaskRequest,
@@ -33,23 +34,22 @@
3334
SetTaskPushNotificationConfigRequest,
3435
SubscribeToTaskRequest,
3536
)
36-
from a2a.types.extras import (
37+
from a2a.utils.constants import (
38+
AGENT_CARD_WELL_KNOWN_PATH,
39+
DEFAULT_RPC_URL,
40+
EXTENDED_AGENT_CARD_PATH,
41+
PREV_AGENT_CARD_WELL_KNOWN_PATH,
42+
)
43+
from a2a.utils.errors import (
3744
A2AError,
38-
A2ARequest,
3945
InternalError,
4046
InvalidParamsError,
4147
InvalidRequestError,
4248
JSONParseError,
4349
MethodNotFoundError,
50+
MethodNotImplementedError,
4451
UnsupportedOperationError,
4552
)
46-
from a2a.utils.constants import (
47-
AGENT_CARD_WELL_KNOWN_PATH,
48-
DEFAULT_RPC_URL,
49-
EXTENDED_AGENT_CARD_PATH,
50-
PREV_AGENT_CARD_WELL_KNOWN_PATH,
51-
)
52-
from a2a.utils.errors import MethodNotImplementedError
5353

5454

5555
logger = logging.getLogger(__name__)

src/a2a/server/apps/rest/rest_adapter.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,15 @@
3737
from a2a.server.request_handlers.request_handler import RequestHandler
3838
from a2a.server.request_handlers.rest_handler import RESTHandler
3939
from a2a.types.a2a_pb2 import AgentCard
40-
from a2a.types.extras import AuthenticatedExtendedCardNotConfiguredError
4140
from a2a.utils.error_handlers import (
4241
rest_error_handler,
4342
rest_stream_error_handler,
4443
)
45-
from a2a.utils.errors import InvalidRequestError, ServerError
44+
from a2a.utils.errors import (
45+
AuthenticatedExtendedCardNotConfiguredError,
46+
InvalidRequestError,
47+
ServerError,
48+
)
4649

4750

4851
logger = logging.getLogger(__name__)

src/a2a/server/events/event_consumer.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
TaskState,
1414
TaskStatusUpdateEvent,
1515
)
16-
from a2a.types.extras import InternalError
17-
from a2a.utils.errors import ServerError
16+
from a2a.utils.errors import InternalError, ServerError
1817
from a2a.utils.telemetry import SpanKind, trace_class
1918

2019

src/a2a/server/request_handlers/default_request_handler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
TaskPushNotificationConfig,
4343
TaskState,
4444
)
45-
from a2a.types.extras import (
45+
from a2a.utils.errors import (
4646
InternalError,
4747
InvalidParamsError,
48+
ServerError,
4849
TaskNotCancelableError,
4950
TaskNotFoundError,
5051
UnsupportedOperationError,
5152
)
52-
from a2a.utils.errors import ServerError
5353
from a2a.utils.task import apply_history_length
5454
from a2a.utils.telemetry import SpanKind, trace_class
5555

src/a2a/server/request_handlers/grpc_handler.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@
3232
from a2a.server.request_handlers.request_handler import RequestHandler
3333
from a2a.types import a2a_pb2
3434
from a2a.types.a2a_pb2 import AgentCard
35-
from a2a.types.extras import TaskNotFoundError
3635
from a2a.utils import proto_utils
37-
from a2a.utils.errors import ServerError
36+
from a2a.utils.errors import ServerError, TaskNotFoundError
3837
from a2a.utils.helpers import validate, validate_async_generator
3938

4039

src/a2a/server/request_handlers/jsonrpc_handler.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
SubscribeToTaskRequest,
2525
Task,
2626
)
27-
from a2a.types.extras import (
27+
from a2a.utils import proto_utils
28+
from a2a.utils.errors import (
2829
AuthenticatedExtendedCardNotConfiguredError,
2930
InternalError,
31+
ServerError,
3032
TaskNotFoundError,
3133
)
32-
from a2a.utils import proto_utils
33-
from a2a.utils.errors import ServerError
3434
from a2a.utils.helpers import validate
3535
from a2a.utils.telemetry import SpanKind, trace_class
3636

src/a2a/server/request_handlers/request_handler.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
Task,
1818
TaskPushNotificationConfig,
1919
)
20-
from a2a.types.extras import UnsupportedOperationError
21-
from a2a.utils.errors import ServerError
20+
from a2a.utils.errors import ServerError, UnsupportedOperationError
2221

2322

2423
class RequestHandler(ABC):

src/a2a/server/request_handlers/response_helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from a2a.types.a2a_pb2 import (
1818
SendMessageResponse as SendMessageResponseProto,
1919
)
20-
from a2a.types.extras import (
20+
from a2a.utils.errors import (
2121
A2AError,
2222
InvalidAgentResponseError,
2323
JSONRPCError,

0 commit comments

Comments
 (0)