From 56a432a98aaa7c7f1c0cae3c0851e24069b7c439 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Fri, 31 May 2024 11:23:18 +0800 Subject: [PATCH 1/4] chore: Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 12535c263..8b2e4f4c3 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ docker run -d --name=maxkb -p 8080:8080 -v ~/.maxkb:/var/lib/postgresql/data 1pa 你也可以通过 [1Panel 应用商店](https://apps.fit2cloud.com/1panel) 快速部署 MaxKB + Ollama + Llama 2，30 分钟内即可上线基于本地大模型的知识库问答系统，并嵌入到第三方业务系统中。 +如果是内网环境，推荐使用 [离线安装包](https://community.fit2cloud.com/#/products/maxkb/downloads) 进行安装部署。 + 你也可以在线体验：[DataEase 小助手](https://dataease.io/docs/v2/)，它是基于 MaxKB 搭建的智能问答系统，已经嵌入到 DataEase 产品及在线文档中。 如你有更多问题，可以查看使用手册，或者通过论坛与我们交流。 From 11a8df151e11db990981ddc8d49c52feb41a3b4b Mon Sep 17 00:00:00 2001 From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com> Date: Mon, 3 Jun 2024 10:53:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=BF=87?= =?UTF-8?q?API=E8=BF=9B=E8=A1=8C=E5=AF=B9=E8=AF=9D=E7=9A=84API=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF=20#587=20(#593)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/init/init_doc.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/common/init/init_doc.py b/apps/common/init/init_doc.py index 60ef21bcf..993dcca1b 100644 --- a/apps/common/init/init_doc.py +++ b/apps/common/init/init_doc.py @@ -8,7 +8,7 @@ """ import hashlib -from django.urls import re_path, path +from django.urls import re_path, path, URLPattern from drf_yasg import openapi from drf_yasg.views import get_schema_view from rest_framework import permissions @@ -46,11 +46,15 @@ def init_chat_doc(application_urlpatterns, patterns): public=True, permission_classes=[permissions.AllowAny], authentication_classes=[AnonymousAuthentication], - patterns=[url for url in patterns if - url.name is not None and ['application/message', 'application/open', - 'application/profile'].__contains__( - url.name)] + patterns=[ + URLPattern(pattern='api/' + str(url.pattern), callback=url.callback, default_args=url.default_args, + name=url.name) + for url in patterns if + url.name is not None and ['application/message', 'application/open', + 'application/profile'].__contains__( + url.name)] ) + application_urlpatterns += [ path('doc/chat/', chat_schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'), path('redoc/chat/', chat_schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'), From bb2768a7eb797f67c7be7a8c10655ad196401bbd Mon Sep 17 00:00:00 2001 From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com> Date: Mon, 3 Jun 2024 10:57:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81=20#590=20(#594)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/application/serializers/chat_message_serializers.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/application/serializers/chat_message_serializers.py b/apps/application/serializers/chat_message_serializers.py index f8c80a865..f529e7e8a 100644 --- a/apps/application/serializers/chat_message_serializers.py +++ b/apps/application/serializers/chat_message_serializers.py @@ -179,13 +179,12 @@ class ChatMessageSerializer(serializers.Serializer): return chat_info def chat(self): - self.is_valid(raise_exception=True) + chat_info = self.is_valid(raise_exception=True) message = self.data.get('message') re_chat = self.data.get('re_chat') stream = self.data.get('stream') client_id = self.data.get('client_id') client_type = self.data.get('client_type') - chat_info = self.is_valid(raise_exception=True) pipeline_manage_builder = PipelineManage.builder() # 如果开启了问题优化,则添加上问题优化步骤 if chat_info.application.problem_optimization: From 368923af9ff6941042c9f302da740ae5a5046e3b Mon Sep 17 00:00:00 2001 From: wangdan-fit2cloud Date: Wed, 5 Jun 2024 15:58:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/EmbedDialog.vue | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/ui/src/views/application-overview/component/EmbedDialog.vue b/ui/src/views/application-overview/component/EmbedDialog.vue index c497d3e5b..051f57431 100644 --- a/ui/src/views/application-overview/component/EmbedDialog.vue +++ b/ui/src/views/application-overview/component/EmbedDialog.vue @@ -1,13 +1,22 @@