feat: The demonstration page supports modifying dialogue summaries

README.md

@@ -53,6 +53,69 @@ Access MaxKB web interface at `http://your_server_ip:8080` with default admin cr
 - LLM Framework：[LangChain](https://www.langchain.com/)
 - Database：[PostgreSQL + pgvector](https://www.postgresql.org/)
 
+## 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>
+    <th align="center">LangChain</th>
+    <th align="center">Dify.AI</th>
+    <th align="center">Flowise</th>
+    <th align="center">MaxKB <br>（Built upon LangChain）</th>
+  </tr>
+  <tr>
+    <td align="center">Supported LLMs</td>
+    <td align="center">Rich Variety</td>
+    <td align="center">Rich Variety</td>
+    <td align="center">Rich Variety</td>
+    <td align="center">Rich Variety</td>
+  </tr>
+  <tr>
+    <td align="center">RAG Engine</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+  </tr>
+  <tr>
+    <td align="center">Agent</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+    <td align="center">❌</td>
+    <td align="center">✅</td>
+  </tr>
+  <tr>
+    <td align="center">Workflow</td>
+    <td align="center">❌</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+  </tr>
+  <tr>
+    <td align="center">Observability</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+    <td align="center">❌</td>
+    <td align="center">✅</td>
+  </tr>
+  <tr>
+    <td align="center">SSO/Access control</td>
+    <td align="center">❌</td>
+    <td align="center">✅</td>
+    <td align="center">❌</td>
+    <td align="center">✅ (Pro)</td>
+  </tr>
+  <tr>
+    <td align="center">On-premise Deployment</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+  </tr>
+</table>
+
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=1Panel-dev/MaxKB&type=Date)](https://star-history.com/#1Panel-dev/MaxKB&Date)

apps/application/flow/step_node/__init__.py

@@ -24,11 +24,14 @@
 from .speech_to_text_step_node import BaseSpeechToTextNode
 from .start_node import *
 from .text_to_speech_step_node.impl.base_text_to_speech_node import BaseTextToSpeechNode
+from .variable_assign_node import BaseVariableAssignNode
 
-node_list = [BaseStartStepNode, BaseChatNode, BaseSearchDatasetNode, BaseQuestionNode, BaseConditionNode, BaseReplyNode,
+node_list = [BaseStartStepNode, BaseChatNode, BaseSearchDatasetNode, BaseQuestionNode,
+             BaseConditionNode, BaseReplyNode,
              BaseFunctionNodeNode, BaseFunctionLibNodeNode, BaseRerankerNode, BaseApplicationNode,
              BaseDocumentExtractNode,
-             BaseImageUnderstandNode, BaseFormNode, BaseSpeechToTextNode, BaseTextToSpeechNode,BaseImageGenerateNode]
+             BaseImageUnderstandNode, BaseFormNode, BaseSpeechToTextNode, BaseTextToSpeechNode,
+             BaseImageGenerateNode, BaseVariableAssignNode]
 
 
 def get_node(node_type):

apps/application/flow/step_node/variable_assign_node/__init__.py

@@ -0,0 +1,3 @@
+# coding=utf-8
+
+from .impl import *

apps/application/flow/step_node/variable_assign_node/i_variable_assign_node.py

@@ -0,0 +1,27 @@
+# coding=utf-8
+
+from typing import Type
+
+from django.utils.translation import gettext_lazy as _
+from rest_framework import serializers
+
+from application.flow.i_step_node import INode, NodeResult
+from common.util.field_message import ErrMessage
+
+
+class VariableAssignNodeParamsSerializer(serializers.Serializer):
+    variable_list = serializers.ListField(required=True,
+                                          error_messages=ErrMessage.list(_("Reference Field")))
+
+
+class IVariableAssignNode(INode):
+    type = 'variable-assign-node'
+
+    def get_node_params_serializer_class(self) -> Type[serializers.Serializer]:
+        return VariableAssignNodeParamsSerializer
+
+    def _run(self):
+        return self.execute(**self.node_params_serializer.data, **self.flow_params_serializer.data)
+
+    def execute(self, variable_list, stream, **kwargs) -> NodeResult:
+        pass

apps/application/flow/step_node/variable_assign_node/impl/__init__.py

@@ -0,0 +1,9 @@
+# coding=utf-8
+"""
+    @project: maxkb
+    @Author：虎
+    @file： __init__.py
+    @date：2024/6/11 17:49
+    @desc:
+"""
+from .base_variable_assign_node import *

apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py

@@ -0,0 +1,59 @@
+# coding=utf-8
+import json
+from typing import List
+
+from application.flow.i_step_node import NodeResult
+from application.flow.step_node.variable_assign_node.i_variable_assign_node import IVariableAssignNode
+
+
+class BaseVariableAssignNode(IVariableAssignNode):
+    def save_context(self, details, workflow_manage):
+        self.context['variable_list'] = details.get('variable_list')
+        self.context['result_list'] = details.get('result_list')
+
+    def execute(self, variable_list, stream, **kwargs) -> NodeResult:
+        #
+        result_list = []
+        for variable in variable_list:
+            if 'fields' not in variable:
+                continue
+            if 'global' == variable['fields'][0]:
+                result = {
+                    'name': variable['name'],
+                    'input_value': self.get_reference_content(variable['fields']),
+                }
+                if variable['source'] == 'custom':
+                    if variable['type'] in ['dict', 'array']:
+                        if isinstance(variable['value'], dict) or isinstance(variable['value'], list):
+                            val = variable['value']
+                        else:
+                            val = json.loads(variable['value'])
+                        self.workflow_manage.context[variable['fields'][1]] = val
+                        result['output_value'] = variable['value'] = val
+                    else:
+                        self.workflow_manage.context[variable['fields'][1]] = variable['value']
+                        result['output_value'] = variable['value']
+                else:
+                    reference = self.get_reference_content(variable['reference'])
+                    self.workflow_manage.context[variable['fields'][1]] = reference
+                    result['output_value'] = reference
+                result_list.append(result)
+
+        return NodeResult({'variable_list': variable_list, 'result_list': result_list}, {})
+
+    def get_reference_content(self, fields: List[str]):
+        return str(self.workflow_manage.get_reference_field(
+            fields[0],
+            fields[1:]))
+
+    def get_details(self, index: int, **kwargs):
+        return {
+            'name': self.node.properties.get('stepName'),
+            "index": index,
+            'run_time': self.context.get('run_time'),
+            'type': self.node.type,
+            'variable_list': self.context.get('variable_list'),
+            'result_list': self.context.get('result_list'),
+            'status': self.status,
+            'err_message': self.err_message
+        }

apps/application/models/application.py

@@ -7,6 +7,7 @@
     @desc:
 """
 import datetime
+import decimal
 import json
 import uuid
 
@@ -140,6 +141,8 @@ def default(self, obj):
             return str(obj)
         if isinstance(obj, datetime.datetime):
             return obj.strftime("%Y-%m-%d %H:%M:%S")
+        if isinstance(obj, decimal.Decimal):
+            return float(obj)
         else:
             return json.JSONEncoder.default(self, obj)
 

apps/application/serializers/chat_serializers.py

@@ -66,6 +66,10 @@ def valid_model_params_setting(model_id, model_params_setting):
     credential.get_model_params_setting_form(model.model_name).valid_form(model_params_setting)
 
 
+class ReAbstractInstanceSerializers(serializers.Serializer):
+    abstract = serializers.CharField(required=True, error_messages=ErrMessage.char(_("abstract")))
+
+
 class ChatSerializers(serializers.Serializer):
     class Operate(serializers.Serializer):
         chat_id = serializers.UUIDField(required=True, error_messages=ErrMessage.uuid(_("Conversation ID")))
@@ -78,6 +82,15 @@ def logic_delete(self, with_valid=True):
                 is_deleted=True)
             return True
 
+        def re_abstract(self, instance, with_valid=True):
+            if with_valid:
+                self.is_valid(raise_exception=True)
+                ReAbstractInstanceSerializers(data=instance).is_valid(raise_exception=True)
+
+            QuerySet(Chat).filter(id=self.data.get('chat_id'), application_id=self.data.get('application_id')).update(
+                abstract=instance.get('abstract'))
+            return True
+
         def delete(self, with_valid=True):
             if with_valid:
                 self.is_valid(raise_exception=True)

apps/application/swagger_api/application_api.py

@@ -234,7 +234,7 @@ def get_request_body_api():
                                             default=[]),
                     'edges': openapi.Schema(type=openapi.TYPE_ARRAY, items=openapi.Schema(type=openapi.TYPE_OBJECT),
                                             title=_('Connection List'), description=_("Connection List"),
-                                            default={}),
+                                            default=[]),
 
                 }
             )
@@ -324,7 +324,8 @@ def get_request_body_api():
             return openapi.Schema(
                 type=openapi.TYPE_OBJECT,
                 required=['name', 'desc', 'model_id', 'dialogue_number', 'dataset_setting', 'model_setting',
-                          'problem_optimization', 'stt_model_enable', 'stt_model_enable', 'tts_type'],
+                          'problem_optimization', 'stt_model_enable', 'stt_model_enable', 'tts_type',
+                          'work_flow'],
                 properties={
                     'name': openapi.Schema(type=openapi.TYPE_STRING, title=_("Application Name"),
                                            description=_("Application Name")),
@@ -361,7 +362,8 @@ def get_request_body_api():
                     '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"))
+                                               description=_("Text-to-speech type")),
+                    'work_flow': ApplicationApi.WorkFlow.get_request_body_api(),
                 }
             )
 
@@ -432,4 +434,4 @@ def get_request_body_api():
                     'text': openapi.Schema(type=openapi.TYPE_STRING, title=_("Text"),
                                            description=_("Text")),
                 }
-            )
+            )

apps/application/swagger_api/chat_api.py

@@ -23,6 +23,34 @@ def get_request_params_api():
                                   description=_('Application ID'))
                 ]
 
+    class Operate(ApiMixin):
+        @staticmethod
+        def get_request_params_api():
+            return [openapi.Parameter(name='application_id',
+                                      in_=openapi.IN_PATH,
+                                      type=openapi.TYPE_STRING,
+                                      required=True,
+                                      description=_('Application ID')),
+                    openapi.Parameter(name='chat_id',
+                                      in_=openapi.IN_PATH,
+                                      type=openapi.TYPE_STRING,
+                                      required=True,
+                                      description=_('Conversation ID')),
+                    ]
+
+        class ReAbstract(ApiMixin):
+            @staticmethod
+            def get_request_body_api():
+                return openapi.Schema(
+                    type=openapi.TYPE_OBJECT,
+                    required=['abstract'],
+                    properties={
+                        'abstract': openapi.Schema(type=openapi.TYPE_STRING, title=_("abstract"),
+                                                   description=_("abstract"))
+
+                    }
+                )
+
 
 class OpenAIChatApi(ApiMixin):
     @staticmethod

apps/application/views/chat_views.py

@@ -150,7 +150,7 @@ def post(self, request: Request, chat_id: str):
                          operation_id=_("Get the conversation list"),
                          manual_parameters=ChatApi.get_request_params_api(),
                          responses=result.get_api_array_response(ChatApi.get_response_body_api()),
-                             tags=[_("Application/Conversation Log")]
+                         tags=[_("Application/Conversation Log")]
                          )
     @has_permissions(
         ViewPermission([RoleConstants.ADMIN, RoleConstants.USER, RoleConstants.APPLICATION_KEY],
@@ -222,6 +222,23 @@ def delete(self, request: Request, application_id: str, chat_id: str):
                         data={'application_id': application_id, 'user_id': request.user.id,
                               'chat_id': chat_id}).logic_delete())
 
+            @action(methods=['PUT'], detail=False)
+            @swagger_auto_schema(operation_summary=_("Client modifies dialogue summary"),
+                                 operation_id=_("Client modifies dialogue summary"),
+                                 request_body=ChatClientHistoryApi.Operate.ReAbstract.get_request_body_api(),
+                                 tags=[_("Application/Conversation Log")])
+            @has_permissions(ViewPermission(
+                [RoleConstants.APPLICATION_ACCESS_TOKEN],
+                [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
+                                                dynamic_tag=keywords.get('application_id'))],
+                compare=CompareConstants.AND),
+                compare=CompareConstants.AND)
+            def put(self, request: Request, application_id: str, chat_id: str):
+                return result.success(
+                    ChatSerializers.Operate(
+                        data={'application_id': application_id, 'user_id': request.user.id,
+                              'chat_id': chat_id}).re_abstract(request.data))
+
     class Page(APIView):
         authentication_classes = [TokenAuth]
 

apps/common/util/function_code.py

@@ -31,7 +31,7 @@ def __init__(self, sandbox=False):
             self.user = None
         self._createdir()
         if self.sandbox:
-            os.system(f"chown -R {self.user}:{self.user} {self.sandbox_path}")
+            os.system(f"chown -R {self.user}:root {self.sandbox_path}")
 
     def _createdir(self):
         old_mask = os.umask(0o077)

apps/locales/en_US/LC_MESSAGES/django.po

@@ -6753,3 +6753,5 @@ msgstr ""
 msgid "Image download failed, check network"
 msgstr ""
 
+msgid "Client modifies dialogue summary"
+msgstr ""

apps/locales/zh_CN/LC_MESSAGES/django.po

@@ -6892,4 +6892,5 @@ msgstr "超出许可证使用限制。"
 msgid "Image download failed, check network"
 msgstr "图片下载失败，请检查网络"
 
-
+msgid "Client modifies dialogue summary"
+msgstr "客户端修改对话摘要"

apps/locales/zh_Hant/LC_MESSAGES/django.po

@@ -6902,4 +6902,7 @@ msgid "License usage limit exceeded."
 msgstr "超出許可證使用限制。"
 
 msgid "Image download failed, check network"
-msgstr "圖片下載失敗，檢查網絡"
+msgstr "圖片下載失敗，檢查網絡"
+
+msgid "Client modifies dialogue summary"
+msgstr "用戶端修改對話摘要"

apps/setting/models_provider/impl/ollama_model_provider/credential/reranker.py

@@ -64,4 +64,3 @@ def build_model(self, model_info: Dict[str, object]):
         return self
 
     api_base = forms.TextInputField('API URL', required=True)
-    api_key = forms.TextInputField('API Key', required=True)