feat: conflict

Author: ai-business-hql

backend/service/debug_agent.py

@@ -206,11 +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()
-<<<<<<< HEAD
         config = workflow_config_adapt(config)
-=======
-        workflow_config_adapt(config)
->>>>>>> main
 
         if not session_id:
             session_id = str(uuid.uuid4())  # Fallback if no context

backend/service/workflow_rewrite_agent.py

@@ -45,11 +45,7 @@ def create_workflow_rewrite_agent():
     language = get_language()
     session_id = get_session_id() or "unknown_session"
     config = get_config()
-<<<<<<< HEAD
     config = workflow_config_adapt(config)
-=======
-    workflow_config_adapt(config)
->>>>>>> main
 
     return create_agent(
         name="Workflow Rewrite Agent",
@@ -111,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_simple.py

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