HandsomeAq/ADK-agents
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agent1.2版本 修改chat为流式输出 删除memory 新增进度查询脚本和状态查询脚本

Browse Source
This commit is contained in:
handsomeAq 2026-08-03 17:52:07 +08:00
parent edb54bc576
commit b8311451c8
9 changed files with 0 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
agents/luna/agent.py
View File

@ -3,7 +3,6 @@ from google.adk.models.lite_llm import LiteLlm
from google.adk.tools.mcp_tool.mcp_toolset import McpToolset
from google.adk.tools.mcp_tool.mcp_session_manager import StdioConnectionParams
from google.adk.tools.function_tool import FunctionTool
from google.adk.tools import preload_memory
from mcp.client.stdio import StdioServerParameters
import os
import asyncio
@ -130,19 +129,6 @@ async def run_command(command: str, cwd: str = None, timeout: int = 300000000) -
run_command_tool = FunctionTool(run_command)
# --- 记忆自动保存回调 ---
async def auto_save_memory_callback(callback_context):
"""
每轮对话结束后，自动将会话保存到长期记忆中。
memory_service 未配置时静默忽略。
"""
try:
await callback_context.add_session_to_memory()
except (ValueError, AttributeError):
# memory_service 未配置或不可用时跳过
pass
root_agent = LlmAgent(
model=LiteLlm(
model=model_name,
@ -196,5 +182,4 @@ root_agent = LlmAgent(
"**需要主控关注**：如有需要上报的问题，详细说明"
),
tools=[filesystem_mcp, run_command_tool],
after_agent_callback=auto_save_memory_callback,
)

5
agents/luna/api_server.py
View File

@ -41,7 +41,6 @@ import uvicorn
from google.adk.cli.api_server import ApiServer
from google.adk.cli.utils.base_agent_loader import BaseAgentLoader
from google.adk.sessions.sqlite_session_service import SqliteSessionService
from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
from google.adk.auth.credential_service.in_memory_credential_service import InMemoryCredentialService
from google.adk.evaluation.in_memory_eval_sets_manager import InMemoryEvalSetsManager
@ -77,9 +76,6 @@ def create_api_server() -> ApiServer:
db_path=os.path.join(DATA_DIR, "sessions_luna.db")
)
# 记忆服务：长期记忆（先用内存版）
memory_service = InMemoryMemoryService()
# 工件服务
artifact_service = InMemoryArtifactService()
@ -93,7 +89,6 @@ def create_api_server() -> ApiServer:
return ApiServer(
agent_loader=DevAgentLoader(),
session_service=session_service,
memory_service=memory_service,
artifact_service=artifact_service,
credential_service=credential_service,
eval_sets_manager=eval_sets_manager,

3
agents/luna/chat.py
View File

@ -32,7 +32,6 @@ os.environ["PYTHONUTF8"] = "1"
from google.adk.runners import Runner
from google.adk.sessions.sqlite_session_service import SqliteSessionService
from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
from google.adk.agents.run_config import RunConfig, StreamingMode
from google.genai import types
@ -52,13 +51,11 @@ USER_ID = "local_user"
def get_runner() -> Runner:
"""创建带 SQLite 会话持久化的 Runner"""
session_service = SqliteSessionService(db_path=DB_PATH)
memory_service = InMemoryMemoryService()
artifact_service = InMemoryArtifactService()
return Runner(
app=dev_app,
session_service=session_service,
memory_service=memory_service,
artifact_service=artifact_service,
auto_create_session=True,
)

15
agents/my_agent/agent.py
View File

@ -3,7 +3,6 @@ from google.adk.models.lite_llm import LiteLlm
from google.adk.tools.mcp_tool.mcp_toolset import McpToolset
from google.adk.tools.mcp_tool.mcp_session_manager import StdioConnectionParams
from google.adk.tools.function_tool import FunctionTool
from google.adk.tools import preload_memory
from mcp.client.stdio import StdioServerParameters
import os
import asyncio
@ -130,19 +129,6 @@ async def run_command(command: str, cwd: str = None, timeout: int = 300000) -> s
run_command_tool = FunctionTool(run_command)
# --- 记忆自动保存回调 ---
async def auto_save_memory_callback(callback_context):
"""
每轮对话结束后，自动将会话保存到长期记忆中。
memory_service 未配置时静默忽略。
"""
try:
await callback_context.add_session_to_memory()
except (ValueError, AttributeError):
# memory_service 未配置或不可用时跳过
pass
root_agent = LlmAgent(
model=LiteLlm(
model=model_name,
@ -196,5 +182,4 @@ root_agent = LlmAgent(
"**需要主控关注**：如有需要上报的问题，详细说明"
),
tools=[filesystem_mcp, run_command_tool],
after_agent_callback=auto_save_memory_callback,
)

5
agents/my_agent/api_server.py
View File

@ -41,7 +41,6 @@ import uvicorn
from google.adk.cli.api_server import ApiServer
from google.adk.cli.utils.base_agent_loader import BaseAgentLoader
from google.adk.sessions.sqlite_session_service import SqliteSessionService
from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
from google.adk.auth.credential_service.in_memory_credential_service import InMemoryCredentialService
from google.adk.evaluation.in_memory_eval_sets_manager import InMemoryEvalSetsManager
@ -77,9 +76,6 @@ def create_api_server() -> ApiServer:
db_path=os.path.join(DATA_DIR, "sessions.db")
)
# 记忆服务：长期记忆（先用内存版）
memory_service = InMemoryMemoryService()
# 工件服务
artifact_service = InMemoryArtifactService()
@ -93,7 +89,6 @@ def create_api_server() -> ApiServer:
return ApiServer(
agent_loader=DevAgentLoader(),
session_service=session_service,
memory_service=memory_service,
artifact_service=artifact_service,
credential_service=credential_service,
eval_sets_manager=eval_sets_manager,

3
agents/my_agent/chat.py
View File

@ -32,7 +32,6 @@ os.environ["PYTHONUTF8"] = "1"
from google.adk.runners import Runner
from google.adk.sessions.sqlite_session_service import SqliteSessionService
from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
from google.adk.agents.run_config import RunConfig, StreamingMode
from google.genai import types
@ -52,13 +51,11 @@ USER_ID = "local_user"
def get_runner() -> Runner:
"""创建带 SQLite 会话持久化的 Runner"""
session_service = SqliteSessionService(db_path=DB_PATH)
memory_service = InMemoryMemoryService()
artifact_service = InMemoryArtifactService()
return Runner(
app=dev_app,
session_service=session_service,
memory_service=memory_service,
artifact_service=artifact_service,
auto_create_session=True,
)

15
agents/qwen/agent.py
View File

@ -3,7 +3,6 @@ from google.adk.models.lite_llm import LiteLlm
from google.adk.tools.mcp_tool.mcp_toolset import McpToolset
from google.adk.tools.mcp_tool.mcp_session_manager import StdioConnectionParams
from google.adk.tools.function_tool import FunctionTool
from google.adk.tools import preload_memory
from mcp.client.stdio import StdioServerParameters
import os
import asyncio
@ -130,19 +129,6 @@ async def run_command(command: str, cwd: str = None, timeout: int = 300000000) -
run_command_tool = FunctionTool(run_command)
# --- 记忆自动保存回调 ---
async def auto_save_memory_callback(callback_context):
"""
每轮对话结束后，自动将会话保存到长期记忆中。
memory_service 未配置时静默忽略。
"""
try:
await callback_context.add_session_to_memory()
except (ValueError, AttributeError):
# memory_service 未配置或不可用时跳过
pass
root_agent = LlmAgent(
model=LiteLlm(
model=model_name,
@ -196,5 +182,4 @@ root_agent = LlmAgent(
"**需要主控关注**：如有需要上报的问题，详细说明"
),
tools=[filesystem_mcp, run_command_tool],
after_agent_callback=auto_save_memory_callback,
)

5
agents/qwen/api_server.py
View File

@ -41,7 +41,6 @@ import uvicorn
from google.adk.cli.api_server import ApiServer
from google.adk.cli.utils.base_agent_loader import BaseAgentLoader
from google.adk.sessions.sqlite_session_service import SqliteSessionService
from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
from google.adk.auth.credential_service.in_memory_credential_service import InMemoryCredentialService
from google.adk.evaluation.in_memory_eval_sets_manager import InMemoryEvalSetsManager
@ -77,9 +76,6 @@ def create_api_server() -> ApiServer:
db_path=os.path.join(DATA_DIR, "sessions_qwen.db")
)
# 记忆服务：长期记忆（先用内存版）
memory_service = InMemoryMemoryService()
# 工件服务
artifact_service = InMemoryArtifactService()
@ -93,7 +89,6 @@ def create_api_server() -> ApiServer:
return ApiServer(
agent_loader=DevAgentLoader(),
session_service=session_service,
memory_service=memory_service,
artifact_service=artifact_service,
credential_service=credential_service,
eval_sets_manager=eval_sets_manager,

3
agents/qwen/chat.py
View File

@ -32,7 +32,6 @@ os.environ["PYTHONUTF8"] = "1"
from google.adk.runners import Runner
from google.adk.sessions.sqlite_session_service import SqliteSessionService
from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
from google.adk.agents.run_config import RunConfig, StreamingMode
from google.genai import types
@ -52,13 +51,11 @@ USER_ID = "local_user"
def get_runner() -> Runner:
"""创建带 SQLite 会话持久化的 Runner"""
session_service = SqliteSessionService(db_path=DB_PATH)
memory_service = InMemoryMemoryService()
artifact_service = InMemoryArtifactService()
return Runner(
app=dev_app,
session_service=session_service,
memory_service=memory_service,
artifact_service=artifact_service,
auto_create_session=True,
)