Merge remote-tracking branch 'upstream/v2' into variable-assign-support-type-convert

Author: wangliang181230

.github/workflows/build-and-push-python-pg.yml

@@ -25,7 +25,7 @@ jobs:
         run: |
           DOCKER_IMAGE=ghcr.io/1panel-dev/maxkb-base
           DOCKER_PLATFORMS=${{ github.event.inputs.architecture }}
-          TAG_NAME=python3.11-pg17.7-20260212
+          TAG_NAME=python3.11-pg17.7-20260323
           DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME}"
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
           echo ::set-output name=version::${TAG_NAME}

.github/workflows/build-and-push.yml

@@ -7,7 +7,7 @@ on:
     inputs:
       dockerImageTag:
         description: 'Image Tag'
-        default: 'v2.6.0-dev'
+        default: 'v2.8.0-dev'
         required: true
       dockerImageTagWithLatest:
         description: '是否发布latest tag（正式发版时选择，测试版本切勿选择）'

apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py

@@ -242,7 +242,8 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
         # 兼容老数据
         if not mcp_tool_ids:
             mcp_tool_ids = []
-        if mcp_source == 'custom' and mcp_servers and '"stdio"' not in mcp_servers:
+        if mcp_source == 'custom' and mcp_servers:
+            ToolExecutor().validate_mcp_transport(mcp_servers)
             mcp_servers_config = json.loads(mcp_servers)
         elif mcp_tool_ids:
             mcp_tools = QuerySet(Tool).filter(id__in=mcp_tool_ids).values()

apps/application/flow/backend/sandbox_shell.py

@@ -62,7 +62,7 @@ def execute(
         if _enable_sandbox:
             # 用 runuser 在子进程里切换用户，父进程凭据保持不变，
             # 避免父进程 ruid/euid 不一致导致 execve 报 Permission denied
-            command = f"runuser -u {_run_user} -- env -i LD_PRELOAD=/opt/maxkb-app/sandbox/lib/sandbox.so PATH=${{PATH}} {command}"
+            command = f"env -i LD_PRELOAD=/opt/maxkb-app/sandbox/lib/sandbox.so PATH=${{PATH}} gosu {_run_user} {command}"
             # command = f"runuser -u {_run_user} -- env -i PATH=${{PATH}} {command}"
 
         # print(f"Executing command in sandbox: {command}")

apps/application/flow/step_node/ai_chat_step_node/impl/base_chat_node.py

@@ -248,7 +248,8 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids
             mcp_tool_ids = []
         if mcp_tool_id:
             mcp_tool_ids = list(set(mcp_tool_ids + [mcp_tool_id]))
-        if mcp_source == 'custom' and mcp_servers and '"stdio"' not in mcp_servers:
+        if mcp_source == 'custom' and mcp_servers:
+            ToolExecutor().validate_mcp_transport(mcp_servers)
             mcp_servers_config = json.loads(mcp_servers)
             mcp_servers_config = self.handle_variables(mcp_servers_config)
         elif mcp_tool_ids:

apps/application/flow/step_node/intent_node/impl/prompt_template.py

@@ -1,32 +1,29 @@
 
 
-
-
-PROMPT_TEMPLATE = """
-    # Role
-    You are an intention classification expert, good at being able to judge which classification the user's input belongs to.
-
-    ## Skills
-    Skill 1: Clearly determine which of the following intention classifications the user's input belongs to.
-    Intention classification list:
-    {classification_list}
-
-    Note:
-    - Please determine the match only between the user's input content and the Intention classification list content, without judging or categorizing the match with the classification ID.
-    - **When classifying, you must give higher weight to the context and intent continuity shown in the historical conversation. Do not rely solely on the literal meaning of the current input; instead, prioritize the most consistent classification with the previous dialogue flow.**
-
-    ## User Input
-    {user_input}
-
-    ## Reply requirements
-    - The answer must be returned in JSON format.
-    - Strictly ensure that the output is in a valid JSON format.
-    - Do not add prefix ```json or suffix ```
-    - The answer needs to include the following fields such as:
-    {{
-    "classificationId": 0,
-    "reason": ""
-    }}
-
-    ## Limit
-    - Please do not reply in text."""
+PROMPT_TEMPLATE = """# Role
+You are an intention classification expert, good at being able to judge which classification the user's input belongs to.
+
+## Skills
+Skill 1: Clearly determine which of the following intention classifications the user's input belongs to.
+Intention classification list:
+{classification_list}
+
+Note:
+- Please determine the match between the user's input content and the Intention classification list content, without judging or categorizing the match with the classification ID.
+- **When classifying, you must give higher weight to the context and intent continuity shown in the historical conversation. Do not rely solely on the literal meaning of the current input; instead, prioritize the most consistent classification with the previous dialogue flow.**
+
+## User Input
+{user_input}
+
+## Reply requirements
+- The answer must be returned in JSON format.
+- Strictly ensure that the output is in a valid JSON format.
+- Do not add prefix ```json or suffix ```
+- The answer needs to include the following fields such as:
+{{
+"classificationId": 0,
+"reason": ""
+}}
+
+## Limit
+- Please do not reply in text."""

apps/application/flow/step_node/mcp_node/impl/base_mcp_node.py

@@ -9,6 +9,7 @@
 from application.flow.i_step_node import NodeResult
 from application.flow.step_node.mcp_node.i_mcp_node import IMcpNode
 from tools.models import Tool
+from common.utils.tool_code import ToolExecutor
 
 
 class BaseMcpNode(IMcpNode):
@@ -34,6 +35,7 @@ def execute(self, mcp_servers, mcp_server, mcp_tool, mcp_tool_id, mcp_source, to
         else:
             servers = json.loads(mcp_servers)
             servers = self.handle_variables(servers)  # 处理servers中的变量
+            ToolExecutor().validate_mcp_transport(json.dumps(servers))
             params = json.loads(json.dumps(tool_params))
             params = self.handle_variables(params)
 

apps/application/flow/step_node/variable_aggregation_node/i_variable_aggregation_node.py

@@ -11,6 +11,7 @@
 
 class VariableListSerializer(serializers.Serializer):
     v_id = serializers.CharField(required=True, label=_("Variable id"))
+    key = serializers.CharField(required=False, label=_("Key"), allow_null=True, allow_blank=True, )
     variable = serializers.ListField(required=True, label=_("Variable"))
 
 

apps/application/flow/step_node/variable_aggregation_node/impl/base_variable_aggregation_node.py

@@ -31,7 +31,6 @@ def save_context(self, details, workflow_manage):
         self.context['exception_message'] = details.get('err_message')
 
     def get_first_non_null(self, variable_list):
-
         for variable in variable_list:
             v = self.workflow_manage.get_reference_field(
                 variable.get('variable')[0],
@@ -40,12 +39,16 @@ def get_first_non_null(self, variable_list):
                 return v
         return None
 
-    def set_variable_to_json(self, variable_list):
-
+    def set_variable_to_array(self, variable_list):
         return [self.workflow_manage.get_reference_field(
             variable.get('variable')[0],
             variable.get('variable')[1:]) for variable in variable_list]
 
+    def set_variable_to_dict(self, variable_list):
+        return {(variable.get('key') or variable.get('variable')[-1]): self.workflow_manage.get_reference_field(
+            variable.get('variable')[0],
+            variable.get('variable')[1:]) for variable in variable_list}
+
     def reset_variable(self, variable):
         value = self.workflow_manage.get_reference_field(
             variable.get('variable')[0],
@@ -65,9 +68,14 @@ def reset_group_list(self, group_list):
 
     def execute(self, strategy, group_list, **kwargs) -> NodeResult:
         strategy_map = {'first_non_null': self.get_first_non_null,
-                        'variable_to_json': self.set_variable_to_json,
+                        'variable_to_array': self.set_variable_to_array,
+                        'variable_to_dict': self.set_variable_to_dict,
                         }
 
+        # 向下兼容
+        if strategy == 'variable_to_json':
+            strategy = 'variable_to_array'
+
         result = {item.get('field'): strategy_map[strategy](item.get('variable_list')) for item in group_list}
 
         return NodeResult(

apps/application/flow/step_node/variable_splitting_node/impl/base_variable_splitting_node.py

@@ -41,7 +41,7 @@ def save_context(self, details, workflow_manage):
         self.context['exception_message'] = details.get('err_message')
 
     def execute(self, input_variable, variable_list, **kwargs) -> NodeResult:
-        if type(input_variable).__name__ == "str":
+        if isinstance(input_variable, str):
             try:
                 input_variable = json.loads(input_variable)
             except Exception: