Merge branch 'v2' into tool-workflow

Author: shaohuzhang1

.editorconfig

@@ -0,0 +1,4 @@
+root = true
+
+[*.py]
+max_line_length = 120

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

@@ -28,6 +28,7 @@
 from common.exception.app_exception import AppApiException
 from common.utils.logger import maxkb_logger
 from common.utils.rsa_util import rsa_long_decrypt
+from common.utils.shared_resource_auth import filter_authorized_ids
 from common.utils.tool_code import ToolExecutor
 from models_provider.tools import get_model_instance_by_model_workspace_id
 from tools.models import Tool
@@ -192,6 +193,7 @@ def execute(self, message_list: List[BaseMessage],
                                        mcp_tool_ids, mcp_servers, mcp_source, tool_ids,
                                        application_ids,
                                        skill_tool_ids,
+                                       workspace_id,
                                        mcp_output_enable)
         else:
             return self.execute_block(message_list, chat_id, problem_text, post_response_handler, chat_model,
@@ -201,6 +203,7 @@ def execute(self, message_list: List[BaseMessage],
                                       mcp_tool_ids, mcp_servers, mcp_source, tool_ids,
                                       application_ids,
                                       skill_tool_ids,
+                                      workspace_id,
                                       mcp_output_enable)
 
     def get_details(self, manage, **kwargs):
@@ -211,9 +214,9 @@ def get_details(self, manage, **kwargs):
             'run_time': self.context.get('run_time') or 0,
             'model_id': str(manage.context['model_id']),
             'message_list': self.reset_message_list(self.context['step_args'].get('message_list'),
-                                                    self.context['answer_text']),
-            'message_tokens': self.context['message_tokens'],
-            'answer_tokens': self.context['answer_tokens'],
+                                                    self.context.get('answer_text')),
+            'message_tokens': self.context.get('message_tokens'),
+            'answer_tokens': self.context.get('answer_tokens'),
             'cost': 0,
         }
 
@@ -228,7 +231,8 @@ def reset_message_list(message_list: List[BaseMessage], answer_text):
         return result
 
     def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
-                            application_ids, skill_tool_ids, mcp_output_enable, chat_model, message_list, agent_id):
+                            application_ids, skill_tool_ids, mcp_output_enable, chat_model, message_list, agent_id,
+                            chat_id):
 
         mcp_servers_config = {}
 
@@ -298,11 +302,11 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
                 tool = QuerySet(Tool).filter(id=tool_id, is_active=True).first()
                 if tool is None or tool.is_active is False:
                     continue
+                init_params_default_value = {i["field"]: i.get('default_value') for i in tool.init_field_list}
                 if tool.init_params is not None:
-                    params = json.loads(rsa_long_decrypt(tool.init_params))
-                    tool_init_params = json.loads(rsa_long_decrypt(tool.init_params))
+                    params = init_params_default_value | json.loads(rsa_long_decrypt(tool.init_params))
                 else:
-                    params = {}
+                    params = init_params_default_value
 
                 skill_file_items.append({
                     'tool_id': str(tool.id),
@@ -314,8 +318,10 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
         if len(mcp_servers_config) > 0:
             source_id = agent_id
             source_type = 'APPLICATION'
-            return mcp_response_generator(chat_model, message_list, json.dumps(mcp_servers_config), mcp_output_enable,
-                                          tool_init_params, source_id, source_type)
+            return mcp_response_generator(
+                chat_model, message_list, json.dumps(mcp_servers_config), mcp_output_enable,
+                tool_init_params, source_id, source_type, chat_id
+            )
 
         return None
 
@@ -330,8 +336,10 @@ def get_stream_result(self, message_list: List[BaseMessage],
                           tool_ids=None,
                           application_ids=None,
                           skill_tool_ids=None,
+                          workspace_id=None,
                           mcp_output_enable=True,
-                          agent_id=None
+                          agent_id=None,
+                          chat_id=None
                           ):
         if paragraph_list is None:
             paragraph_list = []
@@ -348,11 +356,22 @@ def get_stream_result(self, message_list: List[BaseMessage],
             return iter([AIMessageChunk(
                 _('Sorry, the AI model is not configured. Please go to the application to set up the AI model first.'))]), False
         else:
+            # 过滤tool_id
+            all_tool_ids = list(set(
+                (mcp_tool_ids or []) +
+                (tool_ids or []) +
+                (skill_tool_ids or [])
+            ))
+            authorized_set = set(filter_authorized_ids('tool', all_tool_ids, workspace_id))
+
+            mcp_tool_ids = [i for i in (mcp_tool_ids or []) if i in authorized_set]
+            tool_ids = [i for i in (tool_ids or []) if i in authorized_set]
+            skill_tool_ids = [i for i in (skill_tool_ids or []) if i in authorized_set]
             # 处理 MCP 请求
             mcp_result = self._handle_mcp_request(
                 mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
                 application_ids, skill_tool_ids, mcp_output_enable, chat_model,
-                message_list, agent_id
+                message_list, agent_id, chat_id
             )
             if mcp_result:
                 return mcp_result, True
@@ -375,12 +394,14 @@ def execute_stream(self, message_list: List[BaseMessage],
                        tool_ids=None,
                        application_ids=None,
                        skill_tool_ids=None,
+                       workspace_id=None,
                        mcp_output_enable=True):
         chat_result, is_ai_chat = self.get_stream_result(message_list, chat_model, paragraph_list,
                                                          no_references_setting, problem_text, mcp_tool_ids,
                                                          mcp_servers, mcp_source, tool_ids,
-                                                         application_ids, skill_tool_ids,
-                                                         mcp_output_enable, manage.context.get('application_id'))
+                                                         application_ids, skill_tool_ids, workspace_id,
+                                                         mcp_output_enable, manage.context.get('application_id'),
+                                                         chat_id)
         chat_record_id = self.context.get('step_args', {}).get('chat_record_id') if self.context.get('step_args',
                                                                                                      {}).get(
             'chat_record_id') else uuid.uuid7()
@@ -405,8 +426,10 @@ def get_block_result(self, message_list: List[BaseMessage],
                          tool_ids=None,
                          application_ids=None,
                          skill_tool_ids=None,
+                         workspace_id=None,
                          mcp_output_enable=True,
-                         application_id=None
+                         application_id=None,
+                         chat_id=None
                          ):
         if paragraph_list is None:
             paragraph_list = []
@@ -422,11 +445,22 @@ def get_block_result(self, message_list: List[BaseMessage],
             return AIMessage(
                 _('Sorry, the AI model is not configured. Please go to the application to set up the AI model first.')), False
         else:
+            # 过滤tool_id
+            all_tool_ids = list(set(
+                (mcp_tool_ids or []) +
+                (tool_ids or []) +
+                (skill_tool_ids or [])
+            ))
+            authorized_set = set(filter_authorized_ids('tool', all_tool_ids, workspace_id))
+
+            mcp_tool_ids = [i for i in (mcp_tool_ids or []) if i in authorized_set]
+            tool_ids = [i for i in (tool_ids or []) if i in authorized_set]
+            skill_tool_ids = [i for i in (skill_tool_ids or []) if i in authorized_set]
             # 处理 MCP 请求
             mcp_result = self._handle_mcp_request(
                 mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
                 application_ids, skill_tool_ids, mcp_output_enable,
-                chat_model, message_list, application_id
+                chat_model, message_list, application_id, chat_id
             )
             if mcp_result:
                 return mcp_result, True
@@ -448,6 +482,7 @@ def execute_block(self, message_list: List[BaseMessage],
                       tool_ids=None,
                       application_ids=None,
                       skill_tool_ids=None,
+                      workspace_id=None,
                       mcp_output_enable=True):
         reasoning_content_enable = model_setting.get('reasoning_content_enable', False)
         reasoning_content_start = model_setting.get('reasoning_content_start', '<think>')
@@ -460,8 +495,9 @@ def execute_block(self, message_list: List[BaseMessage],
             chat_result, is_ai_chat = self.get_block_result(message_list, chat_model, paragraph_list,
                                                             no_references_setting, problem_text,
                                                             mcp_tool_ids, mcp_servers, mcp_source,
-                                                            tool_ids, application_ids, skill_tool_ids,
-                                                            mcp_output_enable, manage.context.get('application_id'))
+                                                            tool_ids, application_ids, skill_tool_ids,workspace_id,
+                                                            mcp_output_enable, manage.context.get('application_id'),
+                                                            chat_id)
             if is_ai_chat:
                 request_token = chat_model.get_num_tokens_from_messages(message_list)
                 response_token = chat_model.get_num_tokens(chat_result.content)

apps/application/flow/backend/sandbox_shell.py

@@ -1,24 +1,64 @@
 import getpass
+import os
+import re
 
 from deepagents.backends import LocalShellBackend
 from deepagents.backends.protocol import ExecuteResponse
 
 from maxkb.const import CONFIG
 
-_enable_sandbox = bool(CONFIG.get('SANDBOX', 0))
+_enable_sandbox = bool(int(CONFIG.get('SANDBOX', 0)))
 _run_user = 'sandbox' if _enable_sandbox else getpass.getuser()
+_sandbox_python_sys_path = CONFIG.get_sandbox_python_package_paths().replace(',', ':')
 
 
 class SandboxShellBackend(LocalShellBackend):
     def __init__(self, root_dir: str, **kwargs):
+        if 'env' not in kwargs and not kwargs.get('inherit_env', False):
+            env = os.environ.copy()
+            path = env.get('PATH', '/usr/bin:/bin')
+
+            # 将 sandbox 路径分解为列表，检查每个路径是否已存在
+            existing_paths = set(path.split(os.pathsep))
+            sandbox_paths = _sandbox_python_sys_path.split(os.pathsep) if _sandbox_python_sys_path else []
+            new_paths = [p for p in sandbox_paths if p and p not in existing_paths]
+
+            if new_paths:
+                env['PATH'] = f"{os.pathsep.join(new_paths)}{os.pathsep}{path}"
+
+            kwargs['env'] = env
         super().__init__(root_dir=root_dir, **kwargs)
 
+    def _translate_virtual_paths(self, command: str) -> str:
+        """Translate virtual absolute paths in the command to real filesystem paths.
+
+        In virtual_mode=True, file tools (ls, glob, read_file) return virtual absolute
+        paths like /skills/foo.py which map to {root_dir}/skills/foo.py.  But execute()
+        runs a real shell where /skills/foo.py does not exist.  This method replaces
+        any path token that exists under root_dir with its real path, while leaving
+        genuine system paths (e.g. /usr/bin/python3) untouched.
+        """
+        root = str(self.cwd)
+
+        def translate(m: re.Match) -> str:
+            virtual_path = m.group(0)
+            real_path = root + virtual_path
+            return real_path if os.path.lexists(real_path) else virtual_path
+
+        # Match absolute-path-like tokens: / followed by a non-whitespace sequence
+        # that isn't clearly a flag (e.g. avoid matching -/something).
+        # Only translate when virtual_mode is active.
+        return re.sub(r'(?<![.\w\-])/[A-Za-z_][^\s\'"\\;|&><:,]*', translate, command)
+
     def execute(
             self,
             command: str,
             *,
             timeout: int | None = None,
     ) -> ExecuteResponse:
+        if self.virtual_mode:
+            command = self._translate_virtual_paths(command)
+
         if _enable_sandbox:
             # 用 runuser 在子进程里切换用户，父进程凭据保持不变，
             # 避免父进程 ruid/euid 不一致导致 execve 报 Permission denied

apps/application/flow/compare/__init__.py

@@ -24,10 +24,11 @@
 from .len_lt_compare import *
 from .lt_compare import *
 from .not_contain_compare import *
+from .not_equal_compare import *
 from .start_with import StartWithCompare
 
 compare_handle_list = [GECompare(), GTCompare(), ContainCompare(), EqualCompare(), LTCompare(), LECompare(),
                        LenLECompare(), LenGECompare(), LenEqualCompare(), LenGTCompare(), LenLTCompare(),
                        IsNullCompare(),
-                       IsNotNullCompare(), NotContainCompare(), IsTrueCompare(), IsNotTrueCompare(), StartWithCompare(),
+                       IsNotNullCompare(), NotContainCompare(), NotEqualCompare(), IsTrueCompare(), IsNotTrueCompare(), StartWithCompare(),
                        EndWithCompare()]

apps/application/flow/compare/not_equal_compare.py

@@ -0,0 +1,21 @@
+# coding=utf-8
+"""
+    @project: maxkb
+    @Author：wangliang181230
+    @file： not_equal_compare.py
+    @date：2026/3/17 9:41
+    @desc:
+"""
+from typing import List
+
+from application.flow.compare import Compare
+
+
+class NotEqualCompare(Compare):
+
+    def support(self, node_id, fields: List[str], source_value, compare, target_value):
+        if compare == 'not_eq':
+            return True
+
+    def compare(self, source_value, compare, target_value):
+        return str(source_value) != str(target_value)

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

@@ -12,17 +12,17 @@
 from functools import reduce
 from typing import List, Dict
 
-from django.db.models import QuerySet
-from django.utils.translation import gettext as _
-from langchain_core.messages import BaseMessage, AIMessage, HumanMessage, SystemMessage
-
 from application.flow.i_step_node import NodeResult, INode
 from application.flow.step_node.ai_chat_step_node.i_chat_node import IChatNode
 from application.flow.tools import Reasoning, mcp_response_generator
 from application.models import Application, ApplicationApiKey, ApplicationAccessToken
 from common.exception.app_exception import AppApiException
 from common.utils.rsa_util import rsa_long_decrypt
+from common.utils.shared_resource_auth import filter_authorized_ids
 from common.utils.tool_code import ToolExecutor
+from django.db.models import QuerySet
+from django.utils.translation import gettext as _
+from langchain_core.messages import BaseMessage, AIMessage, HumanMessage, SystemMessage
 from models_provider.models import Model
 from models_provider.tools import get_model_credential, get_model_instance_by_model_workspace_id
 from tools.models import Tool
@@ -199,11 +199,24 @@ def execute(self, model_id, system, prompt, dialogue_number, history_chat_record
         message_list = self.generate_message_list(system, prompt, history_message)
         self.context['message_list'] = message_list
 
+        # 过滤tool_id
+        all_tool_ids = list(set(
+            (mcp_tool_ids or []) +
+            (tool_ids or []) +
+            (skill_tool_ids or []) +
+            ([mcp_tool_id] if mcp_tool_id else [])
+        ))
+        authorized_set = set(filter_authorized_ids('tool', all_tool_ids, workspace_id))
+
+        mcp_tool_ids = [i for i in (mcp_tool_ids or []) if i in authorized_set]
+        tool_ids = [i for i in (tool_ids or []) if i in authorized_set]
+        skill_tool_ids = [i for i in (skill_tool_ids or []) if i in authorized_set]
+        mcp_tool_id = mcp_tool_id if (mcp_tool_id and mcp_tool_id in authorized_set) else None
         # 处理 MCP 请求
         mcp_result = self._handle_mcp_request(
             mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids, tool_ids,
             application_ids, skill_tool_ids, mcp_output_enable,
-            chat_model, message_list, history_message, question
+            chat_model, message_list, history_message, question, chat_id
         )
         if mcp_result:
             return mcp_result
@@ -223,7 +236,7 @@ def execute(self, model_id, system, prompt, dialogue_number, history_chat_record
 
     def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids, tool_ids,
                             application_ids, skill_tool_ids,
-                            mcp_output_enable, chat_model, message_list, history_message, question):
+                            mcp_output_enable, chat_model, message_list, history_message, question, chat_id):
 
         mcp_servers_config = {}
 
@@ -296,11 +309,11 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids
                 tool = QuerySet(Tool).filter(id=tool_id, is_active=True).first()
                 if tool is None or tool.is_active is False:
                     continue
+                init_params_default_value = {i["field"]: i.get('default_value') for i in tool.init_field_list}
                 if tool.init_params is not None:
-                    params = json.loads(rsa_long_decrypt(tool.init_params))
-                    tool_init_params = json.loads(rsa_long_decrypt(tool.init_params))
+                    params = init_params_default_value | json.loads(rsa_long_decrypt(tool.init_params))
                 else:
-                    params = {}
+                    params = init_params_default_value
 
                 skill_file_items.append({
                     'tool_id': str(tool.id),
@@ -320,7 +333,7 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids
             source_id = application_id or knowledge_id
             source_type = 'APPLICATION' if application_id else 'KNOWLEDGE'
             r = mcp_response_generator(chat_model, message_list, json.dumps(mcp_servers_config), mcp_output_enable,
-                                       tool_init_params, source_id, source_type)
+                                       tool_init_params, source_id, source_type, chat_id)
             return NodeResult(
                 {'result': r, 'chat_model': chat_model, 'message_list': message_list,
                  'history_message': [{'content': message.content, 'role': message.type} for message in

apps/application/flow/step_node/image_understand_step_node/impl/base_image_understand_node.py

@@ -39,8 +39,15 @@ def write_context_stream(node_variable: Dict, workflow_variable: Dict, node: INo
     response = node_variable.get('result')
     answer = ''
     for chunk in response:
-        answer += chunk.content
-        yield chunk.content
+        if isinstance(chunk.content, list):
+            for chunk_item in chunk.content:
+                text = chunk_item.get("text", "")
+                answer += text
+                yield text
+        else:
+            text = chunk.content or ""
+            answer += text
+            yield text
     _write_context(node_variable, workflow_variable, node, workflow, answer)