feat :merge tob conflict

Author: ai-business-hql

backend/controller/conversation_api.py

@@ -245,6 +245,7 @@ async def invoke_chat(request):
         # Workflow LLM settings (optional, used by tools/agents that need a different LLM)
         "workflow_llm_api_key": request.headers.get('Workflow-LLM-Api-Key'),
         "workflow_llm_base_url": request.headers.get('Workflow-LLM-Base-Url'),
+        "workflow_llm_model": request.headers.get('Workflow-LLM-Model'),
         "model_select": next((x['data'][0] for x in ext if x['type'] == 'model_select' and x.get('data')), None)
     }
 
@@ -514,6 +515,7 @@ async def invoke_debug(request):
         # Workflow LLM settings (optional)
         "workflow_llm_api_key": request.headers.get('Workflow-LLM-Api-Key'),
         "workflow_llm_base_url": request.headers.get('Workflow-LLM-Base-Url'),
+        "workflow_llm_model": request.headers.get('Workflow-LLM-Model'),
     }
 
     # 获取当前语言

backend/controller/llm_api.py

@@ -1,8 +1,8 @@
 '''
 Author: ai-business-hql [email protected]
 Date: 2025-07-14 16:46:20
-LastEditors: ai-business-hql qingli.hql@alibaba-inc.com
-LastEditTime: 2025-08-11 16:08:07
+LastEditors: ai-business-hql ai.bussiness.hql@gmail.com
+LastEditTime: 2025-10-15 17:17:28
 FilePath: /comfyui_copilot/backend/controller/llm_api.py
 Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 '''

backend/service/mcp_client.py

@@ -29,8 +29,7 @@
         "Detected incorrect or missing 'agents' package while loading MCP components. "
         "Please install 'openai-agents' and ensure this plugin prefers it. Commands:\n"
         "  python -m pip uninstall -y agents gym tensorflow\n"
-        "  python -m pip install -U openai-agents\n\n"
-        "Or set COMFYUI_COPILOT_PREFER_OPENAI_AGENTS=1 to prefer openai-agents without uninstalling."
+        "  python -m pip install -U openai-agents"
     )
 
 from ..agent_factory import create_agent

backend/service/workflow_rewrite_tools.py

@@ -15,8 +15,7 @@
         "Detected incorrect or missing 'agents' package while loading tools. "
         "Please install 'openai-agents' and ensure this plugin prefers it. Commands:\n"
         "  python -m pip uninstall -y agents gym tensorflow\n"
-        "  python -m pip install -U openai-agents\n\n"
-        "Or set COMFYUI_COPILOT_PREFER_OPENAI_AGENTS=1 to prefer openai-agents without uninstalling."
+        "  python -m pip install -U openai-agents\n"
     )
 from .workflow_rewrite_agent_simple import rewrite_workflow_simple
 

backend/utils/key_utils.py

@@ -1,3 +1,11 @@
+'''
+Author: ai-business-hql [email protected]
+Date: 2025-10-11 16:46:10
+LastEditors: ai-business-hql [email protected]
+LastEditTime: 2025-10-15 14:35:41
+FilePath: /ComfyUI-Copilot/backend/utils/key_utils.py
+Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+'''
 from copy import deepcopy
 
 def workflow_config_adapt(config: dict) -> dict:
@@ -17,5 +25,10 @@ def workflow_config_adapt(config: dict) -> dict:
     if new_config.get("workflow_llm_base_url"):
         new_config["openai_base_url"] = new_config.get("workflow_llm_base_url")
         new_config["workflow_llm_base_url"] = None
+    if new_config.get("workflow_llm_model"):
+        new_config["model_select"] = new_config.get("workflow_llm_model")
+        new_config["workflow_llm_model"] = None
+    else:
+        new_config["model_select"] = None
 
     return new_config