Merge branch 'main' into bugfix_1010

Author: li

assets/qrcode.png

@@ -84,7 +84,7 @@ def create_agent(**kwargs) -> Agent:
     model_from_config = (config or {}).get("model_select")
     model_from_kwargs = kwargs.pop("model", None)
 
-    model_name = model_from_config or model_from_kwargs or "gemini-2.5-flash"
+    model_name = model_from_kwargs or model_from_config or "gemini-2.5-flash"
     model = OpenAIChatCompletionsModel(model_name, openai_client=client)
 
     # Safety: ensure no stray 'model' remains in kwargs to avoid duplicate kwarg errors

backend/agent_factory.py

@@ -206,7 +206,7 @@ async def debug_workflow_errors(workflow_data: Dict[str, Any]):
         # Get session_id and config from request context
         session_id = get_session_id()
         config = get_config()
-        workflow_config_adapt(config)
+        config = workflow_config_adapt(config)
 
         if not session_id:
             session_id = str(uuid.uuid4())  # Fallback if no context

backend/service/debug_agent.py

@@ -2,11 +2,11 @@
 Author: ai-business-hql [email protected]
 Date: 2025-06-16 16:50:17
 LastEditors: ai-business-hql [email protected]
-LastEditTime: 2025-09-02 17:11:50
+LastEditTime: 2025-10-11 16:32:59
 FilePath: /comfyui_copilot/backend/service/mcp-client.py
 Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 '''
-from ..utils.globals import BACKEND_BASE_URL
+from ..utils.globals import BACKEND_BASE_URL, get_comfyui_copilot_api_key
 from .. import core
 import asyncio
 import os
@@ -76,13 +76,11 @@ async def comfyui_agent_invoke(messages: List[Dict[str, Any]], images: List[Imag
             params= {
                 "url": BACKEND_BASE_URL + "/mcp-server/mcp",
                 "timeout": 300.0,
+                "headers": {"X-Session-Id": session_id, "Authorization": f"Bearer {get_comfyui_copilot_api_key()}"}
             },
             cache_tools_list=True,
             client_session_timeout_seconds=300.0
         ) as server:
-            # tools = await server.list_tools()
-            
-            # Model selection is handled inside create_agent via config / kwargs precedence
 
             # 创建workflow_rewrite_agent实例 (session_id通过context获取)
             workflow_rewrite_agent_instance = create_workflow_rewrite_agent()

backend/service/mcp_client.py

@@ -45,7 +45,7 @@ def create_workflow_rewrite_agent():
     language = get_language()
     session_id = get_session_id() or "unknown_session"
     config = get_config()
-    workflow_config_adapt(config)
+    config = workflow_config_adapt(config)
 
     return create_agent(
         name="Workflow Rewrite Agent",
@@ -107,7 +107,8 @@ def create_workflow_rewrite_agent():
         """,
         tools=[get_rewrite_expert_by_name, get_current_workflow, get_node_info, update_workflow, remove_node],
         config={
-            "max_tokens": 8192
+            "max_tokens": 8192,
+            ** config
         }
     )
 

backend/service/workflow_rewrite_agent.py

@@ -83,7 +83,8 @@ def rewrite_workflow_simple(rewrite_context: RewriteContext) -> str:
 }
 """
         config = get_config()
-        workflow_config_adapt(config)
+        config = workflow_config_adapt(config)
+
         # 创建OpenAI客户端
         client = OpenAI(
             base_url = config.get("openai_base_url") or LLM_DEFAULT_BASE_URL,

backend/service/workflow_rewrite_agent_simple.py

@@ -1,10 +1,21 @@
+from copy import deepcopy
 
+def workflow_config_adapt(config: dict) -> dict:
+    """Return a deep-copied and adapted workflow config without mutating input.
 
-def workflow_config_adapt(config: dict):
-    if config:
-        if config.get("workflow_llm_api_key"):
-            config["openai_api_key"] = config.get("workflow_llm_api_key")
-            config["workflow_llm_api_key"] = None
-        if config.get("workflow_llm_base_url"):
-            config["openai_base_url"] = config.get("workflow_llm_base_url")
-            config["workflow_llm_base_url"] = None
+    - Map workflow_llm_api_key -> openai_api_key (and null out original key)
+    - Map workflow_llm_base_url -> openai_base_url (and null out original key)
+    """
+    if not config:
+        return {}
+
+    new_config = deepcopy(config)
+
+    if new_config.get("workflow_llm_api_key"):
+        new_config["openai_api_key"] = new_config.get("workflow_llm_api_key")
+        new_config["workflow_llm_api_key"] = None
+    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
+
+    return new_config

backend/utils/key_utils.py

@@ -1,7 +1,7 @@
 [project]
 name = "ComfyUI-Copilot"
 description = "Your Intelligent Assistant for Comfy-UI."
-version = "2.0.17"
+version = "2.0.18"
 license = {file = "LICENSE"}
 
 [project.urls]