Skip to content

Commit 235b880

Browse files
committed
chore: Ran formatting
1 parent cb4c958 commit 235b880

File tree

17 files changed

+80
-57
lines changed

17 files changed

+80
-57
lines changed

examples/google_adk/calendar_agent/__main__.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
import logging
22
import os
3-
import sys
43

54
import click
65
import uvicorn
76

8-
from adk_agent_executor import ADKAgentExecutor
97
from adk_agent import create_agent
8+
from adk_agent_executor import ADKAgentExecutor
109
from dotenv import load_dotenv
10+
from google.adk.artifacts import InMemoryArtifactService
11+
from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
12+
from google.adk.runners import Runner
13+
from google.adk.sessions import InMemorySessionService
14+
from starlette.applications import Starlette
15+
from starlette.requests import Request
16+
from starlette.responses import PlainTextResponse
17+
from starlette.routing import Route
1118

12-
from a2a.server.tasks import InMemoryTaskStore
1319
from a2a.server.apps import A2AStarletteApplication
1420
from a2a.server.request_handlers import DefaultRequestHandler
21+
from a2a.server.tasks import InMemoryTaskStore
1522
from a2a.types import (
1623
AgentAuthentication,
1724
AgentCapabilities,
1825
AgentCard,
1926
AgentSkill,
2027
)
21-
from google.adk.artifacts import InMemoryArtifactService
22-
from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
23-
from google.adk.runners import Runner
24-
from google.adk.sessions import InMemorySessionService
25-
from starlette.applications import Starlette
26-
from starlette.routing import Route
27-
from starlette.requests import Request
28-
from starlette.responses import PlainTextResponse
28+
2929

3030
load_dotenv()
3131

examples/google_adk/calendar_agent/adk_agent_executor.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import asyncio
22
import logging
3+
34
from collections import namedtuple
45
from collections.abc import AsyncGenerator
5-
from typing import Dict
66
from urllib.parse import parse_qs, urlparse
77

88
from google.adk import Runner
@@ -27,6 +27,7 @@
2727
from a2a.utils.errors import ServerError
2828
from a2a.utils.message import new_agent_text_message
2929

30+
3031
logger = logging.getLogger(__name__)
3132
logger.setLevel(logging.DEBUG)
3233

@@ -42,7 +43,7 @@
4243
class ADKAgentExecutor(AgentExecutor):
4344
"""An AgentExecutor that runs an ADK-based Agent."""
4445

45-
_awaiting_auth: Dict[str, asyncio.Future]
46+
_awaiting_auth: dict[str, asyncio.Future]
4647

4748
def __init__(self, runner: Runner, card: AgentCard):
4849
self.runner = runner
@@ -95,13 +96,13 @@ async def _process_request(
9596
# Break out of event handling loop -- no more work will be done until the authorization
9697
# is received.
9798
break
98-
elif event.is_final_response():
99+
if event.is_final_response():
99100
parts = convert_genai_parts_to_a2a(event.content.parts)
100101
logger.debug('Yielding final response: %s', parts)
101102
task_updater.add_artifact(parts)
102103
task_updater.complete()
103104
break
104-
elif not event.get_function_calls():
105+
if not event.get_function_calls():
105106
logger.debug('Yielding update response')
106107
task_updater.update_status(
107108
TaskState.working,
@@ -245,23 +246,21 @@ def convert_a2a_part_to_genai(part: Part) -> types.Part:
245246
part = part.root
246247
if isinstance(part, TextPart):
247248
return types.Part(text=part.text)
248-
elif isinstance(part, FilePart):
249+
if isinstance(part, FilePart):
249250
if isinstance(part.file, FileWithUri):
250251
return types.Part(
251252
file_data=types.FileData(
252253
file_uri=part.file.uri, mime_type=part.file.mime_type
253254
)
254255
)
255-
elif isinstance(part.file, FileWithBytes):
256+
if isinstance(part.file, FileWithBytes):
256257
return types.Part(
257258
inline_data=types.Blob(
258259
data=part.file.bytes, mime_type=part.file.mime_type
259260
)
260261
)
261-
else:
262-
raise ValueError(f'Unsupported file type: {type(part.file)}')
263-
else:
264-
raise ValueError(f'Unsupported part type: {type(part)}')
262+
raise ValueError(f'Unsupported file type: {type(part.file)}')
263+
raise ValueError(f'Unsupported part type: {type(part)}')
265264

266265

267266
def convert_genai_parts_to_a2a(parts: list[types.Part]) -> list[Part]:
@@ -277,14 +276,14 @@ def convert_genai_part_to_a2a(part: types.Part) -> Part:
277276
"""Convert a single Google GenAI Part type into an A2A Part type."""
278277
if part.text:
279278
return TextPart(text=part.text)
280-
elif part.file_data:
279+
if part.file_data:
281280
return FilePart(
282281
file=FileWithUri(
283282
uri=part.file_data.file_uri,
284283
mime_type=part.file_data.mime_type,
285284
)
286285
)
287-
elif part.inline_data:
286+
if part.inline_data:
288287
return Part(
289288
root=FilePart(
290289
file=FileWithBytes(
@@ -293,14 +292,13 @@ def convert_genai_part_to_a2a(part: types.Part) -> Part:
293292
)
294293
)
295294
)
296-
else:
297-
raise ValueError(f'Unsupported part type: {part}')
295+
raise ValueError(f'Unsupported part type: {part}')
298296

299297

300298
def get_auth_request_function_call(event: Event) -> types.FunctionCall:
301299
"""Get the special auth request function call from the event"""
302300
if not (event.content and event.content.parts):
303-
return
301+
return None
304302
for part in event.content.parts:
305303
if (
306304
part

examples/helloworld/agent_executor.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
from a2a.server.agent_execution import AgentExecutor, RequestContext
44
from a2a.server.events import EventQueue
5-
from a2a.types import (
6-
Task,
7-
)
85
from a2a.utils import new_agent_text_message
96

107

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from a2a.server.agent_execution.agent_executor import AgentExecutor
22
from a2a.server.agent_execution.context import RequestContext
33

4+
45
__all__ = ['AgentExecutor', 'RequestContext']

src/a2a/server/agent_execution/context.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
Message,
66
MessageSendParams,
77
Task,
8-
TextPart,
98
)
109
from a2a.utils import get_message_text
1110
from a2a.utils.errors import ServerError

src/a2a/server/apps/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
from a2a.server.apps.starlette_app import A2AStarletteApplication
33

44

5-
__all__ = ['HttpApp', 'A2AStarletteApplication']
5+
__all__ = ['A2AStarletteApplication', 'HttpApp']

src/a2a/server/apps/starlette_app.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1-
from collections.abc import AsyncGenerator
21
import json
32
import logging
43
import traceback
4+
5+
from collections.abc import AsyncGenerator
56
from typing import Any
67

8+
from pydantic import ValidationError
9+
from sse_starlette.sse import EventSourceResponse
10+
from starlette.applications import Starlette
11+
from starlette.requests import Request
12+
from starlette.responses import JSONResponse, Response
13+
from starlette.routing import Route
14+
715
from a2a.server.request_handlers.jsonrpc_handler import (
816
JSONRPCHandler,
917
RequestHandler,
@@ -29,12 +37,6 @@
2937
UnsupportedOperationError,
3038
)
3139
from a2a.utils.errors import MethodNotImplementedError
32-
from pydantic import ValidationError
33-
from sse_starlette.sse import EventSourceResponse
34-
from starlette.applications import Starlette
35-
from starlette.requests import Request
36-
from starlette.responses import JSONResponse, Response
37-
from starlette.routing import Route
3840

3941

4042
logger = logging.getLogger(__name__)
@@ -116,7 +118,7 @@ async def _handle_requests(self, request: Request) -> Response:
116118
return await self._process_non_streaming_request(
117119
request_id, a2a_request
118120
)
119-
except MethodNotImplementedError as e:
121+
except MethodNotImplementedError:
120122
traceback.print_exc()
121123
return self._generate_error_response(
122124
request_id, A2AError(root=UnsupportedOperationError())

src/a2a/server/events/__init__.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
from a2a.server.events.event_consumer import EventConsumer
22
from a2a.server.events.event_queue import Event, EventQueue
3-
from a2a.server.events.queue_manager import QueueManager, TaskQueueExists, NoTaskQueue
43
from a2a.server.events.in_memory_queue_manager import InMemoryQueueManager
4+
from a2a.server.events.queue_manager import (
5+
NoTaskQueue,
6+
QueueManager,
7+
TaskQueueExists,
8+
)
9+
510

611
__all__ = [
712
'Event',
813
'EventConsumer',
914
'EventQueue',
15+
'InMemoryQueueManager',
16+
'NoTaskQueue',
1017
'QueueManager',
1118
'TaskQueueExists',
12-
'NoTaskQueue',
13-
'InMemoryQueueManager',
1419
]

src/a2a/server/events/in_memory_queue_manager.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import asyncio
2+
23
from a2a.server.events.event_queue import EventQueue
3-
from a2a.server.events.queue_manager import QueueManager, TaskQueueExists, NoTaskQueue
4+
from a2a.server.events.queue_manager import (
5+
NoTaskQueue,
6+
QueueManager,
7+
TaskQueueExists,
8+
)
9+
410

511
class InMemoryQueueManager(QueueManager):
612
"""InMemoryQueueManager is used for a single binary management.

src/a2a/server/events/queue_manager.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from abc import ABC, abstractmethod
2+
23
from a2a.server.events.event_queue import EventQueue
34

45

@@ -29,5 +30,6 @@ async def create_or_tap(self, task_id: str) -> EventQueue:
2930
class TaskQueueExists(Exception):
3031
pass
3132

33+
3234
class NoTaskQueue(Exception):
3335
pass

0 commit comments

Comments
 (0)