feat: add application enable flag and application IDs to application model

Author: liuruibin

apps/application/chat_pipeline/step/chat_step/i_chat_step.py

@@ -88,6 +88,8 @@ class InstanceSerializer(serializers.Serializer):
         mcp_source = serializers.CharField(label="MCP Source", required=False, default="referencing")
         tool_enable = serializers.BooleanField(label="工具是否启用", required=False, default=False)
         tool_ids = serializers.JSONField(label="工具ID列表", required=False, default=list)
+        application_enable = serializers.BooleanField(label="应用是否启用", required=False, default=False)
+        application_ids = serializers.JSONField(label="应用ID列表", required=False, default=list)
         mcp_output_enable = serializers.BooleanField(label="MCP输出是否启用", required=False, default=True)
 
         def is_valid(self, *, raise_exception=False):
@@ -115,6 +117,6 @@ def execute(self, message_list: List[BaseMessage],
                 padding_problem_text: str = None, stream: bool = True, chat_user_id=None, chat_user_type=None,
                 no_references_setting=None, model_params_setting=None, model_setting=None,
                 mcp_enable=False, mcp_tool_ids=None, mcp_servers='', mcp_source="referencing",
-                tool_enable=False, tool_ids=None, mcp_output_enable=True,
+                tool_enable=False, tool_ids=None, application_enable=None, application_ids=None, mcp_output_enable=True,
                 **kwargs):
         pass

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

@@ -7,12 +7,11 @@
     @desc: 对话step Base实现
 """
 import json
-import os
 import time
 import traceback
-import uuid_utils.compat as uuid
 from typing import List
 
+import uuid_utils.compat as uuid
 from django.db.models import QuerySet
 from django.http import StreamingHttpResponse
 from django.utils.translation import gettext as _
@@ -26,11 +25,10 @@
 from application.chat_pipeline.pipeline_manage import PipelineManage
 from application.chat_pipeline.step.chat_step.i_chat_step import IChatStep, PostResponseHandler
 from application.flow.tools import Reasoning, mcp_response_generator
-from application.models import ApplicationChatUserStats, ChatUserType
+from application.models import ApplicationChatUserStats, ChatUserType, Application, ApplicationApiKey
 from common.utils.logger import maxkb_logger
 from common.utils.rsa_util import rsa_long_decrypt
 from common.utils.tool_code import ToolExecutor
-from maxkb.const import CONFIG
 from models_provider.tools import get_model_instance_by_model_workspace_id
 from tools.models import Tool
 
@@ -59,7 +57,6 @@ def write_context(step, manage, request_token, response_token, all_text):
     manage.context['answer_tokens'] = manage.context['answer_tokens'] + response_token
 
 
-
 def event_content(response,
                   chat_id,
                   chat_record_id,
@@ -182,6 +179,8 @@ def execute(self, message_list: List[BaseMessage],
                 mcp_source="referencing",
                 tool_enable=False,
                 tool_ids=None,
+                application_enable=False,
+                application_ids=None,
                 mcp_output_enable=True,
                 **kwargs):
         chat_model = get_model_instance_by_model_workspace_id(model_id, workspace_id,
@@ -193,13 +192,15 @@ def execute(self, message_list: List[BaseMessage],
                                        no_references_setting,
                                        model_setting,
                                        mcp_enable, mcp_tool_ids, mcp_servers, mcp_source, tool_enable, tool_ids,
+                                       application_enable, application_ids,
                                        mcp_output_enable)
         else:
             return self.execute_block(message_list, chat_id, problem_text, post_response_handler, chat_model,
                                       paragraph_list,
                                       manage, padding_problem_text, chat_user_id, chat_user_type, no_references_setting,
                                       model_setting,
                                       mcp_enable, mcp_tool_ids, mcp_servers, mcp_source, tool_enable, tool_ids,
+                                      application_enable, application_ids,
                                       mcp_output_enable)
 
     def get_details(self, manage, **kwargs):
@@ -225,8 +226,9 @@ def reset_message_list(message_list: List[BaseMessage], answer_text):
         return result
 
     def _handle_mcp_request(self, mcp_enable, tool_enable, mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
+                            application_enable, application_ids,
                             mcp_output_enable, chat_model, message_list):
-        if not mcp_enable and not tool_enable:
+        if not mcp_enable and not tool_enable and not application_enable:
             return None
 
         mcp_servers_config = {}
@@ -258,10 +260,25 @@ def _handle_mcp_request(self, mcp_enable, tool_enable, mcp_source, mcp_servers,
                         params = json.loads(rsa_long_decrypt(tool.init_params))
                     else:
                         params = {}
-                    tool_config = executor.get_tool_mcp_config(tool.code, params)
+                    tool_config = executor.get_tool_mcp_config(tool.code, params, tool.name, tool.desc)
 
                     mcp_servers_config[str(tool.id)] = tool_config
 
+        if application_enable:
+            if application_ids and len(application_ids) > 0:
+                self.context['application_ids'] = application_ids
+                for application_id in application_ids:
+                    app = QuerySet(Application).filter(id=application_id).first()
+                    app_key = QuerySet(ApplicationApiKey).filter(application_id=application_id, is_active=True).first()
+                    # TODO 处理api
+                    if app_key is not None:
+                        api_key = app_key.secret_key
+                    else:
+                        continue
+                    executor = ToolExecutor()
+                    app_config = executor.get_app_mcp_config(api_key, app.name, app.desc)
+                    mcp_servers_config[str(app.id)] = app_config
+
         if len(mcp_servers_config) > 0:
             return mcp_response_generator(chat_model, message_list, json.dumps(mcp_servers_config), mcp_output_enable)
 
@@ -278,6 +295,8 @@ def get_stream_result(self, message_list: List[BaseMessage],
                           mcp_source="referencing",
                           tool_enable=False,
                           tool_ids=None,
+                          application_enable=False,
+                          application_ids=None,
                           mcp_output_enable=True):
         if paragraph_list is None:
             paragraph_list = []
@@ -296,7 +315,8 @@ def get_stream_result(self, message_list: List[BaseMessage],
         else:
             # 处理 MCP 请求
             mcp_result = self._handle_mcp_request(
-                mcp_enable, tool_enable, mcp_source, mcp_servers, mcp_tool_ids, tool_ids, mcp_output_enable, chat_model,
+                mcp_enable, tool_enable, mcp_source, mcp_servers, mcp_tool_ids, tool_ids, application_enable,
+                application_ids, mcp_output_enable, chat_model,
                 message_list,
             )
             if mcp_result:
@@ -320,10 +340,13 @@ def execute_stream(self, message_list: List[BaseMessage],
                        mcp_source="referencing",
                        tool_enable=False,
                        tool_ids=None,
+                       application_enable=False,
+                       application_ids=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_enable, mcp_tool_ids,
                                                          mcp_servers, mcp_source, tool_enable, tool_ids,
+                                                         application_enable, application_ids,
                                                          mcp_output_enable)
         chat_record_id = uuid.uuid7()
         r = StreamingHttpResponse(
@@ -347,6 +370,8 @@ def get_block_result(self, message_list: List[BaseMessage],
                          mcp_source="referencing",
                          tool_enable=False,
                          tool_ids=None,
+                         application_enable=False,
+                         application_ids=None,
                          mcp_output_enable=True
                          ):
         if paragraph_list is None:
@@ -365,7 +390,8 @@ def get_block_result(self, message_list: List[BaseMessage],
         else:
             # 处理 MCP 请求
             mcp_result = self._handle_mcp_request(
-                mcp_enable, tool_enable, mcp_source, mcp_servers, mcp_tool_ids, tool_ids, mcp_output_enable,
+                mcp_enable, tool_enable, mcp_source, mcp_servers, mcp_tool_ids, tool_ids, application_enable,
+                application_ids, mcp_output_enable,
                 chat_model, message_list,
             )
             if mcp_result:
@@ -388,6 +414,8 @@ def execute_block(self, message_list: List[BaseMessage],
                       mcp_source="referencing",
                       tool_enable=False,
                       tool_ids=None,
+                      application_enable=False,
+                      application_ids=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>')
@@ -400,7 +428,8 @@ 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_enable,
                                                             mcp_tool_ids, mcp_servers, mcp_source, tool_enable,
-                                                            tool_ids, mcp_output_enable)
+                                                            tool_ids, application_enable, application_ids,
+                                                            mcp_output_enable)
             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/step_node/ai_chat_step_node/i_chat_node.py

@@ -42,6 +42,9 @@ class ChatNodeSerializer(serializers.Serializer):
     tool_enable = serializers.BooleanField(required=False, default=False, label=_("Whether to enable tools"))
     tool_ids = serializers.ListField(child=serializers.UUIDField(), required=False, allow_empty=True,
                                      label=_("Tool IDs"), )
+    application_enable = serializers.BooleanField(required=False, default=False, label=_("Whether to enable apps"))
+    application_ids = serializers.ListField(child=serializers.UUIDField(), required=False, allow_empty=True,
+                                     label=_("App IDs"), )
     mcp_output_enable = serializers.BooleanField(required=False, default=True, label=_("Whether to enable MCP output"))
 
 
@@ -73,6 +76,8 @@ def execute(self, model_id, system, prompt, dialogue_number, history_chat_record
                 mcp_source=None,
                 tool_enable=False,
                 tool_ids=None,
+                application_enable=False,
+                application_ids=None,
                 mcp_output_enable=True,
                 **kwargs) -> NodeResult:
         pass

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

@@ -7,7 +7,6 @@
     @desc:
 """
 import json
-import os
 import re
 import time
 from functools import reduce
@@ -20,9 +19,9 @@
 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
 from common.utils.rsa_util import rsa_long_decrypt
 from common.utils.tool_code import ToolExecutor
-from maxkb.const import CONFIG
 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
@@ -160,6 +159,8 @@ def execute(self, model_id, system, prompt, dialogue_number, history_chat_record
                 mcp_source=None,
                 tool_enable=False,
                 tool_ids=None,
+                application_enable=False,
+                application_ids=None,
                 mcp_output_enable=True,
                 **kwargs) -> NodeResult:
         if dialogue_type is None:
@@ -186,7 +187,8 @@ def execute(self, model_id, system, prompt, dialogue_number, history_chat_record
 
         # 处理 MCP 请求
         mcp_result = self._handle_mcp_request(
-            mcp_enable, tool_enable, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids, tool_ids, mcp_output_enable,
+            mcp_enable, tool_enable, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids, tool_ids, application_enable,
+            application_ids, mcp_output_enable,
             chat_model, message_list, history_message, question
         )
         if mcp_result:
@@ -208,8 +210,9 @@ def execute(self, model_id, system, prompt, dialogue_number, history_chat_record
                               _write_context=write_context)
 
     def _handle_mcp_request(self, mcp_enable, tool_enable, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids, tool_ids,
+                            application_enable, application_ids,
                             mcp_output_enable, chat_model, message_list, history_message, question):
-        if not mcp_enable and not tool_enable:
+        if not mcp_enable and not tool_enable and not application_enable:
             return None
 
         mcp_servers_config = {}
@@ -245,10 +248,19 @@ def _handle_mcp_request(self, mcp_enable, tool_enable, mcp_source, mcp_servers,
                         params = json.loads(rsa_long_decrypt(tool.init_params))
                     else:
                         params = {}
-                    tool_config = executor.get_tool_mcp_config(tool.code, params)
+                    tool_config = executor.get_tool_mcp_config(tool.code, params, tool.name, tool.desc)
 
                     mcp_servers_config[str(tool.id)] = tool_config
 
+        if application_enable:
+            if application_ids and len(application_ids) > 0:
+                self.context['application_ids'] = application_ids
+                for application_id in application_ids:
+                    app = QuerySet(Application).filter(id=application_id).first()
+                    executor = ToolExecutor()
+                    app_config = executor.get_app_mcp_config(app.id, app.name, app.desc)
+                    mcp_servers_config[str(app.id)] = app_config
+
         if len(mcp_servers_config) > 0:
             r = mcp_response_generator(chat_model, message_list, json.dumps(mcp_servers_config), mcp_output_enable)
             return NodeResult(

apps/application/migrations/0004_application_application_enable_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.9 on 2025-12-16 08:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('application', '0003_application_stt_model_params_setting_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='application',
+            name='application_enable',
+            field=models.BooleanField(default=False, verbose_name='应用是否启用'),
+        ),
+        migrations.AddField(
+            model_name='application',
+            name='application_ids',
+            field=models.JSONField(default=list, verbose_name='应用ID列表'),
+        ),
+    ]

apps/application/models/application.py

@@ -100,6 +100,8 @@ class Application(AppModelMixin):
     mcp_source = models.CharField(verbose_name="MCP Source", max_length=20, default="referencing")
     tool_enable = models.BooleanField(verbose_name="工具是否启用", default=False)
     tool_ids = models.JSONField(verbose_name="工具ID列表", default=list)
+    application_enable = models.BooleanField(verbose_name="应用是否启用", default=False)
+    application_ids = models.JSONField(verbose_name="应用ID列表", default=list)
     mcp_output_enable = models.BooleanField(verbose_name="MCP输出是否启用", default=True)
 
     @staticmethod

apps/application/serializers/application.py

@@ -857,7 +857,7 @@ def edit(self, instance: Dict, with_valid=True):
                        'api_key_is_active', 'icon', 'work_flow', 'model_params_setting', 'tts_model_params_setting',
                        'stt_model_params_setting',
                        'mcp_enable', 'mcp_tool_ids', 'mcp_servers', 'mcp_source', 'tool_enable', 'tool_ids',
-                       'mcp_output_enable',
+                       'mcp_output_enable', 'application_enable', 'application_ids',
                        'problem_optimization_prompt', 'clean_time', 'folder_id']
         for update_key in update_keys:
             if update_key in instance and instance.get(update_key) is not None:

apps/application/serializers/common.py

@@ -162,6 +162,8 @@ def to_base_pipeline_manage_params(self):
             'mcp_source': self.application.mcp_source,
             'tool_enable': self.application.tool_enable,
             'tool_ids': self.application.tool_ids,
+            'application_enable': self.application.application_enable,
+            'application_ids': self.application.application_ids,
             'mcp_output_enable': self.application.mcp_output_enable,
         }