Merge remote-tracking branch 'upstream/v2' into upgrade_jsonpath-ng_to_1.8.0

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/common.py

@@ -99,6 +99,10 @@ class WorkflowMode(Enum):
 
     KNOWLEDGE_LOOP = "knowledge-loop"
 
+    TOOL = "tool"
+
+    TOOL_LOOP = "tool-loop"
+
 
 class Workflow:
     """

apps/application/flow/i_step_node.py

@@ -22,6 +22,7 @@
 from application.models import ChatRecord, ChatUserType
 from common.field.common import InstanceField
 from knowledge.models.knowledge_action import KnowledgeAction, State
+from tools.models import ToolRecord
 
 chat_cache = cache
 
@@ -115,6 +116,40 @@ def handler(self, workflow):
                 'start_time') is not None else 0)
 
 
+def get_tool_workflow_state(workflow):
+    if workflow.is_the_task_interrupted():
+        return State.REVOKED
+    details = workflow.get_runtime_details()
+    node_list = details.values()
+    all_node = [*node_list, *get_loop_workflow_node(node_list)]
+    err = any([True for value in all_node if value.get('status') == 500 and not value.get('enableException')])
+    if err:
+        return State.FAILURE
+    return State.SUCCESS
+
+
+class ToolWorkflowPostHandler(WorkFlowPostHandler):
+    def __init__(self, chat_info, tool_id):
+        super().__init__(chat_info)
+        self.tool_id = tool_id
+
+    def handler(self, workflow):
+        state = get_tool_workflow_state(workflow)
+        record = ToolRecord(id=self.chat_info.tool_record_id, tool_id=self.tool_id,
+                            workspace_id=self.chat_info.workspace_id,
+                            source_type=self.chat_info.source_type,
+                            source_id=self.chat_info.source_id,
+                            state=state,
+                            meta={
+                                'output': workflow.out_context,
+                                'details': workflow.get_runtime_details(),
+                                'answer_text_list': workflow.get_answer_text_list()
+                            })
+        self.chat_info.set_record(record)
+        self.chat_info = None
+        self.tool_id = None
+
+
 def get_loop_workflow_node(node_list):
     result = []
     for item in node_list:
@@ -204,6 +239,11 @@ class KnowledgeFlowParamsSerializer(serializers.Serializer):
     knowledge_base = serializers.DictField(required=False, label="知识库设置")
 
 
+class ToolFlowParamsSerializer(serializers.Serializer):
+    tool_id = serializers.UUIDField(required=True, label="工具id")
+    workspace_id = serializers.CharField(required=True, label="工作空间id")
+
+
 class INode:
     view_type = 'many_view'
 

apps/application/flow/knowledge_loop_workflow_manage.py

@@ -13,3 +13,9 @@
 class KnowledgeLoopWorkflowManage(LoopWorkflowManage):
     def get_params_serializer_class(self):
         return KnowledgeFlowParamsSerializer
+
+    def get_source_type(self):
+        return "KNOWLEDGE"
+
+    def get_source_id(self):
+        return self.params.get('knowledge_id')

apps/application/flow/knowledge_workflow_manage.py

@@ -122,3 +122,9 @@ def hand_node_result(self, current_node, node_result_future):
             current_node.node_chunk.end()
             QuerySet(KnowledgeAction).filter(id=self.params.get('knowledge_action_id')).update(
                 details=self.get_runtime_details())
+
+    def get_source_type(self):
+        return "KNOWLEDGE"
+
+    def get_source_id(self):
+        return self.params.get('knowledge_id')

apps/application/flow/loop_workflow_manage.py

@@ -191,3 +191,9 @@ def generate_prompt(self, prompt: str):
         prompt_template = PromptTemplate.from_template(prompt, template_format='jinja2')
         value = prompt_template.format(context=context)
         return value
+
+    def get_source_type(self):
+        return "APPLICATION"
+
+    def get_source_id(self):
+        return self.params.get('application_id')

apps/application/flow/step_node/__init__.py

@@ -35,11 +35,13 @@
 from .text_to_video_step_node.impl.base_text_to_video_node import BaseTextToVideoNode
 from .tool_lib_node import *
 from .tool_node import *
+from .tool_workflow_lib_node import BaseToolWorkflowLibNodeNode
 from .variable_aggregation_node.impl.base_variable_aggregation_node import BaseVariableAggregationNode
 from .variable_assign_node import BaseVariableAssignNode
 from .variable_splitting_node import BaseVariableSplittingNode
 from .video_understand_step_node import BaseVideoUnderstandNode
 from .document_split_node import BaseDocumentSplitNode
+from .tool_start_node import BaseToolStartStepNode
 
 node_list = [BaseStartStepNode, BaseChatNode, BaseSearchKnowledgeNode, BaseSearchDocumentNode, BaseQuestionNode,
              BaseConditionNode, BaseReplyNode,
@@ -51,7 +53,8 @@
              BaseIntentNode, BaseLoopNode, BaseLoopStartStepNode,
              BaseLoopContinueNode,
              BaseLoopBreakNode, BaseVariableSplittingNode, BaseParameterExtractionNode, BaseVariableAggregationNode,
-             BaseDataSourceLocalNode, BaseDataSourceWebNode, BaseKnowledgeWriteNode, BaseDocumentSplitNode]
+             BaseDataSourceLocalNode, BaseDataSourceWebNode, BaseKnowledgeWriteNode, BaseDocumentSplitNode,
+             BaseToolStartStepNode, BaseToolWorkflowLibNodeNode]
 
 node_map = {n.type: {w: n for w in n.support} for n in node_list}