Skip to content

Commit 4dd671f

Browse files
JDOxygenJDOxygen
committed
code formats.
1 parent 66ee9ed commit 4dd671f

50 files changed

Lines changed: 360 additions & 227 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/a2a/agentscope_interop/demo_agentscope_a2a_server.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
PYTHONPATH=. python examples/a2a/agentscope_interop/demo_oxygent_client_call_agentscope_server.py
99
"""
1010

11+
import logging
1112
import uuid
1213
from typing import Any, AsyncGenerator
13-
import logging
1414

1515
from a2a.server.apps import A2AStarletteApplication
1616
from a2a.server.events import Event
@@ -137,6 +137,7 @@ async def on_message_send_stream(
137137

138138
if __name__ == "__main__":
139139
import uvicorn
140+
140141
logging.basicConfig(level=logging.INFO)
141142
logger.info("Starting AgentScope A2A server at %s:%s", HOST, PORT)
142143

‎examples/a2a/agentscope_interop/demo_oxygent_client_call_agentscope_server.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99

1010
import asyncio
1111

12-
from oxygent import Config, MAS, OxyRequest, oxy
13-
12+
from oxygent import MAS, Config, OxyRequest, oxy
1413

1514
SERVER_URL = "http://127.0.0.1:8003"
1615

‎examples/a2a/demo_a2a_oxygent_server.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import asyncio
88
import os
99

10-
from oxygent import Config, MAS, oxy
10+
from oxygent import MAS, Config, oxy
1111

1212
PORT = 8090
1313
A2A_BASE_PATH = "/a2a"

‎examples/a2a/demo_a2a_oxygent_stream_client.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
import asyncio
1111
import json
1212

13-
from oxygent import Config, MAS, OxyRequest, oxy
13+
from oxygent import MAS, Config, OxyRequest, oxy
1414

1515
SERVER_URL = "http://127.0.0.1:8090/a2a"
1616

17+
1718
async def call_once(mas: MAS, query: str):
1819
req = OxyRequest(
1920
callee="stream_client",

‎examples/a2a/demo_a2a_oxygent_task_followup_client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import asyncio
1111
import time
1212

13-
from oxygent import Config, MAS, OxyRequest, oxy
13+
from oxygent import MAS, Config, OxyRequest, oxy
1414

1515
SERVER_URL = "http://127.0.0.1:8090/a2a"
1616

‎examples/a2a/google_sdk_interop/demo_a2a_sdk_call_oxygent.py‎

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,24 @@ async def poll_task(
3939
params=TaskQueryParams(id=task_id, metadata=metadata or None),
4040
)
4141
get_resp = await client.get_task(get_request)
42-
print("[tasks/get]", json.dumps(get_resp.model_dump(mode="json", exclude_none=True), ensure_ascii=False))
42+
print(
43+
"[tasks/get]",
44+
json.dumps(
45+
get_resp.model_dump(mode="json", exclude_none=True), ensure_ascii=False
46+
),
47+
)
4348

44-
task_obj = getattr(get_resp.root, "result", None) if getattr(get_resp, "root", None) else None
49+
task_obj = (
50+
getattr(get_resp.root, "result", None)
51+
if getattr(get_resp, "root", None)
52+
else None
53+
)
4554
state = ""
46-
if task_obj and getattr(task_obj, "status", None) and getattr(task_obj.status, "state", None):
55+
if (
56+
task_obj
57+
and getattr(task_obj, "status", None)
58+
and getattr(task_obj.status, "state", None)
59+
):
4760
state_obj = task_obj.status.state
4861
state = getattr(state_obj, "value", state_obj)
4962
state = str(state).lower()
@@ -53,7 +66,13 @@ async def poll_task(
5366
return
5467

5568
if waited >= max_wait_seconds:
56-
print({"taskId": task_id, "state": state or "unknown", "msg": "polling timeout"})
69+
print(
70+
{
71+
"taskId": task_id,
72+
"state": state or "unknown",
73+
"msg": "polling timeout",
74+
}
75+
)
5776
return
5877

5978
await asyncio.sleep(interval_seconds)
@@ -97,12 +116,24 @@ async def main() -> None:
97116
)
98117
print("[turn1 stream]")
99118
async for chunk in client.send_message_streaming(streaming_request):
100-
print(json.dumps(chunk.model_dump(mode="json", exclude_none=True), ensure_ascii=False))
119+
print(
120+
json.dumps(
121+
chunk.model_dump(mode="json", exclude_none=True),
122+
ensure_ascii=False,
123+
)
124+
)
101125
return
102126

103-
request = SendMessageRequest(id=str(uuid4()), params=MessageSendParams(**send_message_payload))
127+
request = SendMessageRequest(
128+
id=str(uuid4()), params=MessageSendParams(**send_message_payload)
129+
)
104130
response = await client.send_message(request)
105-
print("[turn1 send]", json.dumps(response.model_dump(mode="json", exclude_none=True), ensure_ascii=False))
131+
print(
132+
"[turn1 send]",
133+
json.dumps(
134+
response.model_dump(mode="json", exclude_none=True), ensure_ascii=False
135+
),
136+
)
106137

107138

108139
if __name__ == "__main__":

‎examples/a2a/google_sdk_interop/demo_a2a_sdk_stream_call_oxygent.py‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,18 @@
88
"""
99

1010
import asyncio
11-
import json
1211
from uuid import uuid4
1312

1413
import httpx
1514
from a2a.client import A2ACardResolver, A2AClient
16-
from a2a.types import MessageSendParams, SendStreamingMessageRequest, Message, Task, TaskStatusUpdateEvent, TaskArtifactUpdateEvent
15+
from a2a.types import (
16+
Message,
17+
MessageSendParams,
18+
SendStreamingMessageRequest,
19+
Task,
20+
TaskArtifactUpdateEvent,
21+
TaskStatusUpdateEvent,
22+
)
1723
from a2a.utils.message import get_message_text
1824
from a2a.utils.parts import get_text_parts
1925

@@ -59,7 +65,9 @@ async def main() -> None:
5965
payload = {
6066
"message": {
6167
"role": "user",
62-
"parts": [{"kind": "text", "text": "请分三点介绍 OxyGent A2A 流式能力"}],
68+
"parts": [
69+
{"kind": "text", "text": "请分三点介绍 OxyGent A2A 流式能力"}
70+
],
6371
"messageId": uuid4().hex,
6472
},
6573
"metadata": {},
@@ -83,10 +91,10 @@ async def main() -> None:
8391
result = getattr(root, "result", None)
8492
text = extract_text(result)
8593
if text:
86-
delta = text[len(emitted):] if text.startswith(emitted) else text
94+
delta = text[len(emitted) :] if text.startswith(emitted) else text
8795
emitted = text if text.startswith(emitted) else (emitted + text)
8896
if delta:
89-
print(delta, end='')
97+
print(delta, end="")
9098

9199
# print raw chunk for debugging/compat check
92100
# print("[chunk]", json.dumps(chunk.model_dump(mode="json", exclude_none=True), ensure_ascii=False))

‎examples/a2a/google_sdk_interop/demo_google_sdk_a2a_server.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,19 @@ def build_agent_card() -> AgentCard:
6363
class SimpleA2AHandler:
6464
"""Simple handler for non-stream and stream message calls."""
6565

66-
async def on_message_send(self, params: MessageSendParams, *args: Any, **kwargs: Any) -> Message:
66+
async def on_message_send(
67+
self, params: MessageSendParams, *args: Any, **kwargs: Any
68+
) -> Message:
6769
query = get_message_text(params.message) or ""
6870
context_id = params.message.context_id
6971
task_id = params.message.task_id
7072
answer = f"Google SDK A2A server reply: I received your question: {query}"
71-
logger.info("on_message_send context_id=%s task_id=%s query=%s", context_id, task_id, query)
73+
logger.info(
74+
"on_message_send context_id=%s task_id=%s query=%s",
75+
context_id,
76+
task_id,
77+
query,
78+
)
7279
return Message(
7380
messageId=uuid.uuid4().hex,
7481
role=Role.agent,

‎examples/a2a/google_sdk_interop/demo_oxygent_client_call_google_sdk_server.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import asyncio
1111
import os
1212

13-
from oxygent import Config, MAS, OxyRequest, oxy
13+
from oxygent import MAS, Config, OxyRequest, oxy
1414

1515
SERVER_URL = "http://127.0.0.1:8011"
1616
CLIENT_NAME = "google_sdk_server_client"
@@ -41,15 +41,19 @@ async def main():
4141
streaming=False,
4242
timeout=60,
4343
enable_task_polling=False,
44-
headers=DEMO_HEADERS
44+
headers=DEMO_HEADERS,
4545
)
4646
]
4747

4848
async with MAS(oxy_space=oxy_space) as mas:
4949
print("request headers:", DEMO_HEADERS)
50-
response = await call_once(mas, "Please introduce yourself in one short sentence.")
50+
response = await call_once(
51+
mas, "Please introduce yourself in one short sentence."
52+
)
5153
print(response.output)
52-
print("session:", response.extra.get("context_id"), response.extra.get("task_id"))
54+
print(
55+
"session:", response.extra.get("context_id"), response.extra.get("task_id")
56+
)
5357

5458

5559
if __name__ == "__main__":

‎examples/a2a/google_sdk_interop/demo_oxygent_stream_client_call_google_sdk_server.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import asyncio
1111

12-
from oxygent import Config, MAS, OxyRequest, oxy
12+
from oxygent import MAS, Config, OxyRequest, oxy
1313

1414
SERVER_URL = "http://127.0.0.1:8011"
1515
CLIENT_NAME = "google_sdk_stream_client"
@@ -41,7 +41,9 @@ async def main():
4141
async with MAS(oxy_space=oxy_space) as mas:
4242
response = await call_once(mas, "Please explain A2A in one short paragraph.")
4343
print("\n[final]", response.output)
44-
print("session:", response.extra.get("context_id"), response.extra.get("task_id"))
44+
print(
45+
"session:", response.extra.get("context_id"), response.extra.get("task_id")
46+
)
4547

4648

4749
if __name__ == "__main__":

0 commit comments

Comments
 (0)