fix:ruff

pull/1359/head
SengokuCola 2025-11-13 19:03:51 +08:00
parent d306e40db0
commit e816a4ab4c
2 changed files with 14 additions and 8 deletions

View File

@ -10,7 +10,7 @@ from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
from src.plugin_system.apis import llm_api
from src.common.database.database_model import ThinkingBack
from json_repair import repair_json
from src.memory_system.retrieval_tools import get_tool_registry, init_all_tools, register_memory_retrieval_tool
from src.memory_system.retrieval_tools import get_tool_registry, init_all_tools
from src.llm_models.payload_content.message import MessageBuilder, RoleType, Message
logger = get_logger("memory_retrieval")
@ -384,17 +384,23 @@ async def _react_agent_solve_question(
remaining_iterations=remaining_iterations,
)
def message_factory(_client) -> List[Message]:
def message_factory(
_client,
*,
_head_prompt: str = head_prompt,
_prompt: str = prompt,
_conversation_messages: List[Message] = conversation_messages,
) -> List[Message]:
messages: List[Message] = []
system_builder = MessageBuilder()
system_builder.set_role(RoleType.System)
system_builder.add_text_content(head_prompt)
if prompt.strip():
system_builder.add_text_content(f"\n{prompt}")
system_builder.add_text_content(_head_prompt)
if _prompt.strip():
system_builder.add_text_content(f"\n{_prompt}")
messages.append(system_builder.build())
messages.extend(conversation_messages)
messages.extend(_conversation_messages)
for msg in messages:
print(msg)
@ -605,7 +611,7 @@ async def _react_agent_solve_question(
observations = await asyncio.gather(*tool_tasks, return_exceptions=True)
# 处理执行结果
for i, (tool_call_item, observation) in enumerate(zip(tool_calls, observations)):
for i, (tool_call_item, observation) in enumerate(zip(tool_calls, observations, strict=False)):
if isinstance(observation, Exception):
observation = f"工具执行异常: {str(observation)}"
logger.error(f"ReAct Agent 第 {iteration + 1} 次迭代 工具 {i+1} 执行异常: {observation}")

View File

@ -3,7 +3,7 @@
提供统一的工具注册和管理接口
"""
from typing import List, Dict, Any, Optional, Callable, Awaitable, Tuple
from typing import List, Dict, Any, Optional, Callable, Awaitable
from src.common.logger import get_logger
from src.llm_models.payload_content.tool_option import ToolParamType