.env整改

Author: ai-business-hql

backend/controller/conversation_api.py

@@ -10,7 +10,7 @@
 
 from sqlalchemy.orm import identity
 
-from ..utils.globals import set_language
+from ..utils.globals import set_language, apply_llm_env_defaults
 from ..utils.auth_utils import extract_and_store_api_key
 import server
 from aiohttp import web
@@ -28,6 +28,19 @@
 from ..utils.modelscope_gateway import ModelScopeGateway
 import folder_paths
 
+
+def get_llm_config_from_headers(request):
+    """Extract LLM-related configuration from request headers."""
+    return {
+        "openai_api_key": request.headers.get('Openai-Api-Key'),
+        "openai_base_url": request.headers.get('Openai-Base-Url'),
+        # 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'),
+    }
+
+
 # 全局下载进度存储
 download_progress = {}
 download_lock = threading.Lock()
@@ -240,14 +253,11 @@ async def invoke_chat(request):
     config = {
         "session_id": session_id,
         "workflow_checkpoint_id": workflow_checkpoint_id,
-        "openai_api_key": request.headers.get('Openai-Api-Key'),
-        "openai_base_url": request.headers.get('Openai-Base-Url'),
-        # 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'),
+        **get_llm_config_from_headers(request),
         "model_select": next((x['data'][0] for x in ext if x['type'] == 'model_select' and x.get('data')), None)
     }
+    # Apply .env-based defaults for LLM-related fields (config > .env > code defaults)
+    config = apply_llm_env_defaults(config)
 
     # 设置请求上下文 - 这里建立context隔离
     set_request_context(session_id, workflow_checkpoint_id, config)
@@ -510,13 +520,10 @@ async def invoke_debug(request):
     config = {
         "session_id": session_id,
         "model": "gemini-2.5-flash",  # Default model for debug agents
-        "openai_api_key": request.headers.get('Openai-Api-Key'),
-        "openai_base_url": request.headers.get('Openai-Base-Url'),
-        # 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'),
+        **get_llm_config_from_headers(request),
     }
+    # Apply .env-based defaults for LLM-related fields (config > .env > code defaults)
+    config = apply_llm_env_defaults(config)
 
     # 获取当前语言
     language = request.headers.get('Accept-Language', 'en')

backend/utils/globals.py

@@ -103,27 +103,61 @@ def set_comfyui_copilot_api_key(api_key: str) -> None:
 LMSTUDIO_DEFAULT_BASE_URL = "http://localhost:1234/v1"
 WORKFLOW_MODEL_NAME = os.getenv("WORKFLOW_MODEL_NAME", "us.anthropic.claude-sonnet-4-20250514-v1:0")
 # WORKFLOW_MODEL_NAME = "gpt-5-2025-08-07-GlobalStandard"
-LLM_DEFAULT_BASE_URL = os.getenv("LLM_DEFAULT_BASE_URL", BACKEND_BASE_URL + "/v1")
+LLM_DEFAULT_BASE_URL = "https://comfyui-copilot-server.onrender.com/v1"
+
+# LLM-related env defaults (used as fallback when request config does not provide values)
+OPENAI_API_KEY = os.getenv("OPENAI_API_KEY") or None
+OPENAI_BASE_URL = os.getenv("OPENAI_BASE_URL") or None
+WORKFLOW_LLM_API_KEY = os.getenv("WORKFLOW_LLM_API_KEY") or None
+WORKFLOW_LLM_BASE_URL = os.getenv("WORKFLOW_LLM_BASE_URL") or None
+# If WORKFLOW_LLM_MODEL is not set, fall back to WORKFLOW_MODEL_NAME
+WORKFLOW_LLM_MODEL = os.getenv("WORKFLOW_LLM_MODEL") or WORKFLOW_MODEL_NAME
+
+
+def apply_llm_env_defaults(config: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
+    """
+    Apply LLM-related defaults with precedence:
+    request config > .env > hard-coded defaults.
+
+    This function does NOT mutate the incoming config.
+    """
+    cfg: Dict[str, Any] = dict(config or {})
+
+    # Chat LLM (OpenAI-compatible) settings
+    if not cfg.get("openai_api_key") and OPENAI_API_KEY:
+        cfg["openai_api_key"] = OPENAI_API_KEY
+    if not cfg.get("openai_base_url") and OPENAI_BASE_URL:
+        cfg["openai_base_url"] = OPENAI_BASE_URL
+
+    # Workflow LLM settings (tools/agents that might use a different LLM)
+    if not cfg.get("workflow_llm_api_key") and WORKFLOW_LLM_API_KEY:
+        cfg["workflow_llm_api_key"] = WORKFLOW_LLM_API_KEY
+    if not cfg.get("workflow_llm_base_url") and WORKFLOW_LLM_BASE_URL:
+        cfg["workflow_llm_base_url"] = WORKFLOW_LLM_BASE_URL
+    if not cfg.get("workflow_llm_model") and WORKFLOW_LLM_MODEL:
+        cfg["workflow_llm_model"] = WORKFLOW_LLM_MODEL
+
+    return cfg
 
 
 def is_lmstudio_url(base_url: str) -> bool:
     """Check if the base URL is likely LMStudio based on common patterns."""
     if not base_url:
         return False
-    
+
     base_url_lower = base_url.lower()
     # Common LMStudio patterns (supporting various ports and configurations)
     lmstudio_patterns = [
         "localhost:1234",        # Standard LMStudio port
-        "127.0.0.1:1234", 
+        "127.0.0.1:1234",
         "0.0.0.0:1234",
         ":1234/v1",
         "localhost:1235",        # Alternative port some users might use
-        "127.0.0.1:1235", 
+        "127.0.0.1:1235",
         "0.0.0.0:1235",
         ":1235/v1",
         "localhost/v1",          # Generic localhost patterns
         "127.0.0.1/v1"
     ]
-    
+
     return any(pattern in base_url_lower for pattern in lmstudio_patterns)

pyproject.toml

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