zhuchaowe/qwen_agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

general_agent

Browse Source
This commit is contained in:
朱潮 2025-11-16 20:01:53 +08:00
parent 58fb623d66
commit 9b9d81a098
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/prompt_loader.py
View File

@ -36,7 +36,7 @@ def safe_replace(text: str, placeholder: str, value: Any) -> str:
return text.replace(placeholder, replacement)
async def load_system_prompt_async(project_dir: str, language: str = None, system_prompt: str=None, robot_type: str = "generic_agent", bot_id: str="", user_identifier: str = "") -> str:
async def load_system_prompt_async(project_dir: str, language: str = None, system_prompt: str=None, robot_type: str = "general_agent", bot_id: str="", user_identifier: str = "") -> str:
"""异步版本的系统prompt加载
Args:
@ -68,7 +68,7 @@ async def load_system_prompt_async(project_dir: str, language: str = None, syste
prompt = safe_replace(prompt, '{bot_id}', bot_id)
prompt = safe_replace(prompt, '{user_identifier}', user_identifier)
return prompt or ""
elif robot_type == "generic_agent" or robot_type == "catalog_agent":
elif robot_type == "general_agent" or robot_type == "catalog_agent":
"""
优先使用项目目录的README.md，没有才使用默认的system_prompt_{robot_type}.md
"""
@ -106,7 +106,7 @@ async def load_system_prompt_async(project_dir: str, language: str = None, syste
return prompt or ""
def load_system_prompt(project_dir: str, language: str = None, system_prompt: str=None, robot_type: str = "generic_agent", bot_id: str="", user_identifier: str = "") -> str:
def load_system_prompt(project_dir: str, language: str = None, system_prompt: str=None, robot_type: str = "general_agent", bot_id: str="", user_identifier: str = "") -> str:
"""同步版本的系统prompt加载，内部调用异步版本以保持向后兼容"""
try:
loop = asyncio.get_event_loop()
@ -154,7 +154,7 @@ def replace_mcp_placeholders(mcp_settings: List[Dict], dataset_dir: str, bot_id:
return replace_placeholders_in_obj(mcp_settings)
async def load_mcp_settings_async(project_dir: str, mcp_settings: list=None, bot_id: str="", robot_type: str = "generic_agent") -> List[Dict]:
async def load_mcp_settings_async(project_dir: str, mcp_settings: list=None, bot_id: str="", robot_type: str = "general_agent") -> List[Dict]:
"""异步版本的MCP设置加载
Args:
@ -244,7 +244,7 @@ async def load_mcp_settings_async(project_dir: str, mcp_settings: list=None, bot
return merged_settings
def load_mcp_settings(project_dir: str, mcp_settings: list=None, bot_id: str="", robot_type: str = "generic_agent") -> List[Dict]:
def load_mcp_settings(project_dir: str, mcp_settings: list=None, bot_id: str="", robot_type: str = "general_agent") -> List[Dict]:
"""同步版本的MCP设置加载，内部调用异步版本以保持向后兼容"""
try:
loop = asyncio.get_event_loop()