feat: add response body schemas for various API endpoints

--bug=1060032 --user=王孝刚 【桂物智慧】 api 调用客户端修改对话摘要接口，报错403，没有访问权限 https://www.tapd.cn/57709429/s/1757188

.github/dependabot.yml

@@ -6,4 +6,12 @@ updates:
       interval: "weekly"
       timezone: "Asia/Shanghai"
       day: "friday"
-    target-branch: "v2"
+    target-branch: "v2"
+    groups:
+      python-dependencies:
+        patterns:
+          - "*"
+#    ignore:
+#      - dependency-name: "pymupdf"
+#        versions: ["*"]
+

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

@@ -7,7 +7,7 @@ on:
     inputs:
       dockerImageTag:
         description: 'Image Tag'
-        default: 'v1.10.6-dev'
+        default: 'v1.10.7-dev'
         required: true
       dockerImageTagWithLatest:
         description: '是否发布latest tag（正式发版时选择，测试版本切勿选择）'
@@ -36,7 +36,7 @@ on:
 jobs:
   build-and-push-to-fit2cloud-registry:
     if: ${{ contains(github.event.inputs.registry, 'fit2cloud') }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Check Disk Space
         run: df -h
@@ -52,10 +52,6 @@ jobs:
           swap-storage: true
       - name: Check Disk Space
         run: df -h
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
-        with:
-          swap-size-gb: 8
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -68,18 +64,15 @@ jobs:
           TAG_NAME=${{ github.event.inputs.dockerImageTag }}
           TAG_NAME_WITH_LATEST=${{ github.event.inputs.dockerImageTagWithLatest }}
           if [[ ${TAG_NAME_WITH_LATEST} == 'true' ]]; then            
-            DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
+            DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:${TAG_NAME%%.*}"
           else
             DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME}"
           fi
           echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --memory-swap -1 \
-            --build-arg DOCKER_IMAGE_TAG=${{ github.event.inputs.dockerImageTag }} --build-arg BUILD_AT=$(TZ=Asia/Shanghai date +'%Y-%m-%dT%H:%M') --build-arg GITHUB_COMMIT=${GITHUB_SHA::8} --no-cache \
+            --build-arg DOCKER_IMAGE_TAG=${{ github.event.inputs.dockerImageTag }} --build-arg BUILD_AT=$(TZ=Asia/Shanghai date +'%Y-%m-%dT%H:%M') --build-arg GITHUB_COMMIT=`git rev-parse --short HEAD` --no-cache \
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-        with:
-          # Until https://github.com/tonistiigi/binfmt/issues/215
-          image: tonistiigi/binfmt:qemu-v7.0.0-28
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
@@ -96,11 +89,12 @@ jobs:
           password: ${{ secrets.FIT2CLOUD_REGISTRY_PASSWORD }}
       - name: Docker Buildx (build-and-push)
         run: |
+          sudo sync && echo 3 | sudo tee /proc/sys/vm/drop_caches && free -m
           docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} -f installer/Dockerfile
 
   build-and-push-to-dockerhub:
     if: ${{ contains(github.event.inputs.registry, 'dockerhub') }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Check Disk Space
         run: df -h
@@ -116,10 +110,6 @@ jobs:
           swap-storage: true
       - name: Check Disk Space
         run: df -h
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
-        with:
-          swap-size-gb: 8
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -132,18 +122,15 @@ jobs:
           TAG_NAME=${{ github.event.inputs.dockerImageTag }}          
           TAG_NAME_WITH_LATEST=${{ github.event.inputs.dockerImageTagWithLatest }}
           if [[ ${TAG_NAME_WITH_LATEST} == 'true' ]]; then            
-            DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
+            DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:${TAG_NAME%%.*}"
           else
             DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME}"
           fi
           echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --memory-swap -1 \
-            --build-arg DOCKER_IMAGE_TAG=${{ github.event.inputs.dockerImageTag }} --build-arg BUILD_AT=$(TZ=Asia/Shanghai date +'%Y-%m-%dT%H:%M') --build-arg GITHUB_COMMIT=${GITHUB_SHA::8} --no-cache \
+            --build-arg DOCKER_IMAGE_TAG=${{ github.event.inputs.dockerImageTag }} --build-arg BUILD_AT=$(TZ=Asia/Shanghai date +'%Y-%m-%dT%H:%M') --build-arg GITHUB_COMMIT=`git rev-parse --short HEAD` --no-cache \
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-        with:
-          # Until https://github.com/tonistiigi/binfmt/issues/215
-          image: tonistiigi/binfmt:qemu-v7.0.0-28
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
@@ -159,4 +146,5 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Docker Buildx (build-and-push)
         run: |
+          sudo sync && echo 3 | sudo tee /proc/sys/vm/drop_caches && free -m
           docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} -f installer/Dockerfile

README.md

@@ -1,5 +1,6 @@
 <p align="center"><img src= "https://github.com/1Panel-dev/maxkb/assets/52996290/c0694996-0eed-40d8-b369-322bf2a380bf" alt="MaxKB" width="300" /></p>
-<h3 align="center">An Open-Source AI Assistant for Enterprise</h3>
+<h3 align="center">Open-source platform for building enterprise-grade agents</h3>
+<h3 align="center">强大易用的企业级智能体平台</h3>
 <p align="center"><a href="https://trendshift.io/repositories/9113" target="_blank"><img src="https://trendshift.io/api/badge/repositories/9113" alt="1Panel-dev%2FMaxKB | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a></p>
 <p align="center">
   <a href="https://www.gnu.org/licenses/gpl-3.0.html#license-text"><img src="https://img.shields.io/github/license/1Panel-dev/maxkb?color=%231890FF" alt="License: GPL v3"></a>
@@ -10,7 +11,7 @@
 </p>
 <hr/>
 
-MaxKB = Max Knowledge Brain, it is a powerful and easy-to-use AI assistant that integrates Retrieval-Augmented Generation (RAG) pipelines, supports robust workflows, and provides advanced MCP tool-use capabilities. MaxKB is widely applied in scenarios such as intelligent customer service, corporate internal knowledge bases, academic research, and education.
+MaxKB = Max Knowledge Brain, it is an open-source platform for building enterprise-grade agents. MaxKB integrates Retrieval-Augmented Generation (RAG) pipelines, supports robust workflows, and provides advanced MCP tool-use capabilities. MaxKB is widely applied in scenarios such as intelligent customer service, corporate internal knowledge bases, academic research, and education.
 
 - **RAG Pipeline**: Supports direct uploading of documents / automatic crawling of online documents, with features for automatic text splitting, vectorization. This effectively reduces hallucinations in large models, providing a superior smart Q&A interaction experience.
 - **Agentic Workflow**: Equipped with a powerful workflow engine, function library and MCP tool-use, enabling the orchestration of AI processes to meet the needs of complex business scenarios. 
@@ -55,8 +56,6 @@ Access MaxKB web interface at `http://your_server_ip:8080` with default admin cr
 
 ## Feature Comparison
 
-MaxKB is positioned as an Ready-to-use RAG (Retrieval-Augmented Generation) intelligent Q&A application, rather than a middleware platform for building large model applications. The following table is merely a comparison from a functional perspective.
-
 <table style="width: 100%;">
   <tr>
     <th align="center">Feature</th>

README_CN.md

@@ -1,19 +1,20 @@
 <p align="center"><img src= "https://github.com/1Panel-dev/maxkb/assets/52996290/c0694996-0eed-40d8-b369-322bf2a380bf" alt="MaxKB" width="300" /></p>
-<h3 align="center">强大易用的企业级 AI 助手</h3>
+<h3 align="center">强大易用的企业级智能体平台</h3>
 <p align="center">
     <a href="https://trendshift.io/repositories/9113" target="_blank"><img src="https://trendshift.io/api/badge/repositories/9113" alt="1Panel-dev%2FMaxKB | Trendshift" style="width: 250px; height: auto;" /></a>
-    <a href="https://market.aliyun.com/products/53690006/cmjj00067609.html?userCode=kmemb8jp" target="_blank"><img src="https://img.alicdn.com/imgextra/i2/O1CN01H5JIwY1rZ0OobDjnJ_!!6000000005644-2-tps-1000-216.png" alt="1Panel-dev%2FMaxKB | Aliyun" style="width: 250px; height: auto;" /></a>
 </p>
 <p align="center">
   <a href="README_EN.md"><img src="https://img.shields.io/badge/English_README-blue" alt="English README"></a>
-  <a href="https://www.gnu.org/licenses/gpl-3.0.html#license-text"><img src="https://img.shields.io/github/license/1Panel-dev/maxkb" alt="License: GPL v3"></a>
+  <a href="https://www.gnu.org/licenses/gpl-3.0.html#license-text"><img src="https://img.shields.io/github/license/1Panel-dev/maxkb?color=%231890FF" alt="License: GPL v3"></a>
   <a href="https://github.com/1Panel-dev/maxkb/releases/latest"><img src="https://img.shields.io/github/v/release/1Panel-dev/maxkb" alt="Latest release"></a>
-  <a href="https://github.com/1Panel-dev/maxkb"><img src="https://img.shields.io/github/stars/1Panel-dev/maxkb?style=flat-square" alt="Stars"></a>    
-  <a href="https://hub.docker.com/r/1panel/maxkb"><img src="https://img.shields.io/docker/pulls/1panel/maxkb?label=downloads" alt="Download"></a>  
+  <a href="https://github.com/1Panel-dev/maxkb"><img src="https://img.shields.io/github/stars/1Panel-dev/maxkb?style=flat-square" alt="Stars"></a>
+  <a href="https://hub.docker.com/r/1panel/maxkb"><img src="https://img.shields.io/docker/pulls/1panel/maxkb?label=downloads" alt="Download"></a>
+  <a href="https://gitee.com/fit2cloud-feizhiyun/MaxKB"><img src="https://gitee.com/fit2cloud-feizhiyun/MaxKB/badge/star.svg?theme=gvp" alt="Gitee Stars"></a>
+  <a href="https://gitcode.com/feizhiyun/MaxKB"><img src="https://gitcode.com/feizhiyun/MaxKB/star/badge.svg" alt="GitCode Stars"></a>
 </p>
 <hr/>
 
-MaxKB = Max Knowledge Brain，是一款强大易用的企业级 AI 助手，支持 RAG 检索增强生成、工作流编排、MCP 工具调用能力。MaxKB 支持对接各种主流大语言模型，广泛应用于智能客服、企业内部知识库问答、员工助手、学术研究与教育等场景。
+MaxKB = Max Knowledge Brain，是一款强大易用的企业级智能体平台，支持 RAG 检索增强生成、工作流编排、MCP 工具调用能力。MaxKB 支持对接各种主流大语言模型，广泛应用于智能客服、企业内部知识库问答、员工助手、学术研究与教育等场景。
 
 - **RAG 检索增强生成**：高效搭建本地 AI 知识库，支持直接上传文档 / 自动爬取在线文档，支持文本自动拆分、向量化，有效减少大模型幻觉，提升问答效果；
 - **灵活编排**：内置强大的工作流引擎、函数库和 MCP 工具调用能力，支持编排 AI 工作过程，满足复杂业务场景下的需求；

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

@@ -40,6 +40,7 @@ tool_message_template = """
 
 """
 
+
 def _write_context(node_variable: Dict, workflow_variable: Dict, node: INode, workflow, answer: str,
                    reasoning_content: str):
     chat_model = node_variable.get('chat_model')
@@ -102,7 +103,6 @@ def write_context_stream(node_variable: Dict, workflow_variable: Dict, node: INo
     _write_context(node_variable, workflow_variable, node, workflow, answer, reasoning_content)
 
 
-
 async def _yield_mcp_response(chat_model, message_list, mcp_servers):
     async with MultiServerMCPClient(json.loads(mcp_servers)) as client:
         agent = create_react_agent(chat_model, client.get_tools())
@@ -115,6 +115,7 @@ async def _yield_mcp_response(chat_model, message_list, mcp_servers):
             if isinstance(chunk[0], AIMessageChunk):
                 yield chunk[0]
 
+
 def mcp_response_generator(chat_model, message_list, mcp_servers):
     loop = asyncio.new_event_loop()
     try:
@@ -130,6 +131,7 @@ def mcp_response_generator(chat_model, message_list, mcp_servers):
     finally:
         loop.close()
 
+
 async def anext_async(agen):
     return await agen.__anext__()
 
@@ -186,7 +188,8 @@ class BaseChatNode(IChatNode):
         self.context['answer'] = details.get('answer')
         self.context['question'] = details.get('question')
         self.context['reasoning_content'] = details.get('reasoning_content')
-        self.answer_text = details.get('answer')
+        if self.node_params.get('is_result', False):
+            self.answer_text = details.get('answer')
 
     def execute(self, model_id, system, prompt, dialogue_number, history_chat_record, stream, chat_id, chat_record_id,
                 model_params_setting=None,
@@ -216,7 +219,7 @@ class BaseChatNode(IChatNode):
         message_list = self.generate_message_list(system, prompt, history_message)
         self.context['message_list'] = message_list
 
-        if mcp_enable and mcp_servers is not None:
+        if mcp_enable and mcp_servers is not None and '"stdio"' not in mcp_servers:
             r = mcp_response_generator(chat_model, message_list, mcp_servers)
             return NodeResult(
                 {'result': r, 'chat_model': chat_model, 'message_list': message_list,

apps/application/flow/step_node/application_node/impl/base_application_node.py

@@ -168,7 +168,8 @@ class BaseApplicationNode(IApplicationNode):
         self.context['question'] = details.get('question')
         self.context['type'] = details.get('type')
         self.context['reasoning_content'] = details.get('reasoning_content')
-        self.answer_text = details.get('answer')
+        if self.node_params.get('is_result', False):
+            self.answer_text = details.get('answer')
 
     def execute(self, application_id, message, chat_id, chat_record_id, stream, re_chat, client_id, client_type,
                 app_document_list=None, app_image_list=None, app_audio_list=None, child_node=None, node_data=None,
@@ -178,7 +179,8 @@ class BaseApplicationNode(IApplicationNode):
         current_chat_id = string_to_uuid(chat_id + application_id)
         Chat.objects.get_or_create(id=current_chat_id, defaults={
             'application_id': application_id,
-            'abstract': message[0:1024]
+            'abstract': message[0:1024],
+            'client_id': client_id,
         })
         if app_document_list is None:
             app_document_list = []

apps/application/flow/step_node/direct_reply_node/impl/base_reply_node.py

@@ -15,7 +15,9 @@ from application.flow.step_node.direct_reply_node.i_reply_node import IReplyNode
 class BaseReplyNode(IReplyNode):
     def save_context(self, details, workflow_manage):
         self.context['answer'] = details.get('answer')
-        self.answer_text = details.get('answer')
+        if self.node_params.get('is_result', False):
+            self.answer_text = details.get('answer')
+
     def execute(self, reply_type, stream, fields=None, content=None, **kwargs) -> NodeResult:
         if reply_type == 'referencing':
             result = self.get_reference_content(fields)

apps/application/flow/step_node/form_node/impl/base_form_node.py

@@ -38,7 +38,8 @@ class BaseFormNode(IFormNode):
         self.context['start_time'] = details.get('start_time')
         self.context['form_data'] = form_data
         self.context['is_submit'] = details.get('is_submit')
-        self.answer_text = details.get('result')
+        if self.node_params.get('is_result', False):
+            self.answer_text = details.get('result')
         if form_data is not None:
             for key in form_data:
                 self.context[key] = form_data[key]
@@ -70,7 +71,7 @@ class BaseFormNode(IFormNode):
                         "chat_record_id": self.flow_params_serializer.data.get("chat_record_id"),
                         'form_data': self.context.get('form_data', {}),
                         "is_submit": self.context.get("is_submit", False)}
-        form = f'<form_rander>{json.dumps(form_setting,ensure_ascii=False)}</form_rander>'
+        form = f'<form_rander>{json.dumps(form_setting, ensure_ascii=False)}</form_rander>'
         context = self.workflow_manage.get_workflow_content()
         form_content_format = self.workflow_manage.reset_prompt(form_content_format)
         prompt_template = PromptTemplate.from_template(form_content_format, template_format='jinja2')
@@ -85,7 +86,7 @@ class BaseFormNode(IFormNode):
                         "chat_record_id": self.flow_params_serializer.data.get("chat_record_id"),
                         'form_data': self.context.get('form_data', {}),
                         "is_submit": self.context.get("is_submit", False)}
-        form = f'<form_rander>{json.dumps(form_setting,ensure_ascii=False)}</form_rander>'
+        form = f'<form_rander>{json.dumps(form_setting, ensure_ascii=False)}</form_rander>'
         context = self.workflow_manage.get_workflow_content()
         form_content_format = self.workflow_manage.reset_prompt(form_content_format)
         prompt_template = PromptTemplate.from_template(form_content_format, template_format='jinja2')

apps/application/flow/step_node/function_lib_node/impl/base_function_lib_node.py

@@ -65,7 +65,7 @@ def valid_reference_value(_type, value, name):
 
 
 def convert_value(name: str, value, _type, is_required, source, node):
-    if not is_required and value is None:
+    if not is_required and (value is None or (isinstance(value, str) and len(value) == 0)):
         return None
     if not is_required and source == 'reference' and (value is None or len(value) == 0):
         return None
@@ -113,7 +113,8 @@ def valid_function(function_lib, user_id):
 class BaseFunctionLibNodeNode(IFunctionLibNode):
     def save_context(self, details, workflow_manage):
         self.context['result'] = details.get('result')
-        self.answer_text = str(details.get('result'))
+        if self.node_params.get('is_result'):
+            self.answer_text = str(details.get('result'))
 
     def execute(self, function_lib_id, input_field_list, **kwargs) -> NodeResult:
         function_lib = QuerySet(FunctionLib).filter(id=function_lib_id).first()

apps/application/flow/step_node/function_node/impl/base_function_node.py

@@ -49,7 +49,7 @@ def valid_reference_value(_type, value, name):
 
 
 def convert_value(name: str, value, _type, is_required, source, node):
-    if not is_required and value is None:
+    if not is_required and (value is None or (isinstance(value, str) and len(value) == 0)):
         return None
     if source == 'reference':
         value = node.workflow_manage.get_reference_field(
@@ -84,7 +84,8 @@ def convert_value(name: str, value, _type, is_required, source, node):
 class BaseFunctionNodeNode(IFunctionNode):
     def save_context(self, details, workflow_manage):
         self.context['result'] = details.get('result')
-        self.answer_text = str(details.get('result'))
+        if self.node_params.get('is_result', False):
+            self.answer_text = str(details.get('result'))
 
     def execute(self, input_field_list, code, **kwargs) -> NodeResult:
         params = {field.get('name'): convert_value(field.get('name'), field.get('value'), field.get('type'),

apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py

@@ -16,7 +16,8 @@ class BaseImageGenerateNode(IImageGenerateNode):
     def save_context(self, details, workflow_manage):
         self.context['answer'] = details.get('answer')
         self.context['question'] = details.get('question')
-        self.answer_text = details.get('answer')
+        if self.node_params.get('is_result', False):
+            self.answer_text = details.get('answer')
 
     def execute(self, model_id, prompt, negative_prompt, dialogue_number, dialogue_type, history_chat_record, chat_id,
                 model_params_setting,
@@ -24,7 +25,8 @@ class BaseImageGenerateNode(IImageGenerateNode):
                 **kwargs) -> NodeResult:
         print(model_params_setting)
         application = self.workflow_manage.work_flow_post_handler.chat_info.application
-        tti_model = get_model_instance_by_model_user_id(model_id, self.flow_params_serializer.data.get('user_id'), **model_params_setting)
+        tti_model = get_model_instance_by_model_user_id(model_id, self.flow_params_serializer.data.get('user_id'),
+                                                        **model_params_setting)
         history_message = self.get_history_message(history_chat_record, dialogue_number)
         self.context['history_message'] = history_message
         question = self.generate_prompt_question(prompt)

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

@@ -69,7 +69,8 @@ class BaseImageUnderstandNode(IImageUnderstandNode):
     def save_context(self, details, workflow_manage):
         self.context['answer'] = details.get('answer')
         self.context['question'] = details.get('question')
-        self.answer_text = details.get('answer')
+        if self.node_params.get('is_result', False):
+            self.answer_text = details.get('answer')
 
     def execute(self, model_id, system, prompt, dialogue_number, dialogue_type, history_chat_record, stream, chat_id,
                 model_params_setting,

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

@@ -14,7 +14,8 @@ class BaseMcpNode(IMcpNode):
         self.context['result'] = details.get('result')
         self.context['tool_params'] = details.get('tool_params')
         self.context['mcp_tool'] = details.get('mcp_tool')
-        self.answer_text = details.get('result')
+        if self.node_params.get('is_result', False):
+            self.answer_text = details.get('result')
 
     def execute(self, mcp_servers, mcp_server, mcp_tool, tool_params, **kwargs) -> NodeResult:
         servers = json.loads(mcp_servers)
@@ -27,7 +28,8 @@ class BaseMcpNode(IMcpNode):
                 return s
 
         res = asyncio.run(call_tool(servers, mcp_server, mcp_tool, params))
-        return NodeResult({'result': [content.text for content in res.content], 'tool_params': params, 'mcp_tool': mcp_tool}, {})
+        return NodeResult(
+            {'result': [content.text for content in res.content], 'tool_params': params, 'mcp_tool': mcp_tool}, {})
 
     def handle_variables(self, tool_params):
         # 处理参数中的变量

apps/application/flow/step_node/question_node/impl/base_question_node.py

@@ -80,7 +80,8 @@ class BaseQuestionNode(IQuestionNode):
         self.context['answer'] = details.get('answer')
         self.context['message_tokens'] = details.get('message_tokens')
         self.context['answer_tokens'] = details.get('answer_tokens')
-        self.answer_text = details.get('answer')
+        if self.node_params.get('is_result', False):
+            self.answer_text = details.get('answer')
 
     def execute(self, model_id, system, prompt, dialogue_number, history_chat_record, stream, chat_id, chat_record_id,
                 model_params_setting=None,

apps/application/flow/step_node/speech_to_text_step_node/impl/base_speech_to_text_node.py

@@ -18,7 +18,8 @@ class BaseSpeechToTextNode(ISpeechToTextNode):
 
     def save_context(self, details, workflow_manage):
         self.context['answer'] = details.get('answer')
-        self.answer_text = details.get('answer')
+        if self.node_params.get('is_result', False):
+            self.answer_text = details.get('answer')
 
     def execute(self, stt_model_id, chat_id, audio, **kwargs) -> NodeResult:
         stt_model = get_model_instance_by_model_user_id(stt_model_id, self.flow_params_serializer.data.get('user_id'))

apps/application/flow/step_node/start_node/impl/base_start_node.py

@@ -45,6 +45,8 @@ class BaseStartStepNode(IStarNode):
         self.err_message = details.get('err_message')
         for key, value in workflow_variable.items():
             workflow_manage.context[key] = value
+        for item in details.get('global_fields', []):
+            workflow_manage.context[item.get('key')] = item.get('value')
 
     def get_node_params_serializer_class(self) -> Type[serializers.Serializer]:
         pass

apps/application/flow/step_node/text_to_speech_step_node/impl/base_text_to_speech_node.py

@@ -37,7 +37,8 @@ def bytes_to_uploaded_file(file_bytes, file_name="generated_audio.mp3"):
 class BaseTextToSpeechNode(ITextToSpeechNode):
     def save_context(self, details, workflow_manage):
         self.context['answer'] = details.get('answer')
-        self.answer_text = details.get('answer')
+        if self.node_params.get('is_result', False):
+            self.answer_text = details.get('answer')
 
     def execute(self, tts_model_id, chat_id,
                 content, model_params_setting=None,

apps/application/serializers/application_serializers.py

@@ -164,7 +164,7 @@ class ApplicationWorkflowSerializer(serializers.Serializer):
                                  max_length=256, min_length=1,
                                  error_messages=ErrMessage.char(_("Application Description")))
     work_flow = serializers.DictField(required=False, error_messages=ErrMessage.dict(_("Workflow Objects")))
-    prologue = serializers.CharField(required=False, allow_null=True, allow_blank=True, max_length=4096,
+    prologue = serializers.CharField(required=False, allow_null=True, allow_blank=True, max_length=102400,
                                      error_messages=ErrMessage.char(_("Opening remarks")))
 
     @staticmethod
@@ -227,7 +227,7 @@ class ApplicationSerializer(serializers.Serializer):
                                                min_value=0,
                                                max_value=1024,
                                                error_messages=ErrMessage.integer(_("Historical chat records")))
-    prologue = serializers.CharField(required=False, allow_null=True, allow_blank=True, max_length=4096,
+    prologue = serializers.CharField(required=False, allow_null=True, allow_blank=True, max_length=102400,
                                      error_messages=ErrMessage.char(_("Opening remarks")))
     dataset_id_list = serializers.ListSerializer(required=False, child=serializers.UUIDField(required=True),
                                                  allow_null=True,
@@ -495,7 +495,7 @@ class ApplicationSerializer(serializers.Serializer):
                                                    min_value=0,
                                                    max_value=1024,
                                                    error_messages=ErrMessage.integer(_("Historical chat records")))
-        prologue = serializers.CharField(required=False, allow_null=True, allow_blank=True, max_length=4096,
+        prologue = serializers.CharField(required=False, allow_null=True, allow_blank=True, max_length=102400,
                                          error_messages=ErrMessage.char(_("Opening remarks")))
         dataset_id_list = serializers.ListSerializer(required=False, child=serializers.UUIDField(required=True),
                                                      error_messages=ErrMessage.list(_("Related Knowledge Base"))
@@ -1012,7 +1012,8 @@ class ApplicationSerializer(serializers.Serializer):
                  'stt_autosend': application.stt_autosend,
                  'file_upload_enable': application.file_upload_enable,
                  'file_upload_setting': application.file_upload_setting,
-                 'work_flow': application.work_flow,
+                 'work_flow': {'nodes': [node for node in ((application.work_flow or {}).get('nodes', []) or []) if
+                                         node.get('id') == 'base-node']},
                  'show_source': application_access_token.show_source,
                  'language': application_access_token.language,
                  **application_setting_dict})
@@ -1324,6 +1325,8 @@ class ApplicationSerializer(serializers.Serializer):
         def get_mcp_servers(self, with_valid=True):
             if with_valid:
                 self.is_valid(raise_exception=True)
+                if '"stdio"' in self.data.get('mcp_servers'):
+                    raise AppApiException(500, _('stdio is not supported'))
             servers = json.loads(self.data.get('mcp_servers'))
 
             async def get_mcp_tools(servers):

apps/application/serializers/chat_serializers.py

@@ -174,7 +174,14 @@ class ChatSerializers(serializers.Serializer):
                 condition = base_condition & min_trample_query
             else:
                 condition = base_condition
-            return query_set.filter(condition).order_by("-application_chat.update_time")
+            inner_queryset = QuerySet(Chat).filter(application_id=self.data.get("application_id"))
+            if 'abstract' in self.data and self.data.get('abstract') is not None:
+                inner_queryset = inner_queryset.filter(abstract__icontains=self.data.get('abstract'))
+
+            return {
+                'inner_queryset': inner_queryset,
+                'default_queryset': query_set.filter(condition).order_by("-application_chat.update_time")
+            }
 
         def list(self, with_valid=True):
             if with_valid:

apps/application/sql/export_application_chat.sql

@@ -23,6 +23,8 @@ FROM
 		chat_id
 	FROM
 		application_chat_record
+	WHERE chat_id IN (
+	  SELECT id FROM application_chat ${inner_queryset})
 	GROUP BY
 		application_chat_record.chat_id
 	) chat_record_temp ON application_chat."id" = chat_record_temp.chat_id
@@ -35,4 +37,5 @@ FROM
 		END as improve_paragraph_list
 		FROM
 		application_chat_record application_chat_record
-	) application_chat_record_temp ON application_chat_record_temp.chat_id = application_chat."id"
+	) application_chat_record_temp ON application_chat_record_temp.chat_id = application_chat."id"
+	${default_queryset}

apps/application/sql/list_application_chat.sql

@@ -11,6 +11,9 @@ FROM
 		chat_id
 	FROM
 		application_chat_record
+	WHERE chat_id IN (
+	  SELECT id FROM application_chat ${inner_queryset})
 	GROUP BY
 	application_chat_record.chat_id
-	) chat_record_temp ON application_chat."id" = chat_record_temp.chat_id
+	) chat_record_temp ON application_chat."id" = chat_record_temp.chat_id
+${default_queryset}

apps/application/swagger_api/application_api.py

@@ -38,6 +38,15 @@ class ApplicationApi(ApiMixin):
                 }
             )
 
+        @staticmethod
+        def get_response_body_api():
+            return openapi.Schema(
+                type=openapi.TYPE_STRING,
+                title=_("Application authentication token"),
+                description=_("Application authentication token"),
+                default="token"
+            )
+
     @staticmethod
     def get_response_body_api():
         return openapi.Schema(
@@ -133,6 +142,27 @@ class ApplicationApi(ApiMixin):
                     }
                 )
 
+            @staticmethod
+            def get_response_body_api():
+                return openapi.Schema(
+                    type=openapi.TYPE_OBJECT,
+                    properties={
+                        'id': openapi.Schema(type=openapi.TYPE_STRING, title=_("Primary key id"),
+                                             description=_("Primary key id")),
+                        'secret_key': openapi.Schema(type=openapi.TYPE_STRING, title=_("Secret key"),
+                                                     description=_("Secret key")),
+                        'is_active': openapi.Schema(type=openapi.TYPE_BOOLEAN, title=_("Is activation"),
+                                                    description=_("Is activation")),
+                        'application_id': openapi.Schema(type=openapi.TYPE_STRING, title=_("Application ID"),
+                                                         description=_("Application ID")),
+                        'allow_cross_domain': openapi.Schema(type=openapi.TYPE_BOOLEAN,
+                                                             title=_("Is cross-domain allowed"),
+                                                             description=_("Is cross-domain allowed")),
+                        'cross_domain_list': openapi.Schema(type=openapi.TYPE_ARRAY, title=_('Cross-domain list'),
+                                                            items=openapi.Schema(type=openapi.TYPE_STRING))
+                    }
+                )
+
     class AccessToken(ApiMixin):
         @staticmethod
         def get_request_params_api():
@@ -171,6 +201,37 @@ class ApplicationApi(ApiMixin):
                 }
             )
 
+        @staticmethod
+        def get_response_body_api():
+            return openapi.Schema(
+                type=openapi.TYPE_OBJECT,
+                required=[],
+                properties={
+                    'id': openapi.Schema(type=openapi.TYPE_STRING, title=_("Primary key id"),
+                                         description=_("Primary key id")),
+                    'access_token': openapi.Schema(type=openapi.TYPE_STRING, title=_("Access Token"),
+                                                   description=_("Access Token")),
+                    'access_token_reset': openapi.Schema(type=openapi.TYPE_BOOLEAN, title=_("Reset Token"),
+                                                         description=_("Reset Token")),
+
+                    'is_active': openapi.Schema(type=openapi.TYPE_BOOLEAN, title=_("Is activation"),
+                                                description=_("Is activation")),
+                    'access_num': openapi.Schema(type=openapi.TYPE_NUMBER, title=_("Number of visits"),
+                                                 description=_("Number of visits")),
+                    'white_active': openapi.Schema(type=openapi.TYPE_BOOLEAN, title=_("Whether to enable whitelist"),
+                                                   description=_("Whether to enable whitelist")),
+                    'white_list': openapi.Schema(type=openapi.TYPE_ARRAY,
+                                                 items=openapi.Schema(type=openapi.TYPE_STRING), title=_("Whitelist"),
+                                                 description=_("Whitelist")),
+                    'show_source': openapi.Schema(type=openapi.TYPE_BOOLEAN,
+                                                  title=_("Whether to display knowledge sources"),
+                                                  description=_("Whether to display knowledge sources")),
+                    'language': openapi.Schema(type=openapi.TYPE_STRING,
+                                               title=_("language"),
+                                               description=_("language"))
+                }
+            )
+
     class Edit(ApiMixin):
         @staticmethod
         def get_request_body_api():
@@ -367,6 +428,56 @@ class ApplicationApi(ApiMixin):
                 }
             )
 
+        @staticmethod
+        def get_response_body_api():
+            return openapi.Schema(
+                type=openapi.TYPE_OBJECT,
+                required=['id', 'name', 'desc', 'model_id', 'dialogue_number', 'dataset_setting', 'model_setting',
+                          'problem_optimization', 'stt_model_enable', 'stt_model_enable', 'tts_type',
+                          'work_flow'],
+                properties={
+                    'id': openapi.Schema(type=openapi.TYPE_STRING, title=_("Primary key id"),
+                                         description=_("Primary key id")),
+                    'name': openapi.Schema(type=openapi.TYPE_STRING, title=_("Application Name"),
+                                           description=_("Application Name")),
+                    'desc': openapi.Schema(type=openapi.TYPE_STRING, title=_("Application Description"),
+                                           description=_("Application Description")),
+                    'model_id': openapi.Schema(type=openapi.TYPE_STRING, title=_("Model id"),
+                                               description=_("Model id")),
+                    "dialogue_number": openapi.Schema(type=openapi.TYPE_NUMBER,
+                                                      title=_("Number of multi-round conversations"),
+                                                      description=_("Number of multi-round conversations")),
+                    'prologue': openapi.Schema(type=openapi.TYPE_STRING, title=_("Opening remarks"),
+                                               description=_("Opening remarks")),
+                    'dataset_id_list': openapi.Schema(type=openapi.TYPE_ARRAY,
+                                                      items=openapi.Schema(type=openapi.TYPE_STRING),
+                                                      title=_("List of associated knowledge base IDs"),
+                                                      description=_("List of associated knowledge base IDs")),
+                    'dataset_setting': ApplicationApi.DatasetSetting.get_request_body_api(),
+                    'model_setting': ApplicationApi.ModelSetting.get_request_body_api(),
+                    'problem_optimization': openapi.Schema(type=openapi.TYPE_BOOLEAN, title=_("Problem Optimization"),
+                                                           description=_("Problem Optimization"), default=True),
+                    'type': openapi.Schema(type=openapi.TYPE_STRING, title=_("Application Type"),
+                                           description=_("Application Type   SIMPLE |  WORK_FLOW")),
+                    'problem_optimization_prompt': openapi.Schema(type=openapi.TYPE_STRING,
+                                                                  title=_('Question optimization tips'),
+                                                                  description=_("Question optimization tips"),
+                                                                  default=_(
+                                                                      "() contains the user's question. Answer the guessed user's question based on the context ({question}) Requirement: Output a complete question and put it in the <data></data> tag")),
+                    'tts_model_id': openapi.Schema(type=openapi.TYPE_STRING, title=_("Text-to-speech model ID"),
+                                                   description=_("Text-to-speech model ID")),
+                    'stt_model_id': openapi.Schema(type=openapi.TYPE_STRING, title=_("Speech-to-text model id"),
+                                                   description=_("Speech-to-text model id")),
+                    'stt_model_enable': openapi.Schema(type=openapi.TYPE_STRING, title=_("Is speech-to-text enabled"),
+                                                       description=_("Is speech-to-text enabled")),
+                    'tts_model_enable': openapi.Schema(type=openapi.TYPE_STRING, title=_("Is text-to-speech enabled"),
+                                                       description=_("Is text-to-speech enabled")),
+                    'tts_type': openapi.Schema(type=openapi.TYPE_STRING, title=_("Text-to-speech type"),
+                                               description=_("Text-to-speech type")),
+                    'work_flow': ApplicationApi.WorkFlow.get_request_body_api(),
+                }
+            )
+
     class Query(ApiMixin):
         @staticmethod
         def get_request_params_api():

apps/application/swagger_api/chat_api.py

@@ -319,6 +319,15 @@ class ChatApi(ApiMixin):
                 }
             )
 
+        @staticmethod
+        def get_response_body_api():
+            return openapi.Schema(
+                type=openapi.TYPE_STRING,
+                title=_("Conversation ID"),
+                description=_("Conversation ID"),
+                default="chat_id"
+            )
+
     @staticmethod
     def get_request_params_api():
         return [openapi.Parameter(name='application_id',

apps/application/views/application_views.py

@@ -373,7 +373,8 @@ class Application(APIView):
                                  operation_id=_("Modify application API_KEY"),
                                  tags=[_('Application/API_KEY')],
                                  manual_parameters=ApplicationApi.ApiKey.Operate.get_request_params_api(),
-                                 request_body=ApplicationApi.ApiKey.Operate.get_request_body_api())
+                                 request_body=ApplicationApi.ApiKey.Operate.get_request_body_api(),
+                                 responses=result.get_api_response(ApplicationApi.ApiKey.Operate.get_response_body_api()))
             @has_permissions(ViewPermission(
                 [RoleConstants.ADMIN, RoleConstants.USER],
                 [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.MANAGE,
@@ -415,7 +416,8 @@ class Application(APIView):
                              operation_id=_("Modify Application AccessToken"),
                              tags=[_('Application/Public Access')],
                              manual_parameters=ApplicationApi.AccessToken.get_request_params_api(),
-                             request_body=ApplicationApi.AccessToken.get_request_body_api())
+                             request_body=ApplicationApi.AccessToken.get_request_body_api(),
+                             responses=result.get_api_response(ApplicationApi.AccessToken.get_response_body_api()))
         @has_permissions(ViewPermission(
             [RoleConstants.ADMIN, RoleConstants.USER],
             [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.MANAGE,
@@ -455,6 +457,7 @@ class Application(APIView):
         @swagger_auto_schema(operation_summary=_("Application Certification"),
                              operation_id=_("Application Certification"),
                              request_body=ApplicationApi.Authentication.get_request_body_api(),
+                             responses=result.get_api_response(ApplicationApi.Authentication.get_response_body_api()),
                              tags=[_("Application/Certification")],
                              security=[])
         def post(self, request: Request):
@@ -472,6 +475,7 @@ class Application(APIView):
     @swagger_auto_schema(operation_summary=_("Create an application"),
                          operation_id=_("Create an application"),
                          request_body=ApplicationApi.Create.get_request_body_api(),
+                         responses=result.get_api_response(ApplicationApi.Create.get_response_body_api()),
                          tags=[_('Application')])
     @has_permissions(PermissionConstants.APPLICATION_CREATE, compare=CompareConstants.AND)
     @log(menu='Application', operate="Create an application",

apps/application/views/chat_views.py

@@ -94,6 +94,7 @@ class ChatView(APIView):
         @swagger_auto_schema(operation_summary=_("Get the workflow temporary session id"),
                              operation_id=_("Get the workflow temporary session id"),
                              request_body=ChatApi.OpenWorkFlowTemp.get_request_body_api(),
+                             responses=result.get_api_response(ChatApi.OpenTempChat.get_response_body_api()),
                              tags=[_("Application/Chat")])
         def post(self, request: Request):
             return result.success(ChatSerializers.OpenWorkFlowChat(
@@ -106,6 +107,7 @@ class ChatView(APIView):
         @swagger_auto_schema(operation_summary=_("Get a temporary session id"),
                              operation_id=_("Get a temporary session id"),
                              request_body=ChatApi.OpenTempChat.get_request_body_api(),
+                             responses=result.get_api_response(ChatApi.OpenTempChat.get_response_body_api()),
                              tags=[_("Application/Chat")])
         @has_permissions(RoleConstants.ADMIN, RoleConstants.USER)
         def post(self, request: Request):
@@ -239,9 +241,10 @@ class ChatView(APIView):
             @swagger_auto_schema(operation_summary=_("Client modifies dialogue summary"),
                                  operation_id=_("Client modifies dialogue summary"),
                                  request_body=ChatClientHistoryApi.Operate.ReAbstract.get_request_body_api(),
+                                 responses=result.get_default_response(),
                                  tags=[_("Application/Conversation Log")])
             @has_permissions(ViewPermission(
-                [RoleConstants.APPLICATION_ACCESS_TOKEN],
+                [RoleConstants.APPLICATION_ACCESS_TOKEN, RoleConstants.ADMIN, RoleConstants.USER],
                 [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
                                                 dynamic_tag=keywords.get('application_id'))],
                 compare=CompareConstants.AND),
@@ -418,6 +421,7 @@ class ChatView(APIView):
                                  operation_id=_("Add to Knowledge Base"),
                                  manual_parameters=ImproveApi.get_request_params_api_post(),
                                  request_body=ImproveApi.get_request_body_api_post(),
+                                 responses=result.get_default_response(),
                                  tags=[_("Application/Conversation Log/Add to Knowledge Base")]
                                  )
             @has_permissions(

apps/common/config/embedding_config.py

@@ -11,35 +11,50 @@ import time
 
 from common.cache.mem_cache import MemCache
 
-lock = threading.Lock()
+_lock = threading.Lock()
+locks = {}
 
 
 class ModelManage:
     cache = MemCache('model', {})
     up_clear_time = time.time()
 
+    @staticmethod
+    def _get_lock(_id):
+        lock = locks.get(_id)
+        if lock is None:
+            with _lock:
+                lock = locks.get(_id)
+                if lock is None:
+                    lock = threading.Lock()
+                    locks[_id] = lock
+
+        return lock
+
     @staticmethod
     def get_model(_id, get_model):
-        # 获取锁
-        lock.acquire()
-        try:
-            model_instance = ModelManage.cache.get(_id)
-            if model_instance is None or not model_instance.is_cache_model():
+        model_instance = ModelManage.cache.get(_id)
+        if model_instance is None:
+            lock = ModelManage._get_lock(_id)
+            with lock:
+                model_instance = ModelManage.cache.get(_id)
+                if model_instance is None:
+                    model_instance = get_model(_id)
+                    ModelManage.cache.set(_id, model_instance, timeout=60 * 60 * 8)
+        else:
+            if model_instance.is_cache_model():
+                ModelManage.cache.touch(_id, timeout=60 * 60 * 8)
+            else:
                 model_instance = get_model(_id)
-                ModelManage.cache.set(_id, model_instance, timeout=60 * 30)
-                return model_instance
-            # 续期
-            ModelManage.cache.touch(_id, timeout=60 * 30)
-            ModelManage.clear_timeout_cache()
-            return model_instance
-        finally:
-            # 释放锁
-            lock.release()
+                ModelManage.cache.set(_id, model_instance, timeout=60 * 60 * 8)
+        ModelManage.clear_timeout_cache()
+        return model_instance
 
     @staticmethod
     def clear_timeout_cache():
-        if time.time() - ModelManage.up_clear_time > 60:
-            ModelManage.cache.clear_timeout_data()
+        if time.time() - ModelManage.up_clear_time > 60 * 60:
+            threading.Thread(target=lambda: ModelManage.cache.clear_timeout_data()).start()
+            ModelManage.up_clear_time = time.time()
 
     @staticmethod
     def delete_key(_id):

apps/common/event/listener_manage.py

@@ -238,11 +238,8 @@ class ListenerManagement:
         for key in params_dict:
             _value_ = params_dict[key]
             exec_sql = exec_sql.replace(key, str(_value_))
-        lock.acquire()
-        try:
+        with lock:
             native_update(query_set, exec_sql)
-        finally:
-            lock.release()
 
     @staticmethod
     def embedding_by_document(document_id, embedding_model: Embeddings, state_list=None):
@@ -272,7 +269,6 @@ class ListenerManagement:
             ListenerManagement.update_status(QuerySet(Document).filter(id=document_id), TaskType.EMBEDDING,
                                              State.STARTED)
 
-
             # 根据段落进行向量化处理
             page_desc(QuerySet(Paragraph)
                       .annotate(

apps/common/forms/__init__.py

@@ -22,3 +22,4 @@ from .table_checkbox import *
 from .radio_card_field import *
 from .label import *
 from .slider_field import *
+from .switch_field import *

apps/common/forms/switch_field.py

@@ -28,6 +28,6 @@ class SwitchField(BaseField):
         @param props_info:
         """
 
-        super().__init__('Switch', label, required, default_value, relation_show_field_dict,
+        super().__init__('SwitchInput', label, required, default_value, relation_show_field_dict,
                          {},
                          TriggerType.OPTION_LIST, attrs, props_info)

apps/common/handle/impl/table/xlsx_parse_table_handle.py

@@ -19,36 +19,24 @@ class XlsxSplitHandle(BaseParseTableHandle):
 
     def fill_merged_cells(self, sheet, image_dict):
         data = []
-
-        # 获取第一行作为标题行
-        headers = []
-        for idx, cell in enumerate(sheet[1]):
-            if cell.value is None:
-                headers.append(' ' * (idx + 1))
-            else:
-                headers.append(cell.value)
-
         # 从第二行开始遍历每一行
-        for row in sheet.iter_rows(min_row=2, values_only=False):
-            row_data = {}
+        for row in sheet.iter_rows(values_only=False):
+            row_data = []
             for col_idx, cell in enumerate(row):
                 cell_value = cell.value
-
-                # 如果单元格为空，并且该单元格在合并单元格内，获取合并单元格的值
-                if cell_value is None:
-                    for merged_range in sheet.merged_cells.ranges:
-                        if cell.coordinate in merged_range:
-                            cell_value = sheet[merged_range.min_row][merged_range.min_col - 1].value
-                            break
-
                 image = image_dict.get(cell_value, None)
                 if image is not None:
                     cell_value = f'![](/api/image/{image.id})'
 
                 # 使用标题作为键，单元格的值作为值存入字典
-                row_data[headers[col_idx]] = cell_value
+                row_data.insert(col_idx, cell_value)
             data.append(row_data)
 
+        for merged_range in sheet.merged_cells.ranges:
+            cell_value = data[merged_range.min_row - 1][merged_range.min_col - 1]
+            for row_index in range(merged_range.min_row, merged_range.max_row + 1):
+                for col_index in range(merged_range.min_col, merged_range.max_col + 1):
+                    data[row_index - 1][col_index - 1] = cell_value
         return data
 
     def handle(self, file, get_buffer, save_image):
@@ -65,11 +53,13 @@ class XlsxSplitHandle(BaseParseTableHandle):
                 paragraphs = []
                 ws = wb[sheetname]
                 data = self.fill_merged_cells(ws, image_dict)
-
-                for row in data:
-                    row_output = "; ".join([f"{key}: {value}" for key, value in row.items()])
-                    # print(row_output)
-                    paragraphs.append({'title': '', 'content': row_output})
+                if len(data) >= 2:
+                    head_list = data[0]
+                    for row_index in range(1, len(data)):
+                        row_output = "; ".join(
+                            [f"{head_list[col_index]}: {data[row_index][col_index]}" for col_index in
+                             range(0, len(data[row_index]))])
+                        paragraphs.append({'title': '', 'content': row_output})
 
                 result.append({'name': sheetname, 'paragraphs': paragraphs})
 
@@ -78,7 +68,6 @@ class XlsxSplitHandle(BaseParseTableHandle):
             return [{'name': file.name, 'paragraphs': []}]
         return result
 
-
     def get_content(self, file, save_image):
         try:
             # 加载 Excel 文件
@@ -94,18 +83,18 @@ class XlsxSplitHandle(BaseParseTableHandle):
             # 如果未指定 sheet_name，则使用第一个工作表
             for sheetname in workbook.sheetnames:
                 sheet = workbook[sheetname] if sheetname else workbook.active
-                rows = self.fill_merged_cells(sheet, image_dict)
-                if len(rows) == 0:
+                data = self.fill_merged_cells(sheet, image_dict)
+                if len(data) == 0:
                     continue
                 # 提取表头和内容
 
-                headers = [f"{key}" for key, value in rows[0].items()]
+                headers = [f"{value}" for value in data[0]]
 
                 # 构建 Markdown 表格
                 md_table = '| ' + ' | '.join(headers) + ' |\n'
                 md_table += '| ' + ' | '.join(['---'] * len(headers)) + ' |\n'
-                for row in rows:
-                    r = [f'{value}' for key, value in row.items()]
+                for row_index in range(1, len(data)):
+                    r = [f'{value}' for value in data[row_index]]
                     md_table += '| ' + ' | '.join(
                         [str(cell).replace('\n', '<br>') if cell is not None else '' for cell in r]) + ' |\n'
 

apps/common/util/common.py

@@ -11,6 +11,7 @@ import importlib
 import io
 import mimetypes
 import pickle
+import random
 import re
 import shutil
 from functools import reduce
@@ -297,3 +298,14 @@ def markdown_to_plain_text(md: str) -> str:
     # 去除首尾空格
     text = text.strip()
     return text
+
+
+SAFE_CHAR_SET = (
+        [chr(i) for i in range(65, 91) if chr(i) not in {'I', 'O'}] +  # 大写字母 A-H, J-N, P-Z
+        [chr(i) for i in range(97, 123) if chr(i) not in {'i', 'l', 'o'}] +  # 小写字母 a-h, j-n, p-z
+        [str(i) for i in range(10) if str(i) not in {'0', '1', '7'}]  # 数字 2-6, 8-9
+)
+
+
+def get_random_chars(number=4):
+    return ''.join(random.choices(SAFE_CHAR_SET, k=number))

apps/common/util/function_code.py

@@ -7,13 +7,12 @@
     @desc:
 """
 import os
+import pickle
 import subprocess
 import sys
 import uuid
 from textwrap import dedent
 
-from diskcache import Cache
-
 from smartdoc.const import BASE_DIR
 from smartdoc.const import PROJECT_DIR
 
@@ -37,6 +36,8 @@ class FunctionExecutor:
         old_mask = os.umask(0o077)
         try:
             os.makedirs(self.sandbox_path, 0o700, exist_ok=True)
+            os.makedirs(os.path.join(self.sandbox_path, 'execute'), 0o700, exist_ok=True)
+            os.makedirs(os.path.join(self.sandbox_path, 'result'), 0o700, exist_ok=True)
         finally:
             os.umask(old_mask)
 
@@ -44,10 +45,11 @@ class FunctionExecutor:
         _id = str(uuid.uuid1())
         success = '{"code":200,"msg":"成功","data":exec_result}'
         err = '{"code":500,"msg":str(e),"data":None}'
-        path = r'' + self.sandbox_path + ''
+        result_path = f'{self.sandbox_path}/result/{_id}.result'
         _exec_code = f"""
 try:
     import os
+    import pickle
     env = dict(os.environ)
     for key in list(env.keys()):
         if key in os.environ and (key.startswith('MAXKB') or key.startswith('POSTGRES') or key.startswith('PG')):
@@ -60,13 +62,11 @@ try:
     for local in locals_v:
         globals_v[local] = locals_v[local]
     exec_result=f(**keywords)
-    from diskcache import Cache
-    cache = Cache({path!a})
-    cache.set({_id!a},{success})
+    with open({result_path!a}, 'wb') as file:
+        file.write(pickle.dumps({success}))
 except Exception as e:
-    from diskcache import Cache
-    cache = Cache({path!a})
-    cache.set({_id!a},{err})
+    with open({result_path!a}, 'wb') as file:
+        file.write(pickle.dumps({err}))
 """
         if self.sandbox:
             subprocess_result = self._exec_sandbox(_exec_code, _id)
@@ -74,18 +74,18 @@ except Exception as e:
             subprocess_result = self._exec(_exec_code)
         if subprocess_result.returncode == 1:
             raise Exception(subprocess_result.stderr)
-        cache = Cache(self.sandbox_path)
-        result = cache.get(_id)
-        cache.delete(_id)
+        with open(result_path, 'rb') as file:
+            result = pickle.loads(file.read())
+        os.remove(result_path)
         if result.get('code') == 200:
             return result.get('data')
         raise Exception(result.get('msg'))
 
     def _exec_sandbox(self, _code, _id):
-        exec_python_file = f'{self.sandbox_path}/{_id}.py'
+        exec_python_file = f'{self.sandbox_path}/execute/{_id}.py'
         with open(exec_python_file, 'w') as file:
             file.write(_code)
-            os.system(f"chown {self.user}:{self.user} {exec_python_file}")
+            os.system(f"chown {self.user}:root {exec_python_file}")
         kwargs = {'cwd': BASE_DIR}
         subprocess_result = subprocess.run(
             ['su', '-s', python_directory, '-c', "exec(open('" + exec_python_file + "').read())", self.user],

apps/common/util/rsa_util.py

@@ -40,15 +40,12 @@ def generate():
 def get_key_pair():
     rsa_value = rsa_cache.get(cache_key)
     if rsa_value is None:
-        lock.acquire()
-        rsa_value = rsa_cache.get(cache_key)
-        if rsa_value is not None:
-            return rsa_value
-        try:
+        with lock:
+            rsa_value = rsa_cache.get(cache_key)
+            if rsa_value is not None:
+                return rsa_value
             rsa_value = get_key_pair_by_sql()
             rsa_cache.set(cache_key, rsa_value)
-        finally:
-            lock.release()
     return rsa_value
 
 

apps/dataset/serializers/document_serializers.py

@@ -23,6 +23,8 @@ from django.db import transaction, models
 from django.db.models import QuerySet, Count
 from django.db.models.functions import Substr, Reverse
 from django.http import HttpResponse
+from django.utils.translation import get_language
+from django.utils.translation import gettext_lazy as _, gettext, to_locale
 from drf_yasg import openapi
 from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE
 from rest_framework import serializers
@@ -64,8 +66,6 @@ from embedding.task.embedding import embedding_by_document, delete_embedding_by_
     embedding_by_document_list
 from setting.models import Model
 from smartdoc.conf import PROJECT_DIR
-from django.utils.translation import gettext_lazy as _, gettext, to_locale
-from django.utils.translation import get_language
 
 parse_qa_handle_list = [XlsParseQAHandle(), CsvParseQAHandle(), XlsxParseQAHandle(), ZipParseQAHandle()]
 parse_table_handle_list = [CsvSplitTableHandle(), XlsSplitTableHandle(), XlsxSplitTableHandle()]
@@ -661,6 +661,8 @@ class DocumentSerializers(ApiMixin, serializers.Serializer):
                         cell = worksheet.cell(row=row_idx + 1, column=col_idx + 1)
                         if isinstance(col, str):
                             col = re.sub(ILLEGAL_CHARACTERS_RE, '', col)
+                            if col.startswith(('=', '+', '-', '@')):
+                                col = '\ufeff' + col
                         cell.value = col
                     # 创建HttpResponse对象返回Excel文件
             return workbook

apps/dataset/serializers/file_serializers.py

@@ -28,6 +28,9 @@ mime_types = {"html": "text/html", "htm": "text/html", "shtml": "text/html", "cs
               "woff2": "font/woff2", "jar": "application/java-archive", "war": "application/java-archive",
               "ear": "application/java-archive", "json": "application/json", "hqx": "application/mac-binhex40",
               "doc": "application/msword", "pdf": "application/pdf", "ps": "application/postscript",
+              "docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+              "xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+              "pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
               "eps": "application/postscript", "ai": "application/postscript", "rtf": "application/rtf",
               "m3u8": "application/vnd.apple.mpegurl", "kml": "application/vnd.google-earth.kml+xml",
               "kmz": "application/vnd.google-earth.kmz", "xls": "application/vnd.ms-excel",
@@ -87,4 +90,4 @@ class FileSerializer(serializers.Serializer):
                                                                           'Content-Disposition': 'attachment; filename="{}"'.format(
                                                                               file.file_name)})
             return HttpResponse(file.get_byte(), status=200,
-                                headers={'Content-Type': mime_types.get(file.file_name.split(".")[-1], 'text/plain')})
+                                headers={'Content-Type': mime_types.get(file_type, 'text/plain')})

apps/dataset/sql/update_document_char_length.sql

@@ -2,6 +2,7 @@ UPDATE "document"
 SET "char_length" = ( SELECT CASE WHEN
 		"sum" ( "char_length" ( "content" ) ) IS NULL THEN
 			0 ELSE "sum" ( "char_length" ( "content" ) )
-		END FROM paragraph WHERE "document_id" = %s )
+		END FROM paragraph WHERE "document_id" = %s ),
+    "update_time" = CURRENT_TIMESTAMP
 WHERE
 	"id" = %s

apps/dataset/views/dataset.py

@@ -181,6 +181,7 @@ class Dataset(APIView):
         @swagger_auto_schema(operation_summary=_('Generate related'), operation_id=_('Generate related'),
                              manual_parameters=DataSetSerializers.Operate.get_request_params_api(),
                              request_body=GenerateRelatedSerializer.get_request_body_api(),
+                             responses=result.get_default_response(),
                              tags=[_('Knowledge Base')]
                              )
         @log(menu='document', operate="Generate related documents",

apps/function_lib/swagger_api/function_lib_api.py

@@ -195,6 +195,53 @@ class FunctionLibApi(ApiMixin):
                 }
             )
 
+        @staticmethod
+        def get_response_body_api():
+            return openapi.Schema(
+                type=openapi.TYPE_OBJECT,
+                required=['id', 'name', 'code', 'input_field_list', 'permission_type'],
+                properties={
+                    'id': openapi.Schema(type=openapi.TYPE_STRING, title="", description=_('ID')),
+
+                    'name': openapi.Schema(type=openapi.TYPE_STRING, title=_('function name'),
+                                           description=_('function name')),
+                    'desc': openapi.Schema(type=openapi.TYPE_STRING, title=_('function description'),
+                                           description=_('function description')),
+                    'code': openapi.Schema(type=openapi.TYPE_STRING, title=_('function content'),
+                                           description=_('function content')),
+                    'permission_type': openapi.Schema(type=openapi.TYPE_STRING, title=_('permission'),
+                                                      description=_('permission')),
+                    'is_active': openapi.Schema(type=openapi.TYPE_BOOLEAN, title=_('Is active'),
+                                                description=_('Is active')),
+                    'input_field_list': openapi.Schema(type=openapi.TYPE_ARRAY,
+                                                       description=_('Input variable list'),
+                                                       items=openapi.Schema(type=openapi.TYPE_OBJECT,
+                                                                            required=['name', 'is_required', 'source'],
+                                                                            properties={
+                                                                                'name': openapi.Schema(
+                                                                                    type=openapi.TYPE_STRING,
+                                                                                    title=_('variable name'),
+                                                                                    description=_('variable name')),
+                                                                                'is_required': openapi.Schema(
+                                                                                    type=openapi.TYPE_BOOLEAN,
+                                                                                    title=_('required'),
+                                                                                    description=_('required')),
+                                                                                'type': openapi.Schema(
+                                                                                    type=openapi.TYPE_STRING,
+                                                                                    title=_('type'),
+                                                                                    description=_(
+                                                                                        'Field type string|int|dict|array|float')
+                                                                                ),
+                                                                                'source': openapi.Schema(
+                                                                                    type=openapi.TYPE_STRING,
+                                                                                    title=_('source'),
+                                                                                    description=_(
+                                                                                        'The source only supports custom|reference')),
+
+                                                                            }))
+                }
+            )
+
     class Export(ApiMixin):
         @staticmethod
         def get_request_params_api():
@@ -214,4 +261,4 @@ class FunctionLibApi(ApiMixin):
                                       type=openapi.TYPE_FILE,
                                       required=True,
                                       description=_('Upload image files'))
-                    ]
+                    ]

apps/function_lib/views/function_lib_views.py

@@ -44,6 +44,7 @@ class FunctionLibView(APIView):
     @swagger_auto_schema(operation_summary=_('Create function'),
                          operation_id=_('Create function'),
                          request_body=FunctionLibApi.Create.get_request_body_api(),
+                         responses=result.get_api_response(FunctionLibApi.Create.get_response_body_api()),
                          tags=[_('Function')])
     @has_permissions(RoleConstants.ADMIN, RoleConstants.USER)
     @log(menu='Function', operate="Create function",
@@ -58,6 +59,7 @@ class FunctionLibView(APIView):
         @swagger_auto_schema(operation_summary=_('Debug function'),
                              operation_id=_('Debug function'),
                              request_body=FunctionLibApi.Debug.get_request_body_api(),
+                             responses=result.get_default_response(),
                              tags=[_('Function')])
         @has_permissions(RoleConstants.ADMIN, RoleConstants.USER)
         def post(self, request: Request):
@@ -72,6 +74,7 @@ class FunctionLibView(APIView):
         @swagger_auto_schema(operation_summary=_('Update function'),
                              operation_id=_('Update function'),
                              request_body=FunctionLibApi.Edit.get_request_body_api(),
+                             responses=result.get_api_response(FunctionLibApi.Edit.get_request_body_api()),
                              tags=[_('Function')])
         @has_permissions(RoleConstants.ADMIN, RoleConstants.USER)
         @log(menu='Function', operate="Update function",
@@ -84,6 +87,7 @@ class FunctionLibView(APIView):
         @action(methods=['DELETE'], detail=False)
         @swagger_auto_schema(operation_summary=_('Delete function'),
                              operation_id=_('Delete function'),
+                             responses=result.get_default_response(),
                              tags=[_('Function')])
         @has_permissions(RoleConstants.ADMIN, RoleConstants.USER)
         @log(menu='Function', operate="Delete function",

apps/function_lib/views/py_lint.py

@@ -26,6 +26,7 @@ class PyLintView(APIView):
     @swagger_auto_schema(operation_summary=_('Check code'),
                          operation_id=_('Check code'),
                          request_body=PyLintApi.get_request_body_api(),
+                         responses=result.get_api_response(PyLintApi.get_request_body_api()),
                          tags=[_('Function')])
     @has_permissions(RoleConstants.ADMIN, RoleConstants.USER)
     def post(self, request: Request):

apps/locales/en_US/LC_MESSAGES/django.po

@@ -7490,4 +7490,13 @@ msgid "Field: {name} No value set"
 msgstr ""
 
 msgid "Generate related"
+msgstr ""
+
+msgid "Obtain graphical captcha"
+msgstr ""
+
+msgid "Captcha code error or expiration"
+msgstr ""
+
+msgid "captcha"
 msgstr ""

apps/locales/zh_CN/LC_MESSAGES/django.po

@@ -7653,4 +7653,13 @@ msgid "Field: {name} No value set"
 msgstr "字段: {name} 未设置值"
 
 msgid "Generate related"
-msgstr "生成问题"
+msgstr "生成问题"
+
+msgid "Obtain graphical captcha"
+msgstr "获取图形验证码"
+
+msgid "Captcha code error or expiration"
+msgstr "验证码错误或过期"
+
+msgid "captcha"
+msgstr "验证码"

apps/locales/zh_Hant/LC_MESSAGES/django.po

@@ -7663,4 +7663,13 @@ msgid "Field: {name} No value set"
 msgstr "欄位: {name} 未設定值"
 
 msgid "Generate related"
-msgstr "生成問題"
+msgstr "生成問題"
+
+msgid "Obtain graphical captcha"
+msgstr "獲取圖形驗證碼"
+
+msgid "Captcha code error or expiration"
+msgstr "驗證碼錯誤或過期"
+
+msgid "captcha"
+msgstr "驗證碼"

apps/setting/models_provider/constants/model_provider_constants.py

@@ -19,6 +19,8 @@ from setting.models_provider.impl.kimi_model_provider.kimi_model_provider import
 from setting.models_provider.impl.ollama_model_provider.ollama_model_provider import OllamaModelProvider
 from setting.models_provider.impl.openai_model_provider.openai_model_provider import OpenAIModelProvider
 from setting.models_provider.impl.qwen_model_provider.qwen_model_provider import QwenModelProvider
+from setting.models_provider.impl.regolo_model_provider.regolo_model_provider import \
+    RegoloModelProvider
 from setting.models_provider.impl.siliconCloud_model_provider.siliconCloud_model_provider import \
     SiliconCloudModelProvider
 from setting.models_provider.impl.tencent_cloud_model_provider.tencent_cloud_model_provider import \
@@ -55,3 +57,4 @@ class ModelProvideConstants(Enum):
     aliyun_bai_lian_model_provider = AliyunBaiLianModelProvider()
     model_anthropic_provider = AnthropicModelProvider()
     model_siliconCloud_provider = SiliconCloudModelProvider()
+    model_regolo_provider = RegoloModelProvider()

apps/setting/models_provider/impl/aliyun_bai_lian_model_provider/aliyun_bai_lian_model_provider.py

@@ -51,6 +51,23 @@ model_info_list = [ModelInfo('gte-rerank',
                              _("Universal text vector is Tongyi Lab's multi-language text unified vector model based on the LLM base. It provides high-level vector services for multiple mainstream languages around the world and helps developers quickly convert text data into high-quality vector data."),
                              ModelTypeConst.EMBEDDING, aliyun_bai_lian_embedding_model_credential,
                              AliyunBaiLianEmbedding),
+                   ModelInfo('qwen3-0.6b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
+                             BaiLianChatModel),
+                   ModelInfo('qwen3-1.7b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
+                             BaiLianChatModel),
+                   ModelInfo('qwen3-4b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
+                             BaiLianChatModel),
+                   ModelInfo('qwen3-8b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
+                             BaiLianChatModel),
+                   ModelInfo('qwen3-14b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
+                             BaiLianChatModel),
+                   ModelInfo('qwen3-32b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
+                             BaiLianChatModel),
+                   ModelInfo('qwen3-30b-a3b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
+                             BaiLianChatModel),
+                   ModelInfo('qwen3-235b-a22b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
+                             BaiLianChatModel),
+
                    ModelInfo('qwen-turbo', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
                              BaiLianChatModel),
                    ModelInfo('qwen-plus', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,

apps/setting/models_provider/impl/aliyun_bai_lian_model_provider/credential/llm.py

@@ -30,6 +30,29 @@ class BaiLianLLMModelParams(BaseForm):
         precision=0)
 
 
+class BaiLianLLMStreamModelParams(BaseForm):
+    temperature = forms.SliderField(TooltipLabel(_('Temperature'),
+                                                 _('Higher values make the output more random, while lower values make it more focused and deterministic')),
+                                    required=True, default_value=0.7,
+                                    _min=0.1,
+                                    _max=1.0,
+                                    _step=0.01,
+                                    precision=2)
+
+    max_tokens = forms.SliderField(
+        TooltipLabel(_('Output the maximum Tokens'),
+                     _('Specify the maximum number of tokens that the model can generate')),
+        required=True, default_value=800,
+        _min=1,
+        _max=100000,
+        _step=1,
+        precision=0)
+
+    stream = forms.SwitchField(label=TooltipLabel(_('Is the answer in streaming mode'),
+                                                  _('Is the answer in streaming mode')),
+                               required=True, default_value=True)
+
+
 class BaiLianLLMModelCredential(BaseForm, BaseModelCredential):
 
     def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], model_params, provider,
@@ -47,7 +70,11 @@ class BaiLianLLMModelCredential(BaseForm, BaseModelCredential):
                     return False
         try:
             model = provider.get_model(model_type, model_name, model_credential, **model_params)
-            model.invoke([HumanMessage(content=gettext('Hello'))])
+            if model_params.get('stream'):
+                for res in model.stream([HumanMessage(content=gettext('Hello'))]):
+                    pass
+            else:
+                model.invoke([HumanMessage(content=gettext('Hello'))])
         except Exception as e:
             traceback.print_exc()
             if isinstance(e, AppApiException):
@@ -68,4 +95,6 @@ class BaiLianLLMModelCredential(BaseForm, BaseModelCredential):
     api_key = forms.PasswordInputField('API Key', required=True)
 
     def get_model_params_setting_form(self, model_name):
+        if 'qwen3' in model_name:
+            return BaiLianLLMStreamModelParams()
         return BaiLianLLMModelParams()

apps/setting/models_provider/impl/base_chat_open_ai.py

@@ -133,7 +133,7 @@ class BaseChatOpenAI(ChatOpenAI):
         )
 
         usage_metadata: Optional[UsageMetadata] = (
-            _create_usage_metadata(token_usage) if token_usage else None
+            _create_usage_metadata(token_usage) if token_usage and token_usage.get("prompt_tokens") else None
         )
         if len(choices) == 0:
             # logprobs is implicitly None

apps/setting/models_provider/impl/gemini_model_provider/model/llm.py

@@ -13,7 +13,7 @@ from google.ai.generativelanguage_v1beta.types import (
     Tool as GoogleTool,
 )
 from langchain_core.callbacks import CallbackManagerForLLMRun
-from langchain_core.messages import BaseMessage
+from langchain_core.messages import BaseMessage, get_buffer_string
 from langchain_core.outputs import ChatGenerationChunk
 from langchain_google_genai import ChatGoogleGenerativeAI
 from langchain_google_genai._function_utils import _ToolConfigDict, _ToolDict
@@ -22,6 +22,8 @@ from langchain_google_genai.chat_models import _chat_with_retry, _response_to_re
 from langchain_google_genai._common import (
     SafetySettingDict,
 )
+
+from common.config.tokenizer_manage_config import TokenizerManage
 from setting.models_provider.base_model_provider import MaxKBBaseModel
 
 
@@ -46,10 +48,18 @@ class GeminiChatModel(MaxKBBaseModel, ChatGoogleGenerativeAI):
         return self.__dict__.get('_last_generation_info')
 
     def get_num_tokens_from_messages(self, messages: List[BaseMessage]) -> int:
-        return self.get_last_generation_info().get('input_tokens', 0)
+        try:
+            return self.get_last_generation_info().get('input_tokens', 0)
+        except Exception as e:
+            tokenizer = TokenizerManage.get_tokenizer()
+            return sum([len(tokenizer.encode(get_buffer_string([m]))) for m in messages])
 
     def get_num_tokens(self, text: str) -> int:
-        return self.get_last_generation_info().get('output_tokens', 0)
+        try:
+            return self.get_last_generation_info().get('output_tokens', 0)
+        except Exception as e:
+            tokenizer = TokenizerManage.get_tokenizer()
+            return len(tokenizer.encode(text))
 
     def _stream(
             self,

apps/setting/models_provider/impl/regolo_model_provider/__init__.py

@@ -0,0 +1,8 @@
+# coding=utf-8
+"""
+    @project: maxkb
+    @Author：虎
+    @file： __init__.py.py
+    @date：2024/3/28 16:25
+    @desc:
+"""

apps/setting/models_provider/impl/regolo_model_provider/credential/embedding.py

@@ -0,0 +1,52 @@
+# coding=utf-8
+"""
+    @project: MaxKB
+    @Author：虎
+    @file： embedding.py
+    @date：2024/7/12 16:45
+    @desc:
+"""
+import traceback
+from typing import Dict
+
+from django.utils.translation import gettext as _
+
+from common import forms
+from common.exception.app_exception import AppApiException
+from common.forms import BaseForm
+from setting.models_provider.base_model_provider import BaseModelCredential, ValidCode
+
+
+class RegoloEmbeddingCredential(BaseForm, BaseModelCredential):
+    def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], model_params, provider,
+                 raise_exception=True):
+        model_type_list = provider.get_model_type_list()
+        if not any(list(filter(lambda mt: mt.get('value') == model_type, model_type_list))):
+            raise AppApiException(ValidCode.valid_error.value,
+                                  _('{model_type} Model type is not supported').format(model_type=model_type))
+
+        for key in ['api_key']:
+            if key not in model_credential:
+                if raise_exception:
+                    raise AppApiException(ValidCode.valid_error.value, _('{key}  is required').format(key=key))
+                else:
+                    return False
+        try:
+            model = provider.get_model(model_type, model_name, model_credential)
+            model.embed_query(_('Hello'))
+        except Exception as e:
+            traceback.print_exc()
+            if isinstance(e, AppApiException):
+                raise e
+            if raise_exception:
+                raise AppApiException(ValidCode.valid_error.value,
+                                      _('Verification failed, please check whether the parameters are correct: {error}').format(
+                                          error=str(e)))
+            else:
+                return False
+        return True
+
+    def encryption_dict(self, model: Dict[str, object]):
+        return {**model, 'api_key': super().encryption(model.get('api_key', ''))}
+
+    api_key = forms.PasswordInputField('API Key', required=True)

apps/setting/models_provider/impl/regolo_model_provider/credential/image.py

@@ -0,0 +1,74 @@
+# coding=utf-8
+import base64
+import os
+import traceback
+from typing import Dict
+
+from langchain_core.messages import HumanMessage
+
+from common import forms
+from common.exception.app_exception import AppApiException
+from common.forms import BaseForm, TooltipLabel
+from setting.models_provider.base_model_provider import BaseModelCredential, ValidCode
+from django.utils.translation import gettext_lazy as _, gettext
+
+
+class RegoloImageModelParams(BaseForm):
+    temperature = forms.SliderField(TooltipLabel(_('Temperature'),
+                                                 _('Higher values make the output more random, while lower values make it more focused and deterministic')),
+                                    required=True, default_value=0.7,
+                                    _min=0.1,
+                                    _max=1.0,
+                                    _step=0.01,
+                                    precision=2)
+
+    max_tokens = forms.SliderField(
+        TooltipLabel(_('Output the maximum Tokens'),
+                     _('Specify the maximum number of tokens that the model can generate')),
+        required=True, default_value=800,
+        _min=1,
+        _max=100000,
+        _step=1,
+        precision=0)
+
+
+class RegoloImageModelCredential(BaseForm, BaseModelCredential):
+    api_base = forms.TextInputField('API URL', required=True)
+    api_key = forms.PasswordInputField('API Key', required=True)
+
+    def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], model_params, provider,
+                 raise_exception=False):
+        model_type_list = provider.get_model_type_list()
+        if not any(list(filter(lambda mt: mt.get('value') == model_type, model_type_list))):
+            raise AppApiException(ValidCode.valid_error.value,
+                                  gettext('{model_type} Model type is not supported').format(model_type=model_type))
+
+        for key in ['api_key']:
+            if key not in model_credential:
+                if raise_exception:
+                    raise AppApiException(ValidCode.valid_error.value, gettext('{key}  is required').format(key=key))
+                else:
+                    return False
+        try:
+            model = provider.get_model(model_type, model_name, model_credential, **model_params)
+            res = model.stream([HumanMessage(content=[{"type": "text", "text": gettext('Hello')}])])
+            for chunk in res:
+                print(chunk)
+        except Exception as e:
+            traceback.print_exc()
+            if isinstance(e, AppApiException):
+                raise e
+            if raise_exception:
+                raise AppApiException(ValidCode.valid_error.value,
+                                      gettext(
+                                          'Verification failed, please check whether the parameters are correct: {error}').format(
+                                          error=str(e)))
+            else:
+                return False
+        return True
+
+    def encryption_dict(self, model: Dict[str, object]):
+        return {**model, 'api_key': super().encryption(model.get('api_key', ''))}
+
+    def get_model_params_setting_form(self, model_name):
+        return RegoloImageModelParams()

apps/setting/models_provider/impl/regolo_model_provider/credential/llm.py

@@ -0,0 +1,78 @@
+# coding=utf-8
+"""
+    @project: MaxKB
+    @Author：虎
+    @file： llm.py
+    @date：2024/7/11 18:32
+    @desc:
+"""
+import traceback
+from typing import Dict
+
+from django.utils.translation import gettext_lazy as _, gettext
+from langchain_core.messages import HumanMessage
+
+from common import forms
+from common.exception.app_exception import AppApiException
+from common.forms import BaseForm, TooltipLabel
+from setting.models_provider.base_model_provider import BaseModelCredential, ValidCode
+
+
+class RegoloLLMModelParams(BaseForm):
+    temperature = forms.SliderField(TooltipLabel(_('Temperature'),
+                                                 _('Higher values make the output more random, while lower values make it more focused and deterministic')),
+                                    required=True, default_value=0.7,
+                                    _min=0.1,
+                                    _max=1.0,
+                                    _step=0.01,
+                                    precision=2)
+
+    max_tokens = forms.SliderField(
+        TooltipLabel(_('Output the maximum Tokens'),
+                     _('Specify the maximum number of tokens that the model can generate')),
+        required=True, default_value=800,
+        _min=1,
+        _max=100000,
+        _step=1,
+        precision=0)
+
+
+class RegoloLLMModelCredential(BaseForm, BaseModelCredential):
+
+    def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], model_params, provider,
+                 raise_exception=False):
+        model_type_list = provider.get_model_type_list()
+        if not any(list(filter(lambda mt: mt.get('value') == model_type, model_type_list))):
+            raise AppApiException(ValidCode.valid_error.value,
+                                  gettext('{model_type} Model type is not supported').format(model_type=model_type))
+
+        for key in ['api_key']:
+            if key not in model_credential:
+                if raise_exception:
+                    raise AppApiException(ValidCode.valid_error.value, gettext('{key}  is required').format(key=key))
+                else:
+                    return False
+        try:
+
+            model = provider.get_model(model_type, model_name, model_credential, **model_params)
+            model.invoke([HumanMessage(content=gettext('Hello'))])
+        except Exception as e:
+            traceback.print_exc()
+            if isinstance(e, AppApiException):
+                raise e
+            if raise_exception:
+                raise AppApiException(ValidCode.valid_error.value,
+                                      gettext(
+                                          'Verification failed, please check whether the parameters are correct: {error}').format(
+                                          error=str(e)))
+            else:
+                return False
+        return True
+
+    def encryption_dict(self, model: Dict[str, object]):
+        return {**model, 'api_key': super().encryption(model.get('api_key', ''))}
+
+    api_key = forms.PasswordInputField('API Key', required=True)
+
+    def get_model_params_setting_form(self, model_name):
+        return RegoloLLMModelParams()

apps/setting/models_provider/impl/regolo_model_provider/credential/tti.py

@@ -0,0 +1,89 @@
+# coding=utf-8
+import traceback
+from typing import Dict
+
+from django.utils.translation import gettext_lazy as _, gettext
+
+from common import forms
+from common.exception.app_exception import AppApiException
+from common.forms import BaseForm, TooltipLabel
+from setting.models_provider.base_model_provider import BaseModelCredential, ValidCode
+
+
+class RegoloTTIModelParams(BaseForm):
+    size = forms.SingleSelect(
+        TooltipLabel(_('Image size'),
+                     _('The image generation endpoint allows you to create raw images based on text prompts. ')),
+        required=True,
+        default_value='1024x1024',
+        option_list=[
+            {'value': '1024x1024', 'label': '1024x1024'},
+            {'value': '1024x1792', 'label': '1024x1792'},
+            {'value': '1792x1024', 'label': '1792x1024'},
+        ],
+        text_field='label',
+        value_field='value'
+    )
+
+    quality = forms.SingleSelect(
+        TooltipLabel(_('Picture quality'), _('''       
+By default, images are produced in standard quality.
+        ''')),
+        required=True,
+        default_value='standard',
+        option_list=[
+            {'value': 'standard', 'label': 'standard'},
+            {'value': 'hd', 'label': 'hd'},
+        ],
+        text_field='label',
+        value_field='value'
+    )
+
+    n = forms.SliderField(
+        TooltipLabel(_('Number of pictures'),
+                     _('1 as default')),
+        required=True, default_value=1,
+        _min=1,
+        _max=10,
+        _step=1,
+        precision=0)
+
+
+class RegoloTextToImageModelCredential(BaseForm, BaseModelCredential):
+    api_key = forms.PasswordInputField('API Key', required=True)
+
+    def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], model_params, provider,
+                 raise_exception=False):
+        model_type_list = provider.get_model_type_list()
+        if not any(list(filter(lambda mt: mt.get('value') == model_type, model_type_list))):
+            raise AppApiException(ValidCode.valid_error.value,
+                                  gettext('{model_type} Model type is not supported').format(model_type=model_type))
+
+        for key in ['api_key']:
+            if key not in model_credential:
+                if raise_exception:
+                    raise AppApiException(ValidCode.valid_error.value, gettext('{key}  is required').format(key=key))
+                else:
+                    return False
+        try:
+            model = provider.get_model(model_type, model_name, model_credential, **model_params)
+            res = model.check_auth()
+            print(res)
+        except Exception as e:
+            traceback.print_exc()
+            if isinstance(e, AppApiException):
+                raise e
+            if raise_exception:
+                raise AppApiException(ValidCode.valid_error.value,
+                                      gettext(
+                                          'Verification failed, please check whether the parameters are correct: {error}').format(
+                                          error=str(e)))
+            else:
+                return False
+        return True
+
+    def encryption_dict(self, model: Dict[str, object]):
+        return {**model, 'api_key': super().encryption(model.get('api_key', ''))}
+
+    def get_model_params_setting_form(self, model_name):
+        return RegoloTTIModelParams()

apps/setting/models_provider/impl/regolo_model_provider/icon/regolo_icon_svg

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="Livello_2"
+   data-name="Livello 2"
+   viewBox="0 0 104.4 104.38"
+   version="1.1"
+   sodipodi:docname="Regolo_logo_positive.svg"
+   width="100%" height="100%"
+   inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview13"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="2.1335227"
+     inkscape:cx="119.05193"
+     inkscape:cy="48.511318"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g13" />
+  <defs
+     id="defs1">
+    <style
+       id="style1">
+      .cls-1 {
+        fill: #303030;
+      }
+
+      .cls-2 {
+        fill: #59e389;
+      }
+    </style>
+  </defs>
+  <g
+     id="Grafica"
+     transform="translate(0,-40.87)">
+    <g
+       id="g13">
+      <path
+         class="cls-1"
+         d="m 104.39,105.96 v 36.18 c 0,0.32 -0.05,0.62 -0.14,0.91 -0.39,1.27 -1.58,2.2 -2.99,2.2 H 65.08 c -1.73,0 -3.13,-1.41 -3.13,-3.13 V 113.4 c 0,-0.15 0,-0.29 0,-0.44 v -7 c 0,-1.73 1.4,-3.13 3.13,-3.13 h 36.19 c 1.5,0 2.77,1.07 3.06,2.5 0.05,0.21 0.07,0.41 0.07,0.63 z"
+         id="path1" />
+      <path
+         class="cls-1"
+         d="m 104.39,105.96 v 36.18 c 0,0.32 -0.05,0.62 -0.14,0.91 -0.39,1.27 -1.58,2.2 -2.99,2.2 H 65.08 c -1.73,0 -3.13,-1.41 -3.13,-3.13 V 113.4 c 0,-0.15 0,-0.29 0,-0.44 v -7 c 0,-1.73 1.4,-3.13 3.13,-3.13 h 36.19 c 1.5,0 2.77,1.07 3.06,2.5 0.05,0.21 0.07,0.41 0.07,0.63 z"
+         id="path2" />
+      <path
+         class="cls-2"
+         d="M 101.27,40.88 H 65.09 c -1.73,0 -3.13,1.4 -3.13,3.13 v 28.71 c 0,4.71 -1.88,9.23 -5.2,12.56 L 44.42,97.61 c -3.32,3.33 -7.85,5.2 -12.55,5.2 H 18.98 c -2.21,0 -3.99,-1.79 -3.99,-3.99 V 87.29 c 0,-2.21 1.79,-3.99 3.99,-3.99 h 20.34 c 1.41,0 2.59,-0.93 2.99,-2.2 0.09,-0.29 0.14,-0.59 0.14,-0.91 V 44 c 0,-0.22 -0.02,-0.42 -0.07,-0.63 -0.29,-1.43 -1.56,-2.5 -3.06,-2.5 H 3.13 C 1.4,40.87 0,42.27 0,44 v 7 c 0,0.15 0,0.29 0,0.44 v 28.72 c 0,1.72 1.41,3.13 3.13,3.13 h 3.16 c 2.21,0 3.99,1.79 3.99,3.99 v 11.53 c 0,2.21 -1.79,3.99 -3.99,3.99 H 3.15 c -1.73,0 -3.13,1.4 -3.13,3.13 v 36.19 c 0,1.72 1.41,3.13 3.13,3.13 h 36.19 c 1.73,0 3.13,-1.41 3.13,-3.13 V 113.4 c 0,-4.7 1.87,-9.23 5.2,-12.55 L 60,88.51 c 3.33,-3.32 7.85,-5.2 12.56,-5.2 h 28.71 c 1.73,0 3.13,-1.4 3.13,-3.13 V 44 c 0,-1.73 -1.4,-3.13 -3.13,-3.13 z"
+         id="path3" />
+    </g>
+  </g>
+</svg>

apps/setting/models_provider/impl/regolo_model_provider/model/embedding.py

@@ -0,0 +1,23 @@
+# coding=utf-8
+"""
+    @project: MaxKB
+    @Author：虎
+    @file： embedding.py
+    @date：2024/7/12 17:44
+    @desc:
+"""
+from typing import Dict
+
+from langchain_community.embeddings import OpenAIEmbeddings
+
+from setting.models_provider.base_model_provider import MaxKBBaseModel
+
+
+class RegoloEmbeddingModel(MaxKBBaseModel, OpenAIEmbeddings):
+    @staticmethod
+    def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
+        return RegoloEmbeddingModel(
+            api_key=model_credential.get('api_key'),
+            model=model_name,
+            openai_api_base="https://api.regolo.ai/v1",
+        )

apps/setting/models_provider/impl/regolo_model_provider/model/image.py

@@ -0,0 +1,19 @@
+from typing import Dict
+
+from setting.models_provider.base_model_provider import MaxKBBaseModel
+from setting.models_provider.impl.base_chat_open_ai import BaseChatOpenAI
+
+
+class RegoloImage(MaxKBBaseModel, BaseChatOpenAI):
+
+    @staticmethod
+    def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
+        optional_params = MaxKBBaseModel.filter_optional_params(model_kwargs)
+        return RegoloImage(
+            model_name=model_name,
+            openai_api_base="https://api.regolo.ai/v1",
+            openai_api_key=model_credential.get('api_key'),
+            streaming=True,
+            stream_usage=True,
+            extra_body=optional_params
+        )

apps/setting/models_provider/impl/regolo_model_provider/model/llm.py

@@ -0,0 +1,38 @@
+# coding=utf-8
+"""
+    @project: maxkb
+    @Author：虎
+    @file： llm.py
+    @date：2024/4/18 15:28
+    @desc:
+"""
+from typing import List, Dict
+
+from langchain_core.messages import BaseMessage, get_buffer_string
+from langchain_openai.chat_models import ChatOpenAI
+
+from common.config.tokenizer_manage_config import TokenizerManage
+from setting.models_provider.base_model_provider import MaxKBBaseModel
+from setting.models_provider.impl.base_chat_open_ai import BaseChatOpenAI
+
+
+def custom_get_token_ids(text: str):
+    tokenizer = TokenizerManage.get_tokenizer()
+    return tokenizer.encode(text)
+
+
+class RegoloChatModel(MaxKBBaseModel, BaseChatOpenAI):
+
+    @staticmethod
+    def is_cache_model():
+        return False
+
+    @staticmethod
+    def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
+        optional_params = MaxKBBaseModel.filter_optional_params(model_kwargs)
+        return RegoloChatModel(
+            model=model_name,
+            openai_api_base="https://api.regolo.ai/v1",
+            openai_api_key=model_credential.get('api_key'),
+            extra_body=optional_params
+        )

apps/setting/models_provider/impl/regolo_model_provider/model/tti.py

@@ -0,0 +1,58 @@
+from typing import Dict
+
+from openai import OpenAI
+
+from common.config.tokenizer_manage_config import TokenizerManage
+from setting.models_provider.base_model_provider import MaxKBBaseModel
+from setting.models_provider.impl.base_tti import BaseTextToImage
+
+
+def custom_get_token_ids(text: str):
+    tokenizer = TokenizerManage.get_tokenizer()
+    return tokenizer.encode(text)
+
+
+class RegoloTextToImage(MaxKBBaseModel, BaseTextToImage):
+    api_base: str
+    api_key: str
+    model: str
+    params: dict
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.api_key = kwargs.get('api_key')
+        self.api_base = "https://api.regolo.ai/v1"
+        self.model = kwargs.get('model')
+        self.params = kwargs.get('params')
+
+    @staticmethod
+    def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
+        optional_params = {'params': {'size': '1024x1024', 'quality': 'standard', 'n': 1}}
+        for key, value in model_kwargs.items():
+            if key not in ['model_id', 'use_local', 'streaming']:
+                optional_params['params'][key] = value
+        return RegoloTextToImage(
+            model=model_name,
+            api_base="https://api.regolo.ai/v1",
+            api_key=model_credential.get('api_key'),
+            **optional_params,
+        )
+
+    def is_cache_model(self):
+        return False
+
+    def check_auth(self):
+        chat = OpenAI(api_key=self.api_key, base_url=self.api_base)
+        response_list = chat.models.with_raw_response.list()
+
+        # self.generate_image('生成一个小猫图片')
+
+    def generate_image(self, prompt: str, negative_prompt: str = None):
+        chat = OpenAI(api_key=self.api_key, base_url=self.api_base)
+        res = chat.images.generate(model=self.model, prompt=prompt, **self.params)
+        file_urls = []
+        for content in res.data:
+            url = content.url
+            file_urls.append(url)
+
+        return file_urls

apps/setting/models_provider/impl/regolo_model_provider/regolo_model_provider.py

@@ -0,0 +1,89 @@
+# coding=utf-8
+"""
+    @project: maxkb
+    @Author：虎
+    @file： openai_model_provider.py
+    @date：2024/3/28 16:26
+    @desc:
+"""
+import os
+
+from common.util.file_util import get_file_content
+from setting.models_provider.base_model_provider import IModelProvider, ModelProvideInfo, ModelInfo, \
+    ModelTypeConst, ModelInfoManage
+from setting.models_provider.impl.regolo_model_provider.credential.embedding import \
+    RegoloEmbeddingCredential
+from setting.models_provider.impl.regolo_model_provider.credential.llm import RegoloLLMModelCredential
+from setting.models_provider.impl.regolo_model_provider.credential.tti import \
+    RegoloTextToImageModelCredential
+from setting.models_provider.impl.regolo_model_provider.model.embedding import RegoloEmbeddingModel
+from setting.models_provider.impl.regolo_model_provider.model.llm import RegoloChatModel
+from setting.models_provider.impl.regolo_model_provider.model.tti import RegoloTextToImage
+from smartdoc.conf import PROJECT_DIR
+from django.utils.translation import gettext as _
+
+openai_llm_model_credential = RegoloLLMModelCredential()
+openai_tti_model_credential = RegoloTextToImageModelCredential()
+model_info_list = [
+    ModelInfo('Phi-4', '', ModelTypeConst.LLM,
+              openai_llm_model_credential, RegoloChatModel
+              ),
+    ModelInfo('DeepSeek-R1-Distill-Qwen-32B', '', ModelTypeConst.LLM,
+              openai_llm_model_credential,
+              RegoloChatModel),
+    ModelInfo('maestrale-chat-v0.4-beta', '',
+              ModelTypeConst.LLM, openai_llm_model_credential,
+              RegoloChatModel),
+    ModelInfo('Llama-3.3-70B-Instruct',
+              '',
+              ModelTypeConst.LLM, openai_llm_model_credential,
+              RegoloChatModel),
+    ModelInfo('Llama-3.1-8B-Instruct',
+              '',
+              ModelTypeConst.LLM, openai_llm_model_credential,
+              RegoloChatModel),
+    ModelInfo('DeepSeek-Coder-6.7B-Instruct', '',
+              ModelTypeConst.LLM, openai_llm_model_credential,
+              RegoloChatModel)
+]
+open_ai_embedding_credential = RegoloEmbeddingCredential()
+model_info_embedding_list = [
+    ModelInfo('gte-Qwen2', '',
+              ModelTypeConst.EMBEDDING, open_ai_embedding_credential,
+              RegoloEmbeddingModel),
+]
+
+model_info_tti_list = [
+    ModelInfo('FLUX.1-dev', '',
+              ModelTypeConst.TTI, openai_tti_model_credential,
+              RegoloTextToImage),
+    ModelInfo('sdxl-turbo', '',
+              ModelTypeConst.TTI, openai_tti_model_credential,
+              RegoloTextToImage),
+]
+model_info_manage = (
+    ModelInfoManage.builder()
+    .append_model_info_list(model_info_list)
+    .append_default_model_info(
+        ModelInfo('gpt-3.5-turbo', _('The latest gpt-3.5-turbo, updated with OpenAI adjustments'), ModelTypeConst.LLM,
+                  openai_llm_model_credential, RegoloChatModel
+                  ))
+    .append_model_info_list(model_info_embedding_list)
+    .append_default_model_info(model_info_embedding_list[0])
+    .append_model_info_list(model_info_tti_list)
+    .append_default_model_info(model_info_tti_list[0])
+
+    .build()
+)
+
+
+class RegoloModelProvider(IModelProvider):
+
+    def get_model_info_manage(self):
+        return model_info_manage
+
+    def get_model_provide_info(self):
+        return ModelProvideInfo(provider='model_regolo_provider', name='Regolo', icon=get_file_content(
+            os.path.join(PROJECT_DIR, "apps", "setting", 'models_provider', 'impl', 'regolo_model_provider',
+                         'icon',
+                         'regolo_icon_svg')))

apps/setting/models_provider/impl/xinference_model_provider/model/reranker.py

@@ -22,6 +22,9 @@ class XInferenceReranker(MaxKBBaseModel, BaseDocumentCompressor):
     """UID of the launched model"""
     api_key: Optional[str]
 
+    @staticmethod
+    def is_cache_model():
+        return False
     @staticmethod
     def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
         return XInferenceReranker(server_url=model_credential.get('server_url'), model_uid=model_name,

apps/setting/serializers/team_serializers.py

@@ -171,6 +171,24 @@ class TeamMemberSerializer(ApiMixin, serializers.Serializer):
             }
         )
 
+    @staticmethod
+    def get_response_body_api():
+        return openapi.Schema(
+            type=openapi.TYPE_OBJECT,
+            properties={
+                'id': openapi.Schema(type=openapi.TYPE_STRING, title=_('user id'), description=_('user id')),
+                'username': openapi.Schema(type=openapi.TYPE_STRING, title=_('Username'), description=_('Username')),
+                'email': openapi.Schema(type=openapi.TYPE_STRING, title=_('Email'), description=_('Email')),
+                'role': openapi.Schema(type=openapi.TYPE_STRING, title=_('Role'), description=_('Role')),
+                'is_active': openapi.Schema(type=openapi.TYPE_STRING, title=_('Is active'),
+                                            description=_('Is active')),
+                'team_id': openapi.Schema(type=openapi.TYPE_STRING, title=_('team id'), description=_('team id')),
+                'user_id': openapi.Schema(type=openapi.TYPE_STRING, title=_('user id'), description=_('user id')),
+                'type': openapi.Schema(type=openapi.TYPE_STRING, title=_('member type'),
+                                       description=_('member type manage|member')),
+            }
+        )
+
     @transaction.atomic
     def batch_add_member(self, user_id_list: List[str], with_valid=True):
         """

apps/setting/views/Team.py

@@ -38,6 +38,7 @@ class TeamMember(APIView):
     @swagger_auto_schema(operation_summary=_('Add member'),
                          operation_id=_('Add member'),
                          request_body=TeamMemberSerializer().get_request_body_api(),
+                         responses=result.get_default_response(),
                          tags=[_('Team')])
     @has_permissions(PermissionConstants.TEAM_CREATE)
     @log(menu='Team', operate='Add member',
@@ -53,6 +54,7 @@ class TeamMember(APIView):
         @swagger_auto_schema(operation_summary=_('Add members in batches'),
                              operation_id=_('Add members in batches'),
                              request_body=TeamMemberSerializer.get_bach_request_body_api(),
+                             responses=result.get_api_array_response(TeamMemberSerializer.get_response_body_api()),
                              tags=[_('Team')])
         @has_permissions(PermissionConstants.TEAM_CREATE)
         @log(menu='Team', operate='Add members in batches',
@@ -78,6 +80,7 @@ class TeamMember(APIView):
         @swagger_auto_schema(operation_summary=_('Update team member permissions'),
                              operation_id=_('Update team member permissions'),
                              request_body=UpdateTeamMemberPermissionSerializer().get_request_body_api(),
+                             responses=result.get_default_response(),
                              manual_parameters=TeamMemberSerializer.Operate.get_request_params_api(),
                              tags=[_('Team')]
                              )
@@ -93,6 +96,7 @@ class TeamMember(APIView):
         @swagger_auto_schema(operation_summary=_('Remove member'),
                              operation_id=_('Remove member'),
                              manual_parameters=TeamMemberSerializer.Operate.get_request_params_api(),
+                             responses=result.get_default_response(),
                              tags=[_('Team')]
                              )
         @has_permissions(PermissionConstants.TEAM_DELETE)

apps/setting/views/model.py

@@ -31,7 +31,8 @@ class Model(APIView):
     @action(methods=['POST'], detail=False)
     @swagger_auto_schema(operation_summary=_('Create model'),
                          operation_id=_('Create model'),
-                         request_body=ModelCreateApi.get_request_body_api()
+                         request_body=ModelCreateApi.get_request_body_api(),
+                         manual_parameters=result.get_api_response(ModelCreateApi.get_request_body_api())
         , tags=[_('model')])
     @has_permissions(PermissionConstants.MODEL_CREATE)
     @log(menu='model', operate='Create model',
@@ -45,7 +46,8 @@ class Model(APIView):
     @action(methods=['PUT'], detail=False)
     @swagger_auto_schema(operation_summary=_('Download model, trial only with Ollama platform'),
                          operation_id=_('Download model, trial only with Ollama platform'),
-                         request_body=ModelCreateApi.get_request_body_api()
+                         request_body=ModelCreateApi.get_request_body_api(),
+                         responses=result.get_api_response(ModelCreateApi.get_request_body_api())
         , tags=[_('model')])
     @has_permissions(PermissionConstants.MODEL_CREATE)
     def put(self, request: Request):
@@ -123,7 +125,8 @@ class Model(APIView):
         @action(methods=['PUT'], detail=False)
         @swagger_auto_schema(operation_summary=_('Update model'),
                              operation_id=_('Update model'),
-                             request_body=ModelEditApi.get_request_body_api()
+                             request_body=ModelEditApi.get_request_body_api(),
+                             responses=result.get_api_response(ModelEditApi.get_request_body_api())
             , tags=[_('model')])
         @has_permissions(PermissionConstants.MODEL_CREATE)
         @log(menu='model', operate='Update model',
@@ -166,7 +169,8 @@ class Provide(APIView):
         @swagger_auto_schema(operation_summary=_('Call the supplier function to obtain form data'),
                              operation_id=_('Call the supplier function to obtain form data'),
                              manual_parameters=ProvideApi.get_request_params_api(),
-                             request_body=ProvideApi.get_request_body_api()
+                             request_body=ProvideApi.get_request_body_api(),
+                             responses=result.get_api_response(ProvideApi.get_request_body_api())
             , tags=[_('model')])
         @has_permissions(PermissionConstants.MODEL_READ)
         @log(menu='model', operate='Call the supplier function to obtain form data')

apps/smartdoc/conf.py

@@ -114,7 +114,8 @@ class Config(dict):
             "ENGINE": self.get('DB_ENGINE'),
             "POOL_OPTIONS": {
                 "POOL_SIZE": 20,
-                "MAX_OVERFLOW": int(self.get('DB_MAX_OVERFLOW'))
+                "MAX_OVERFLOW": int(self.get('DB_MAX_OVERFLOW')),
+                'RECYCLE': 30 * 60
             }
         }
 

apps/smartdoc/settings/base.py

@@ -126,6 +126,10 @@ CACHES = {
     "token_cache": {
         'BACKEND': 'common.cache.file_cache.FileCache',
         'LOCATION': os.path.join(PROJECT_DIR, 'data', 'cache', "token_cache")  # 文件夹路径
+    },
+    'captcha_cache': {
+        'BACKEND': 'common.cache.file_cache.FileCache',
+        'LOCATION': os.path.join(PROJECT_DIR, 'data', 'cache', "captcha_cache")  # 文件夹路径
     }
 }
 

apps/users/serializers/user_serializers.py

@@ -6,18 +6,22 @@
     @date：2023/9/5 16:32
     @desc:
 """
+import base64
 import datetime
 import os
 import random
 import re
 import uuid
 
+from captcha.image import ImageCaptcha
 from django.conf import settings
 from django.core import validators, signing, cache
 from django.core.mail import send_mail
 from django.core.mail.backends.smtp import EmailBackend
 from django.db import transaction
 from django.db.models import Q, QuerySet, Prefetch
+from django.utils.translation import get_language
+from django.utils.translation import gettext_lazy as _, to_locale
 from drf_yasg import openapi
 from rest_framework import serializers
 
@@ -30,7 +34,7 @@ from common.exception.app_exception import AppApiException
 from common.mixins.api_mixin import ApiMixin
 from common.models.db_model_manage import DBModelManage
 from common.response.result import get_api_response
-from common.util.common import valid_license
+from common.util.common import valid_license, get_random_chars
 from common.util.field_message import ErrMessage
 from common.util.lock import lock
 from dataset.models import DataSet, Document, Paragraph, Problem, ProblemParagraphMapping
@@ -39,9 +43,29 @@ from function_lib.models.function import FunctionLib
 from setting.models import Team, SystemSetting, SettingType, Model, TeamMember, TeamMemberPermission
 from smartdoc.conf import PROJECT_DIR
 from users.models.user import User, password_encrypt, get_user_dynamics_permission
-from django.utils.translation import gettext_lazy as _, gettext, to_locale
-from django.utils.translation import get_language
+
 user_cache = cache.caches['user_cache']
+captcha_cache = cache.caches['captcha_cache']
+
+
+class CaptchaSerializer(ApiMixin, serializers.Serializer):
+    @staticmethod
+    def get_response_body_api():
+        return get_api_response(openapi.Schema(
+            type=openapi.TYPE_STRING,
+            title="captcha",
+            default="xxxx",
+            description="captcha"
+        ))
+
+    @staticmethod
+    def generate():
+        chars = get_random_chars()
+        image = ImageCaptcha()
+        data = image.generate(chars)
+        captcha = base64.b64encode(data.getbuffer())
+        captcha_cache.set(f"LOGIN:{chars.lower()}", chars, timeout=5 * 60)
+        return 'data:image/png;base64,' + captcha.decode()
 
 
 class SystemSerializer(ApiMixin, serializers.Serializer):
@@ -71,6 +95,8 @@ class LoginSerializer(ApiMixin, serializers.Serializer):
 
     password = serializers.CharField(required=True, error_messages=ErrMessage.char(_("Password")))
 
+    captcha = serializers.CharField(required=True, error_messages=ErrMessage.char(_("captcha")))
+
     def is_valid(self, *, raise_exception=False):
         """
         校验参数
@@ -78,6 +104,10 @@ class LoginSerializer(ApiMixin, serializers.Serializer):
         :return: User information
         """
         super().is_valid(raise_exception=True)
+        captcha = self.data.get('captcha')
+        captcha_value = captcha_cache.get(f"LOGIN:{captcha.lower()}")
+        if captcha_value is None:
+            raise AppApiException(1005, _("Captcha code error or expiration"))
         username = self.data.get("username")
         password = password_encrypt(self.data.get("password"))
         user = QuerySet(User).filter(Q(username=username,
@@ -109,7 +139,8 @@ class LoginSerializer(ApiMixin, serializers.Serializer):
             required=['username', 'password'],
             properties={
                 'username': openapi.Schema(type=openapi.TYPE_STRING, title=_("Username"), description=_("Username")),
-                'password': openapi.Schema(type=openapi.TYPE_STRING, title=_("Password"), description=_("Password"))
+                'password': openapi.Schema(type=openapi.TYPE_STRING, title=_("Password"), description=_("Password")),
+                'captcha': openapi.Schema(type=openapi.TYPE_STRING, title=_("captcha"), description=_("captcha"))
             }
         )
 

apps/users/urls.py

@@ -6,6 +6,7 @@ app_name = "user"
 urlpatterns = [
     path('profile', views.Profile.as_view()),
     path('user', views.User.as_view(), name="profile"),
+    path('user/captcha', views.CaptchaView.as_view(), name='captcha'),
     path('user/language', views.SwitchUserLanguageView.as_view(), name='language'),
     path('user/list', views.User.Query.as_view()),
     path('user/login', views.Login.as_view(), name='login'),

apps/users/views/user.py

@@ -26,7 +26,7 @@ from smartdoc.settings import JWT_AUTH
 from users.serializers.user_serializers import RegisterSerializer, LoginSerializer, CheckCodeSerializer, \
     RePasswordSerializer, \
     SendEmailSerializer, UserProfile, UserSerializer, UserManageSerializer, UserInstanceSerializer, SystemSerializer, \
-    SwitchLanguageSerializer
+    SwitchLanguageSerializer, CaptchaSerializer
 from users.views.common import get_user_operation_object, get_re_password_details
 
 user_cache = cache.caches['user_cache']
@@ -84,7 +84,7 @@ class SwitchUserLanguageView(APIView):
                                                             description=_("language")),
                              }
                          ),
-                         responses=RePasswordSerializer().get_response_body_api(),
+                         responses=result.get_default_response(),
                          tags=[_("User management")])
     @log(menu='User management', operate='Switch Language',
          get_operation_object=lambda r, k: {'name': r.user.username})
@@ -111,7 +111,7 @@ class ResetCurrentUserPasswordView(APIView):
                                                                description=_("Password"))
                              }
                          ),
-                         responses=RePasswordSerializer().get_response_body_api(),
+                         responses=result.get_default_response(),
                          tags=[_("User management")])
     @log(menu='User management', operate='Modify current user password',
          get_operation_object=lambda r, k: {'name': r.user.username},
@@ -170,6 +170,18 @@ def _get_details(request):
     }
 
 
+class CaptchaView(APIView):
+
+    @action(methods=['GET'], detail=False)
+    @swagger_auto_schema(operation_summary=_("Obtain graphical captcha"),
+                         operation_id=_("Obtain graphical captcha"),
+                         responses=CaptchaSerializer().get_response_body_api(),
+                         security=[],
+                         tags=[_("User management")])
+    def get(self, request: Request):
+        return result.success(CaptchaSerializer().generate())
+
+
 class Login(APIView):
 
     @action(methods=['POST'], detail=False)

installer/Dockerfile

@@ -70,7 +70,8 @@ RUN chmod 755 /opt/maxkb/app/installer/run-maxkb.sh && \
     useradd --no-create-home --home /opt/maxkb/app/sandbox sandbox -g root && \
     chown -R sandbox:root /opt/maxkb/app/sandbox && \
     chmod g-x /usr/local/bin/* /usr/bin/* /bin/* /usr/sbin/* /sbin/* /usr/lib/postgresql/15/bin/* && \
-    chmod g+x /usr/local/bin/python*
+    chmod g+x /usr/local/bin/python* && \
+    find /etc/ -type f ! -path '/etc/resolv.conf' ! -path '/etc/hosts' | xargs chmod g-rx
 
 EXPOSE 8080
 

pyproject.toml

@@ -14,15 +14,15 @@ drf-yasg = "1.21.7"
 django-filter = "23.2"
 langchain = "0.3.23"
 langchain-openai = "0.3.12"
-langchain-anthropic = "0.3.10"
+langchain-anthropic = "0.3.12"
 langchain-community = "0.3.21"
 langchain-deepseek = "0.1.3"
 langchain-google-genai = "2.1.2"
-langchain-mcp-adapters = "0.0.5"
+langchain-mcp-adapters = "0.0.11"
 langchain-huggingface = "0.1.2"
-langchain-ollama = "0.3.1"
+langchain-ollama = "0.3.2"
 langgraph = "0.3.27"
-mcp = "1.4.1"
+mcp = "1.8.0"
 psycopg2-binary = "2.9.10"
 jieba = "0.42.1"
 diskcache = "5.6.3"
@@ -60,7 +60,7 @@ celery = { extras = ["sqlalchemy"], version = "5.5.1" }
 django-celery-beat = "2.7.0"
 celery-once = "3.0.1"
 anthropic = "0.49.0"
-pylint = "3.1.0"
+pylint = "3.3.6"
 pydub = "0.25.1"
 cffi = "1.17.1"
 pysilk = "0.0.1"
@@ -68,6 +68,7 @@ django-db-connection-pool = "1.2.5"
 opencv-python-headless = "4.11.0.86"
 pymysql = "1.1.1"
 accelerate = "1.6.0"
+captcha = "0.7.1"
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

ui/src/api/team.ts

@@ -36,7 +36,7 @@ const getMemberPermissions: (member_id: String) => Promise<Result<any>> = (membe
 }
 
 /**
- * 获取成员权限
+ * 修改成员权限
  * @param 参数 member_id
  * @param 参数 {
           "team_member_permission_list": [

ui/src/api/type/user.ts

@@ -37,6 +37,10 @@ interface LoginRequest {
    * 密码
    */
   password: string
+  /**
+   * 验证码
+   */
+  captcha: string
 }
 
 interface RegisterRequest {

ui/src/api/user.ts

@@ -27,6 +27,13 @@ const login: (
   }
   return post('/user/login', request, undefined, loading)
 }
+/**
+ * 获取图形验证码
+ * @returns
+ */
+const getCaptcha: () => Promise<Result<string>> = () => {
+  return get('user/captcha')
+}
 /**
  * 登出
  * @param loading 接口加载器
@@ -226,5 +233,6 @@ export default {
   postLanguage,
   getDingOauth2Callback,
   getlarkCallback,
-  getQrSource
+  getQrSource,
+  getCaptcha
 }

ui/src/components/ai-chat/component/chat-input-operate/index.vue

@@ -392,7 +392,17 @@ const checkMaxFilesLimit = () => {
       uploadOtherList.value.length
   )
 }
-
+const file_name_eq = (str: string, str1: string) => {
+  return (
+    str.replaceAll(' ', '') === str1.replaceAll(' ', '') ||
+    decodeHtmlEntities(str) === decodeHtmlEntities(str1)
+  )
+}
+function decodeHtmlEntities(str: string) {
+  const tempDiv = document.createElement('div')
+  tempDiv.innerHTML = str
+  return tempDiv.textContent || tempDiv.innerText || ''
+}
 const uploadFile = async (file: any, fileList: any) => {
   const { maxFiles, fileLimit } = props.applicationDetails.file_upload_setting
   // 单次上传文件数量限制
@@ -418,7 +428,6 @@ const uploadFile = async (file: any, fileList: any) => {
   formData.append('file', file.raw, file.name)
   //
   const extension = file.name.split('.').pop().toUpperCase() // 获取文件后缀名并转为小写
-
   if (imageExtensions.includes(extension)) {
     uploadImageList.value.push(file)
   } else if (documentExtensions.includes(extension)) {
@@ -452,45 +461,35 @@ const uploadFile = async (file: any, fileList: any) => {
     .then((response) => {
       fileList.splice(0, fileList.length)
       uploadImageList.value.forEach((file: any) => {
-        const f = response.data.filter(
-          (f: any) => f.name.replaceAll(' ', '') === file.name.replaceAll(' ', '')
-        )
+        const f = response.data.filter((f: any) => file_name_eq(f.name, file.name))
         if (f.length > 0) {
           file.url = f[0].url
           file.file_id = f[0].file_id
         }
       })
       uploadDocumentList.value.forEach((file: any) => {
-        const f = response.data.filter(
-          (f: any) => f.name.replaceAll(' ', '') == file.name.replaceAll(' ', '')
-        )
+        const f = response.data.filter((f: any) => file_name_eq(f.name, file.name))
         if (f.length > 0) {
           file.url = f[0].url
           file.file_id = f[0].file_id
         }
       })
       uploadAudioList.value.forEach((file: any) => {
-        const f = response.data.filter(
-          (f: any) => f.name.replaceAll(' ', '') === file.name.replaceAll(' ', '')
-        )
+        const f = response.data.filter((f: any) => file_name_eq(f.name, file.name))
         if (f.length > 0) {
           file.url = f[0].url
           file.file_id = f[0].file_id
         }
       })
       uploadVideoList.value.forEach((file: any) => {
-        const f = response.data.filter(
-          (f: any) => f.name.replaceAll(' ', '') === file.name.replaceAll(' ', '')
-        )
+        const f = response.data.filter((f: any) => file_name_eq(f.name, file.name))
         if (f.length > 0) {
           file.url = f[0].url
           file.file_id = f[0].file_id
         }
       })
       uploadOtherList.value.forEach((file: any) => {
-        const f = response.data.filter(
-          (f: any) => f.name.replaceAll(' ', '') === file.name.replaceAll(' ', '')
-        )
+        const f = response.data.filter((f: any) => file_name_eq(f.name, file.name))
         if (f.length > 0) {
           file.url = f[0].url
           file.file_id = f[0].file_id

ui/src/components/ai-chat/component/question-content/index.vue

@@ -200,8 +200,7 @@ onMounted(() => {})
   }
   .media-file-width {
     :deep(.el-space__item) {
-      min-width: 40% !important;
-      flex-grow: 1;
+      width: 49% !important;
     }
   }
   .media_2 {

ui/src/components/ai-chat/index.vue

@@ -529,14 +529,16 @@ function chatMessage(chat?: any, problem?: string, re_chat?: boolean, other_para
  * @param row
  */
 function getSourceDetail(row: any) {
-  logApi.getRecordDetail(id || props.appId, row.chat_id, row.record_id, loading).then((res) => {
-    const exclude_keys = ['answer_text', 'id', 'answer_text_list']
-    Object.keys(res.data).forEach((key) => {
-      if (!exclude_keys.includes(key)) {
-        row[key] = res.data[key]
-      }
+  if (row.record_id) {
+    logApi.getRecordDetail(id || props.appId, row.chat_id, row.record_id, loading).then((res) => {
+      const exclude_keys = ['answer_text', 'id', 'answer_text_list']
+      Object.keys(res.data).forEach((key) => {
+        if (!exclude_keys.includes(key)) {
+          row[key] = res.data[key]
+        }
+      })
     })
-  })
+  }
   return true
 }
 

ui/src/layout/components/breadcrumb/index.vue

@@ -228,6 +228,11 @@ function getApplication() {
 }
 function refresh() {
   common.saveBreadcrumb(null)
+  if (isDataset.value) {
+    getDataset()
+  } else if (isApplication.value) {
+    getApplication()
+  }
 }
 onMounted(() => {
   if (!breadcrumbData.value) {

ui/src/locales/lang/en-US/views/application-workflow.ts

@@ -223,14 +223,14 @@ export default {
     },
     mcpNode: {
       label: 'MCP Server',
-      text: 'Call MCP Tools through SSE',
+      text: 'Call MCP Tools through SSE/Streamable HTTP',
       getToolsSuccess: 'Get Tools Successfully',
       getTool: 'Get Tools',
       tool: 'Tool',
       toolParam: 'Tool Params',
       mcpServerTip: 'Please enter the JSON format of the MCP server config',
       mcpToolTip: 'Please select a tool',
-      configLabel: 'MCP Server Config (Only supports SSE call method)'
+      configLabel: 'MCP Server Config (Only supports SSE/Streamable HTTP call method)'
     },
     imageGenerateNode: {
       label: 'Image Generation',

ui/src/locales/lang/en-US/views/user.ts

@@ -28,6 +28,10 @@ export default {
         requiredMessage: 'Please enter username',
         lengthMessage: 'Length must be between 6 and 20 words'
       },
+      captcha: {
+        label: 'captcha',
+        placeholder: 'Please enter the captcha'
+      },
       nick_name: {
         label: 'Name',
         placeholder: 'Please enter name'

ui/src/locales/lang/zh-CN/views/application-workflow.ts

@@ -224,14 +224,14 @@ export default {
     },
     mcpNode: {
       label: 'MCP 调用',
-      text: '通过SSE方式执行MCP服务中的工具',
+      text: '通过SSE/Streamable HTTP方式执行MCP服务中的工具',
       getToolsSuccess: '获取工具成功',
       getTool: '获取工具',
       tool: '工具',
       toolParam: '工具参数',
       mcpServerTip: '请输入JSON格式的MCP服务器配置',
       mcpToolTip: '请选择工具',
-      configLabel: 'MCP Server Config (仅支持SSE调用方式)'
+      configLabel: 'MCP Server Config (仅支持SSE/Streamable HTTP调用方式)'
     },
     imageGenerateNode: {
       label: '图片生成',
@@ -266,7 +266,7 @@ export default {
       label: '文本转语音',
       text: '将文本通过语音合成模型转换为音频',
       tts_model: {
-        label: '语音识别模型'
+        label: '语音合成模型'
       },
       content: {
         label: '选择文本内容'

ui/src/locales/lang/zh-CN/views/user.ts

@@ -25,6 +25,10 @@ export default {
         requiredMessage: '请输入用户名',
         lengthMessage: '长度在 6 到 20 个字符'
       },
+      captcha: {
+        label: '验证码',
+        placeholder: '请输入验证码'
+      },
       nick_name: {
         label: '姓名',
         placeholder: '请输入姓名'
@@ -33,7 +37,7 @@ export default {
         label: '邮箱',
         placeholder: '请输入邮箱',
         requiredMessage: '请输入邮箱',
-        validatorEmail: '请输入有效邮箱格式！',
+        validatorEmail: '请输入有效邮箱格式！'
       },
       phone: {
         label: '手机号',
@@ -48,13 +52,13 @@ export default {
       new_password: {
         label: '新密码',
         placeholder: '请输入新密码',
-        requiredMessage: '请输入新密码',
+        requiredMessage: '请输入新密码'
       },
       re_password: {
         label: '确认密码',
         placeholder: '请输入确认密码',
         requiredMessage: '请输入确认密码',
-        validatorMessage: '密码不一致',
+        validatorMessage: '密码不一致'
       }
     }
   },

ui/src/locales/lang/zh-Hant/views/application-workflow.ts

@@ -223,14 +223,14 @@ export default {
     },
     mcpNode: {
       label: 'MCP 調用',
-      text: '透過SSE方式執行MCP服務中的工具',
+      text: '透過SSE/Streamable HTTP方式執行MCP服務中的工具',
       getToolsSuccess: '獲取工具成功',
       getTool: '獲取工具',
       tool: '工具',
       toolParam: '工具變數',
       mcpServerTip: '請輸入JSON格式的MCP服務器配置',
       mcpToolTip: '請選擇工具',
-      configLabel: 'MCP Server Config (僅支持SSE調用方式)'
+      configLabel: 'MCP Server Config (僅支持SSE/Streamable HTTP調用方式)'
     },
     imageGenerateNode: {
       label: '圖片生成',

ui/src/locales/lang/zh-Hant/views/user.ts

@@ -26,6 +26,10 @@ export default {
         requiredMessage: '請輸入使用者名稱',
         lengthMessage: '長度須介於 6 到 20 個字元之間'
       },
+      captcha: {
+        label: '驗證碼',
+        placeholder: '請輸入驗證碼'
+      },
       nick_name: {
         label: '姓名',
         placeholder: '請輸入姓名'

ui/src/stores/modules/user.ts

@@ -135,8 +135,8 @@ const useUserStore = defineStore({
       })
     },
 
-    async login(auth_type: string, username: string, password: string) {
-      return UserApi.login(auth_type, { username, password }).then((ok) => {
+    async login(auth_type: string, username: string, password: string, captcha: string) {
+      return UserApi.login(auth_type, { username, password, captcha }).then((ok) => {
         this.token = ok.data
         localStorage.setItem('token', ok.data)
         return this.profile()

ui/src/styles/md-editor.scss

@@ -6,7 +6,8 @@
   padding: 0;
   margin: 0;
   font-size: inherit;
-  table{
+  word-break: break-word;
+  table {
     display: block;
   }
   p {

ui/src/views/application/ApplicationAccess.vue

@@ -135,51 +135,4 @@ onMounted(() => {
 })
 </script>
 
-<style lang="scss" scoped>
-.p-16-24 {
-  padding: 16px 24px;
-}
-
-.mb-16 {
-  margin-bottom: 16px;
-}
-
-.flex-between {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.flex {
-  display: flex;
-}
-
-.align-center {
-  align-items: center;
-}
-
-.ml-8 {
-  margin-left: 8px;
-}
-
-.mr-8 {
-  margin-right: 8px;
-}
-
-.ml-12 {
-  margin-left: 12px;
-}
-
-.mr-4 {
-  margin-right: 4px;
-}
-
-.cursor {
-  cursor: pointer;
-}
-
-.icon {
-  width: 32px; // 设置图标宽度
-  height: 32px; // 设置图标高度
-}
-</style>
+<style lang="scss" scoped></style>

ui/src/views/application/component/CreateApplicationDialog.vue

@@ -242,6 +242,7 @@ const submitHandle = async (formEl: FormInstance | undefined) => {
       }
       applicationApi.postApplication(applicationForm.value, loading).then((res) => {
         MsgSuccess(t('common.createSuccess'))
+        emit('refresh')
         if (isWorkFlow(applicationForm.value.type)) {
           router.push({ path: `/application/${res.data.id}/workflow` })
         } else {

ui/src/views/application/component/ParamSettingDialog.vue

@@ -11,7 +11,7 @@
   >
     <el-scrollbar max-height="550">
       <div class="p-16">
-        <el-form label-position="top" ref="paramFormRef" :model="form">
+        <el-form label-position="top" ref="paramFormRef" :model="form" v-loading="loading">
           <el-form-item :label="$t('views.application.applicationForm.dialog.selectSearchMode')">
             <el-radio-group
               v-model="form.dataset_setting.search_mode"
@@ -81,7 +81,7 @@
                 <el-input-number
                   v-model="form.dataset_setting.similarity"
                   :min="0"
-                  :max="form.search_mode === 'blend' ? 2 : 1"
+                  :max="form.dataset_setting.search_mode === 'blend' ? 2 : 1"
                   :precision="3"
                   :step="0.1"
                   :value-on-clear="0"
@@ -259,20 +259,20 @@ const isWorkflowType = ref(false)
 
 watch(dialogVisible, (bool) => {
   if (!bool) {
-    form.value = {
-      dataset_setting: {
-        search_mode: 'embedding',
-        top_n: 3,
-        similarity: 0.6,
-        max_paragraph_char_number: 5000,
-        no_references_setting: {
-          status: 'ai_questioning',
-          value: '{question}'
-        }
-      },
-      problem_optimization: false,
-      problem_optimization_prompt: ''
-    }
+    // form.value = {
+    //   dataset_setting: {
+    //     search_mode: 'embedding',
+    //     top_n: 3,
+    //     similarity: 0.6,
+    //     max_paragraph_char_number: 5000,
+    //     no_references_setting: {
+    //       status: 'ai_questioning',
+    //       value: '{question}'
+    //     }
+    //   },
+    //   problem_optimization: false,
+    //   problem_optimization_prompt: ''
+    // }
     noReferencesform.value = {
       ai_questioning: defaultValue['ai_questioning'],
       designated_answer: defaultValue['designated_answer']

ui/src/views/function-lib/index.vue

@@ -430,14 +430,8 @@ async function changeState(bool: Boolean, row: any) {
       row.is_active = false
       return
     }
-    const init_params = res.data.init_field_list.reduce((acc: any, item: any) => {
-      acc[item.field] = item.default_value
-      return acc
-    }, {})
     const obj = {
       is_active: bool,
-      init_params: init_params,
-      init_field_list: res.data.init_field_list
     }
     functionLibApi.putFunctionLib(row.id, obj, changeStateloading).then((res) => {})
   }

ui/src/views/login/index.vue

@@ -34,6 +34,21 @@
               </el-input>
             </el-form-item>
           </div>
+          <div class="mb-24">
+            <el-form-item prop="captcha">
+              <div class="flex-between w-full">
+                <el-input
+                  size="large"
+                  class="input-item"
+                  v-model="loginForm.captcha"
+                  :placeholder="$t('views.user.userForm.form.captcha.placeholder')"
+                >
+                </el-input>
+
+                <img :src="identifyCode" alt="" height="38" class="ml-8 cursor border border-r-4" @click="makeCode" />
+              </div>
+            </el-form-item>
+          </div>
         </el-form>
 
         <el-button size="large" type="primary" class="w-full" @click="login"
@@ -107,6 +122,7 @@ import { useRoute, useRouter } from 'vue-router'
 import type { FormInstance, FormRules } from 'element-plus'
 import useStore from '@/stores'
 import authApi from '@/api/auth-setting'
+import useApi from '@/api/user'
 import { MsgConfirm, MsgError, MsgSuccess } from '@/utils/message'
 
 import { t, getBrowserLang } from '@/locales'
@@ -120,9 +136,15 @@ const { user } = useStore()
 const router = useRouter()
 const loginForm = ref<LoginRequest>({
   username: '',
-  password: ''
+  password: '',
+  captcha: ''
 })
-
+const identifyCode = ref<string>('')
+function makeCode() {
+  useApi.getCaptcha().then((res: any) => {
+    identifyCode.value = res.data
+  })
+}
 const rules = ref<FormRules<LoginRequest>>({
   username: [
     {
@@ -137,6 +159,13 @@ const rules = ref<FormRules<LoginRequest>>({
       message: t('views.user.userForm.form.password.requiredMessage'),
       trigger: 'blur'
     }
+  ],
+  captcha: [
+    {
+      required: true,
+      message: t('views.user.userForm.form.captcha.placeholder'),
+      trigger: 'blur'
+    }
   ]
 })
 const loginFormRef = ref<FormInstance>()
@@ -222,7 +251,8 @@ function changeMode(val: string) {
   showQrCodeTab.value = false
   loginForm.value = {
     username: '',
-    password: ''
+    password: '',
+    captcha: ''
   }
   redirectAuth(val)
   loginFormRef.value?.clearValidate()
@@ -232,7 +262,12 @@ const login = () => {
   loginFormRef.value?.validate().then(() => {
     loading.value = true
     user
-      .login(loginMode.value, loginForm.value.username, loginForm.value.password)
+      .login(
+        loginMode.value,
+        loginForm.value.username,
+        loginForm.value.password,
+        loginForm.value.captcha
+      )
       .then(() => {
         locale.value = localStorage.getItem('MaxKB-locale') || getBrowserLang() || 'en-US'
         router.push({ name: 'home' })
@@ -285,6 +320,7 @@ onBeforeMount(() => {
 declare const window: any
 
 onMounted(() => {
+  makeCode()
   const route = useRoute()
   const currentUrl = ref(route.fullPath)
   const params = new URLSearchParams(currentUrl.value.split('?')[1])

ui/src/views/user-manage/index.vue

@@ -214,8 +214,4 @@ onMounted(() => {
   getList()
 })
 </script>
-<style lang="scss" scoped>
-.log-table tr {
-  cursor: pointer;
-}
-</style>
+<style lang="scss" scoped></style>

ui/src/workflow/nodes/application-node/index.vue

@@ -238,49 +238,42 @@ const update_field = () => {
         const new_user_input_field_list = cloneDeep(
           ok.data.work_flow.nodes[0].properties.user_input_field_list
         )
-        const merge_api_input_field_list =
-          new_api_input_field_list ||
-          [].map((item: any) => {
-            const find_field = old_api_input_field_list.find(
-              (old_item: any) => old_item.variable == item.variable
-            )
-            if (find_field) {
-              return {
-                ...item,
-                value: find_field.value,
-                label:
-                  typeof item.label === 'object' && item.label != null
-                    ? item.label.label
-                    : item.label
-              }
-            } else {
-              return item
+
+        const merge_api_input_field_list = (new_api_input_field_list || []).map((item: any) => {
+          const find_field = old_api_input_field_list.find(
+            (old_item: any) => old_item.variable == item.variable
+          )
+          if (find_field) {
+            return {
+              ...item,
+              value: find_field.value,
+              label:
+                typeof item.label === 'object' && item.label != null ? item.label.label : item.label
             }
-          })
+          } else {
+            return item
+          }
+        })
         set(
           props.nodeModel.properties.node_data,
           'api_input_field_list',
           merge_api_input_field_list
         )
-        const merge_user_input_field_list =
-          new_user_input_field_list ||
-          [].map((item: any) => {
-            const find_field = old_user_input_field_list.find(
-              (old_item: any) => old_item.field == item.field
-            )
-            if (find_field) {
-              return {
-                ...item,
-                value: find_field.value,
-                label:
-                  typeof item.label === 'object' && item.label != null
-                    ? item.label.label
-                    : item.label
-              }
-            } else {
-              return item
+        const merge_user_input_field_list = (new_user_input_field_list || []).map((item: any) => {
+          const find_field = old_user_input_field_list.find(
+            (old_item: any) => old_item.field == item.field
+          )
+          if (find_field) {
+            return {
+              ...item,
+              value: find_field.value,
+              label:
+                typeof item.label === 'object' && item.label != null ? item.label.label : item.label
             }
-          })
+          } else {
+            return item
+          }
+        })
         set(
           props.nodeModel.properties.node_data,
           'user_input_field_list',

ui/src/workflow/nodes/base-node/index.vue

@@ -316,7 +316,7 @@ const switchFileUpload = () => {
     audio: false,
     video: false,
     other: false,
-    otherExtensions: ['ppt', 'doc']
+    otherExtensions: ['PPT', 'DOC']
   }
 
   if (form_data.value.file_upload_enable) {

ui/src/workflow/nodes/form-node/index.ts

@@ -4,6 +4,28 @@ class FormNode extends AppNode {
   constructor(props: any) {
     super(props, FormNodeVue)
   }
+  get_node_field_list() {
+    const result = []
+    const fields = this.props.model.properties?.config?.fields || []
+
+    try {
+      this.props.model.properties.node_data.form_field_list.forEach((item: any) => {
+        if (!fields.some((f: any) => f.value === item.field)) {
+          fields.push({
+            value: item.field,
+            label: typeof item.label == 'string' ? item.label : item.label.label
+          })
+        }
+      })
+    } catch (e) {}
+    result.push({
+      value: this.props.model.id,
+      label: this.props.model.properties.stepName,
+      type: this.props.model.type,
+      children: fields
+    })
+    return result
+  }
 }
 export default {
   type: 'form-node',

ui/src/workflow/nodes/mcp-node/index.vue

@@ -59,135 +59,149 @@
     <h5 class="title-decoration-1 mb-8">
       {{ $t('views.applicationWorkflow.nodes.mcpNode.toolParam') }}
     </h5>
-    <div
-      class="border-r-4 p-8-12 mb-8 layout-bg lighter"
-      v-if="form_data.tool_params[form_data.params_nested]"
-    >
-      <el-form
-        ref="dynamicsFormRef"
-        label-position="top"
-        v-loading="loading"
-        require-asterisk-position="right"
-        :hide-required-asterisk="true"
-        v-if="form_data.mcp_tool"
-        @submit.prevent
-      >
-        <el-form-item
-          v-for="item in form_data.tool_form_field" :key="item.field"
-          :required="item.required"
+    <template v-if="form_data.tool_params[form_data.params_nested]">
+      <div class="p-8-12" v-if="!form_data.mcp_tool">
+        <el-text type="info">{{ $t('common.noData') }}</el-text>
+      </div>
+      <div v-else class="border-r-4 p-8-12 mb-8 layout-bg lighter">
+        <el-form
+          ref="dynamicsFormRef"
+          label-position="top"
+          v-loading="loading"
+          require-asterisk-position="right"
+          :hide-required-asterisk="true"
+          v-if="form_data.mcp_tool"
+          @submit.prevent
         >
-          <template #label>
-            <div class="flex-between">
-              <div>
-                <TooltipLabel :label="item.label.label" :tooltip="item.label.attrs.tooltip" />
-                <span v-if="item.required" class="danger">*</span>
+          <el-form-item
+            v-for="item in form_data.tool_form_field"
+            :key="item.field"
+            :required="item.required"
+          >
+            <template #label>
+              <div class="flex-between">
+                <div>
+                  <TooltipLabel :label="item.label.label" :tooltip="item.label.attrs.tooltip" />
+                  <span v-if="item.required" class="danger">*</span>
+                </div>
+                <el-select
+                  :teleported="false"
+                  v-model="item.source"
+                  size="small"
+                  style="width: 85px"
+                  @change="form_data.tool_params[form_data.params_nested] = {}"
+                >
+                  <el-option
+                    :label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.reference')"
+                    value="referencing"
+                  />
+                  <el-option
+                    :label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.custom')"
+                    value="custom"
+                  />
+                </el-select>
               </div>
-              <el-select :teleported="false" v-model="item.source" size="small"
-                         style="width: 85px"
-                         @change="form_data.tool_params[form_data.params_nested] = {}">
-                <el-option
-                  :label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.reference')"
-                  value="referencing"
-                />
-                <el-option
-                  :label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.custom')"
-                  value="custom"
-                />
-              </el-select>
-            </div>
-          </template>
-          <el-input
-            v-if="item.source === 'custom' && item.input_type === 'TextInput'"
-            v-model="form_data.tool_params[form_data.params_nested][item.label.label]"
-          />
-          <el-input-number
-            v-else-if="item.source === 'custom' && item.input_type === 'NumberInput'"
-            v-model="form_data.tool_params[form_data.params_nested][item.label.label]"
-          />
-          <el-switch
-            v-else-if="item.source === 'custom' && item.input_type === 'SwitchInput'"
-            v-model="form_data.tool_params[form_data.params_nested][item.label.label]"
-          />
-          <el-input
-            v-else-if="item.source === 'custom' && item.input_type === 'JsonInput'"
-            v-model="form_data.tool_params[form_data.params_nested][item.label.label]"
-            type="textarea"
-          />
-          <NodeCascader
-            v-if="item.source === 'referencing'"
-            ref="nodeCascaderRef2"
-            :nodeModel="nodeModel"
-            class="w-full"
-            :placeholder="$t('views.applicationWorkflow.variable.placeholder')"
-            v-model="form_data.tool_params[form_data.params_nested][item.label.label]"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
-    <div
-      v-else
-      class="border-r-4 p-8-12 mb-8 layout-bg lighter"
-    >
-      <el-form
-        ref="dynamicsFormRef"
-        label-position="top"
-        v-loading="loading"
-        require-asterisk-position="right"
-        :hide-required-asterisk="true"
-        v-if="form_data.mcp_tool"
-        @submit.prevent
-      >
-        <el-form-item
-          v-for="item in form_data.tool_form_field" :key="item.field"
-          :required="item.required"
+            </template>
+            <el-input
+              v-if="item.source === 'custom' && item.input_type === 'TextInput'"
+              v-model="form_data.tool_params[form_data.params_nested][item.label.label]"
+            />
+            <el-input-number
+              v-else-if="item.source === 'custom' && item.input_type === 'NumberInput'"
+              v-model="form_data.tool_params[form_data.params_nested][item.label.label]"
+            />
+            <el-switch
+              v-else-if="item.source === 'custom' && item.input_type === 'SwitchInput'"
+              v-model="form_data.tool_params[form_data.params_nested][item.label.label]"
+            />
+            <el-input
+              v-else-if="item.source === 'custom' && item.input_type === 'JsonInput'"
+              v-model="form_data.tool_params[form_data.params_nested][item.label.label]"
+              type="textarea"
+            />
+            <NodeCascader
+              v-if="item.source === 'referencing'"
+              ref="nodeCascaderRef2"
+              :nodeModel="nodeModel"
+              class="w-full"
+              :placeholder="$t('views.applicationWorkflow.variable.placeholder')"
+              v-model="form_data.tool_params[form_data.params_nested][item.label.label]"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+    </template>
+    <template v-else>
+      <div class="p-8-12"  v-if="!form_data.mcp_tool">
+        <el-text type="info">{{ $t('common.noData') }}</el-text>
+      </div>
+      <div v-else class="border-r-4 p-8-12 mb-8 layout-bg lighter">
+        <el-form
+          ref="dynamicsFormRef"
+          label-position="top"
+          v-loading="loading"
+          require-asterisk-position="right"
+          :hide-required-asterisk="true"
+          v-if="form_data.mcp_tool"
+          @submit.prevent
         >
-          <template #label>
-            <div class="flex-between">
-              <div>
-                <TooltipLabel :label="item.label.label" :tooltip="item.label.attrs.tooltip" />
-                <span v-if="item.required" class="danger">*</span>
+          <el-form-item
+            v-for="item in form_data.tool_form_field"
+            :key="item.field"
+            :required="item.required"
+          >
+            <template #label>
+              <div class="flex-between">
+                <div>
+                  <TooltipLabel :label="item.label.label" :tooltip="item.label.attrs.tooltip" />
+                  <span v-if="item.required" class="danger">*</span>
+                </div>
+                <el-select
+                  :teleported="false"
+                  v-model="item.source"
+                  size="small"
+                  style="width: 85px"
+                >
+                  <el-option
+                    :label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.reference')"
+                    value="referencing"
+                  />
+                  <el-option
+                    :label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.custom')"
+                    value="custom"
+                  />
+                </el-select>
               </div>
-              <el-select :teleported="false" v-model="item.source" size="small"
-                         style="width: 85px">
-                <el-option
-                  :label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.reference')"
-                  value="referencing"
-                />
-                <el-option
-                  :label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.custom')"
-                  value="custom"
-                />
-              </el-select>
-            </div>
-          </template>
-          <el-input
-            v-if="item.source === 'custom' && item.input_type === 'TextInput'"
-            v-model="form_data.tool_params[item.label.label]"
-          />
-          <el-input-number
-            v-else-if="item.source === 'custom' && item.input_type === 'NumberInput'"
-            v-model="form_data.tool_params[item.label.label]"
-          />
-          <el-switch
-            v-else-if="item.source === 'custom' && item.input_type === 'SwitchInput'"
-            v-model="form_data.tool_params[item.label.label]"
-          />
-          <el-input
-            v-else-if="item.source === 'custom' && item.input_type === 'JsonInput'"
-            v-model="form_data.tool_params[item.label.label]"
-            type="textarea"
-          />
-          <NodeCascader
-            v-if="item.source === 'referencing'"
-            ref="nodeCascaderRef2"
-            :nodeModel="nodeModel"
-            class="w-full"
-            :placeholder="$t('views.applicationWorkflow.variable.placeholder')"
-            v-model="form_data.tool_params[item.label.label]"
-          />
-        </el-form-item>
-      </el-form>
-    </div>
+            </template>
+            <el-input
+              v-if="item.source === 'custom' && item.input_type === 'TextInput'"
+              v-model="form_data.tool_params[item.label.label]"
+            />
+            <el-input-number
+              v-else-if="item.source === 'custom' && item.input_type === 'NumberInput'"
+              v-model="form_data.tool_params[item.label.label]"
+            />
+            <el-switch
+              v-else-if="item.source === 'custom' && item.input_type === 'SwitchInput'"
+              v-model="form_data.tool_params[item.label.label]"
+            />
+            <el-input
+              v-else-if="item.source === 'custom' && item.input_type === 'JsonInput'"
+              v-model="form_data.tool_params[item.label.label]"
+              type="textarea"
+            />
+            <NodeCascader
+              v-if="item.source === 'referencing'"
+              ref="nodeCascaderRef2"
+              :nodeModel="nodeModel"
+              class="w-full"
+              :placeholder="$t('views.applicationWorkflow.variable.placeholder')"
+              v-model="form_data.tool_params[item.label.label]"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+    </template>
   </NodeContainer>
 </template>
 <script setup lang="ts">
@@ -252,6 +266,10 @@ function getTools() {
     .then((res: any) => {
       form_data.value.mcp_tools = res.data
       MsgSuccess(t('views.applicationWorkflow.nodes.mcpNode.getToolsSuccess'))
+      // 修改了json，刷新mcp_server
+      form_data.value.mcp_server = form_data.value.mcp_tools.filter(
+        (item: any) => item.name === form_data.value.mcp_tool
+      )[0].server
     })
 }
 
@@ -319,7 +337,7 @@ function changeTool() {
       } else if (args_schema.properties[item].type === 'object') {
         input_type = 'JsonInput'
       }
-      console.log(args_schema.properties[item]);
+      console.log(args_schema.properties[item])
       form_data.value.tool_form_field.push({
         field: item,
         label: {