Skip to content

Commit 9e92ad0

Browse files
author
wangyue.demon
committed
run command pre-commit to format the files
1 parent 0c44c19 commit 9e92ad0

File tree

6 files changed

+140
-116
lines changed

6 files changed

+140
-116
lines changed
Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import requests
22
import httpx
33
import random
4-
import json
54

65
from google.adk.cli.adk_web_server import CreateSessionRequest, RunAgentRequest
76
from google.genai.types import Content, Part
@@ -12,26 +11,25 @@
1211
# Step 0: setup running configs
1312
app_name = "travel_planner_advanced"
1413
user_id = "agentkit_user"
15-
session_id = f"agentkit_sample_session"
14+
session_id = "agentkit_sample_session"
1615
base_url = "http://127.0.0.1:8000"
1716
api_key = "test key"
1817

19-
task_num = 1
20-
18+
task_num = 1
2119

2220
# Step 1: create a session
2321
def create_session():
2422
create_session_request = CreateSessionRequest(
25-
session_id = session_id + f"_{random.randint(1, 9999)}",
23+
session_id=session_id + f"_{random.randint(1, 9999)}",
2624
)
2725

2826
response = requests.post(
2927
url=f"{base_url}/apps/{app_name}/users/{user_id}/sessions/{create_session_request.session_id}",
3028
headers={"Authorization": f"Bearer {api_key}"},
3129
)
32-
30+
3331
print(f"[create session] Response from server: {response.json()}")
34-
32+
3533
return create_session_request.session_id
3634

3735
# Step 2: run agent with SSE
@@ -48,20 +46,25 @@ def create_session():
4846
# 3. Handle streaming events
4947
async def send_request(message: str):
5048
run_agent_request = RunAgentRequest(
51-
app_name=app_name,
52-
user_id=user_id,
53-
session_id=create_session(),
54-
new_message=Content(parts=[Part(text=message)], role="user"),
55-
stream=True,
49+
app_name=app_name,
50+
user_id=user_id,
51+
session_id=create_session(),
52+
new_message=Content(parts=[Part(text=message)], role="user"),
53+
stream=True,
5654
)
5755

58-
with httpx.stream("POST", f"{base_url}/run_sse", json=run_agent_request.model_dump(exclude_none=True), timeout=120, headers={"Authorization": f"Bearer {api_key}"}) as r:
56+
with httpx.stream(
57+
"POST",
58+
f"{base_url}/run_sse",
59+
json=run_agent_request.model_dump(exclude_none=True),
60+
timeout=120,
61+
headers={"Authorization": f"Bearer {api_key}"},
62+
) as r:
5963
for line in r.iter_lines():
6064
print(line)
61-
65+
6266
async def send_request_parallel():
6367
tasks = [send_request("找到 vivobook 商品并下单购买") for _ in range(task_num)]
6468
await asyncio.gather(*tasks)
65-
asyncio.run(send_request_parallel())
66-
6769

70+
asyncio.run(send_request_parallel())
Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
1-
import os
2-
31
from google.adk.planners import BuiltInPlanner
4-
from google.adk.planners import PlanReActPlanner
5-
from google.adk.tools.agent_tool import AgentTool
6-
from google.adk.tools.mcp_tool.mcp_toolset import MCPToolset, StreamableHTTPConnectionParams
2+
from google.adk.tools.mcp_tool.mcp_toolset import (
3+
MCPToolset,
4+
StreamableHTTPConnectionParams,
5+
)
76
from google.genai import types
8-
from veadk import Agent, Runner
9-
from veadk.a2a.remote_ve_agent import RemoteVeAgent
7+
from veadk import Agent
108
from veadk.config import getenv
11-
from veadk.knowledgebase.knowledgebase import KnowledgeBase
12-
from veadk.memory.long_term_memory import LongTermMemory
139
from veadk.memory.short_term_memory import ShortTermMemory
14-
from veadk.tools.demo_tools import get_city_weather
15-
from veadk.utils.mcp_utils import get_mcp_params
1610

1711
short_term_memory = ShortTermMemory(backend="local")
1812

1913
###Shopping cart MCP Server
2014
shopping_mcp_tools_url = getenv("SHOPPING_CART_MCP_TOOLS_URL")
2115
shopping_api_key = getenv("SHOPPING_CART_MCP_API_KEY")
2216
mcp_shopping_cart = MCPToolset(
23-
connection_params=StreamableHTTPConnectionParams(
17+
connection_params=StreamableHTTPConnectionParams(
2418
url=shopping_mcp_tools_url,
2519
headers={"Authorization": f"Bearer {shopping_api_key}"},
2620
),
2721
)
2822

29-
agent_model_name=getenv("MODEL_AGENT_NAME")
23+
agent_model_name = getenv("MODEL_AGENT_NAME")
3024

3125
agent: Agent = Agent(
3226
name="shopping_cart_advanced",
3327
model_name=agent_model_name,
3428
instruction="You are an shopping cart agent.",
35-
#planner=PlanReActPlanner(),
29+
# planner=PlanReActPlanner(),
3630
planner=BuiltInPlanner(
3731
thinking_config=types.ThinkingConfig(
3832
include_thoughts=True,
@@ -42,4 +36,4 @@
4236
short_term_memory=short_term_memory,
4337
)
4438

45-
root_agent = agent
39+
root_agent = agent

01-tutorials/workshop/session4/tool_search/amap_all_tool_agent/agent.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
1-
import os
2-
31
from google.adk.planners import BuiltInPlanner
4-
from google.adk.planners import PlanReActPlanner
5-
from google.adk.tools.agent_tool import AgentTool
6-
from google.adk.tools.mcp_tool.mcp_toolset import MCPToolset, StreamableHTTPConnectionParams
2+
from google.adk.tools.mcp_tool.mcp_toolset import (
3+
MCPToolset,
4+
StreamableHTTPConnectionParams,
5+
)
76
from google.genai import types
8-
from veadk import Agent, Runner
9-
from veadk.a2a.remote_ve_agent import RemoteVeAgent
7+
from veadk import Agent
108
from veadk.config import getenv
11-
from veadk.knowledgebase.knowledgebase import KnowledgeBase
12-
from veadk.memory.long_term_memory import LongTermMemory
139
from veadk.memory.short_term_memory import ShortTermMemory
14-
from veadk.tools.demo_tools import get_city_weather
15-
from veadk.utils.mcp_utils import get_mcp_params
1610

1711
short_term_memory = ShortTermMemory(backend="local")
1812

1913
amap_mcp_tool_api_key = getenv("AMAP_MCP_TOOL_API_KEY")
2014
amap_mcp_tool_url = getenv("AMAP_MCP_TOOL_URL")
2115
amap_mcp_tool = MCPToolset(
22-
connection_params=StreamableHTTPConnectionParams(
16+
connection_params=StreamableHTTPConnectionParams(
2317
url=amap_mcp_tool_url,
2418
headers={"Authorization": f"Bearer {amap_mcp_tool_api_key}"},
2519
),
@@ -28,19 +22,19 @@
2822
github_tool_url = getenv("GITHUB_TOOL_URL")
2923
github_tool_api_key = getenv("GITHUB_TOOL_API_KEY")
3024
github_mcp_tool = MCPToolset(
31-
connection_params=StreamableHTTPConnectionParams(
25+
connection_params=StreamableHTTPConnectionParams(
3226
url=github_tool_url,
3327
headers={"Authorization": f"Bearer {github_tool_api_key}"},
3428
),
3529
)
3630

37-
agent_model_name=getenv("MODEL_AGENT_NAME")
31+
agent_model_name = getenv("MODEL_AGENT_NAME")
3832

3933
agent: Agent = Agent(
4034
name="amap_tool_agent",
4135
model_name=agent_model_name,
4236
instruction="You are an map agent.",
43-
#planner=PlanReActPlanner(),
37+
# planner=PlanReActPlanner(),
4438
planner=BuiltInPlanner(
4539
thinking_config=types.ThinkingConfig(
4640
include_thoughts=True,

01-tutorials/workshop/session4/tool_search/amap_tool_search_agent/agent.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
1-
import os
2-
31
from google.adk.planners import BuiltInPlanner
4-
from google.adk.planners import PlanReActPlanner
5-
from google.adk.tools.agent_tool import AgentTool
6-
from google.adk.tools.mcp_tool.mcp_toolset import MCPToolset, StreamableHTTPConnectionParams
2+
from google.adk.tools.mcp_tool.mcp_toolset import (
3+
MCPToolset,
4+
StreamableHTTPConnectionParams,
5+
)
76
from google.genai import types
8-
from veadk import Agent, Runner
9-
from veadk.a2a.remote_ve_agent import RemoteVeAgent
7+
from veadk import Agent
108
from veadk.config import getenv
11-
from veadk.knowledgebase.knowledgebase import KnowledgeBase
12-
from veadk.memory.long_term_memory import LongTermMemory
139
from veadk.memory.short_term_memory import ShortTermMemory
14-
from veadk.tools.demo_tools import get_city_weather
15-
from veadk.utils.mcp_utils import get_mcp_params
1610

1711
short_term_memory = ShortTermMemory(backend="local")
1812

19-
#amap_mcp_api_key
13+
# amap_mcp_api_key
2014
amap_mcp_tool_set_api_key = getenv("AMAP_MCP_TOOL_SET_API_KEY")
2115
amap_mcp_tool_set_url = getenv("AMAP_MCP_TOOL_SET_URL")
2216
amap_mcp_tool_set = MCPToolset(
23-
connection_params=StreamableHTTPConnectionParams(
17+
connection_params=StreamableHTTPConnectionParams(
2418
url=amap_mcp_tool_set_url,
2519
headers={"Authorization": f"Bearer {amap_mcp_tool_set_api_key}"},
2620
),
2721
)
2822

29-
agent_model_name=getenv("MODEL_AGENT_NAME")
23+
agent_model_name = getenv("MODEL_AGENT_NAME")
3024

3125
agent: Agent = Agent(
3226
name="amap_tool_set_agent",
3327
model_name=agent_model_name,
3428
instruction="You are an map agent.",
35-
#planner=PlanReActPlanner(),
29+
# planner=PlanReActPlanner(),
3630
planner=BuiltInPlanner(
3731
thinking_config=types.ThinkingConfig(
3832
include_thoughts=True,

0 commit comments

Comments
 (0)