fix: workflow connection handling with force_connect method

Author: lss233

framework/web/api/workflow/routes.py

@@ -112,10 +112,11 @@ async def create_workflow(group_id: str, workflow_id: str):
             builder.update_position(block_def.name, block_def.position)
 
         # 添加连接
+        builder.wires = []
         for wire in workflow_def.wires:
             source_block = next(b for b in builder.blocks if b.name == wire.source_block)
             target_block = next(b for b in builder.blocks if b.name == wire.target_block)
-            builder._connect_blocks(source_block, target_block)
+            builder.force_connect(source_block, target_block, wire.source_output, wire.target_input)
 
         # 保存工作流
         file_path = registry.get_workflow_path(group_id, workflow_id)
@@ -161,10 +162,11 @@ async def update_workflow(group_id: str, workflow_id: str):
 
             builder.update_position(block_def.name, block_def.position)
         # 添加连接
+        builder.wires = []
         for wire in workflow_def.wires:
             source_block = next(b for b in builder.blocks if b.name == wire.source_block)
             target_block = next(b for b in builder.blocks if b.name == wire.target_block)
-            builder._connect_blocks(source_block, target_block)
+            builder.force_connect(source_block, target_block, wire.source_output, wire.target_input)
 
         # 保存工作流
         file_path = registry.get_workflow_path(group_id, workflow_id)

framework/workflow/core/workflow/builder.py

@@ -317,6 +317,11 @@ def _connect_blocks(self, source_block: Block, target_block: Block):
             if is_connected:
                 break
 
+    def force_connect(self, source_block: Block, target_block: Block, source_output: str, target_input: str):
+        """强制连接两个块"""
+        wire = Wire(source_block, source_output, target_block, target_input)
+        self.wires.append(wire)
+
     def _find_parallel_nodes(self, start_node: Node) -> List[Node]:
         """查找所有并行节点"""
         parallel_nodes = []
@@ -452,11 +457,12 @@ def get_block_class(type_name: str) -> Type[Block]:
                     builder.chain(block_class, name=block_data['name'], **params)
             builder.update_position(block_data['name'], block_data['position'])
         # 第二遍：建立连接
+        builder.wires = []
         for block_data in workflow_data['blocks']:
             if 'connected_to' in block_data:
                 source_node = builder.nodes_by_name[block_data['name']]
                 for connection in block_data['connected_to']:
                     target_node = builder.nodes_by_name[connection['target']]
-                    builder._connect_blocks(source_node.block, target_node.block)
+                    builder.force_connect(source_node.block, target_node.block, connection['mapping']['from'], connection['mapping']['to'])
 
         return builder 

framework/workflow/implementations/blocks/llm/chat.py

@@ -16,9 +16,9 @@ class ChatMessageConstructor(Block):
     name = "chat_message_constructor"
     inputs = {
         "user_msg": Input("user_msg", "本轮消息", IMMessage, "用户消息"),
+        "user_prompt_format": Input("user_prompt_format", "本轮消息格式", str, "本轮消息格式", default=""),
         "memory_content": Input("memory_content", "上下文消息", str, "历史消息对话"),
         "system_prompt_format": Input("system_prompt_format", "上下文消息格式", str, "上下文消息格式", default=""),
-        "user_prompt_format": Input("user_prompt_format", "本轮消息格式", str, "本轮消息格式", default="")
     }
     outputs = {"llm_msg": Output("llm_msg", "LLM 对话记录", List[LLMChatMessage], "LLM 对话记录")}
     container: DependencyContainer
@@ -74,7 +74,6 @@ def execute(self, user_msg: IMMessage, memory_content: str, system_prompt_format
         # 再替换其他变量
         system_prompt = self.substitute_variables(system_prompt_format, executor)
         user_prompt = self.substitute_variables(user_prompt_format, executor)
-        
         llm_msg = [
             LLMChatMessage(role='system', content=system_prompt),
             LLMChatMessage(role='user', content=user_prompt)

plugins/llm_preset_adapters/gemini_adapter.py

@@ -41,7 +41,7 @@ def chat(self, req: LLMChatRequest) -> LLMChatResponse:
             "safetySettings": []
         }
 
-        self.logger.debug(f"Contents: {data['contents'][0]['parts'][0]['text']}")
+        self.logger.debug(f"Contents: {data['contents']}")
         # Remove None fields
         data = {k: v for k, v in data.items() if v is not None}