Merge branch 'v2' into pr@v2@feat_chat_ui

Author: shaohuzhang1

apps/knowledge/sql/list_knowledge.sql

@@ -11,6 +11,7 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
              "temp_knowledge".file_size_limit,
              "temp_knowledge".file_count_limit,
              "temp_knowledge"."scope",
+             "temp_knowledge"."embedding_model_id"::text,
              "document_temp"."char_length",
              CASE
                  WHEN
@@ -40,6 +41,7 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
              0           as file_size_limit,
              0           as file_count_limit,
              'WORKSPACE' as "scope",
+             ''          as "embedding_model_id",
              0 as char_length,
                 0 as application_mapping_count,
                 0 as document_count

apps/knowledge/urls.py

@@ -11,50 +11,93 @@
     path('workspace/<str:workspace_id>/knowledge/embedding_model', views.KnowledgeView.EmbeddingModel.as_view()),
     path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>', views.KnowledgeView.Operate.as_view()),
     path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/sync', views.KnowledgeView.SyncWeb.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/generate_related', views.KnowledgeView.GenerateRelated.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/embedding', views.KnowledgeView.Embedding.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/generate_related',
+         views.KnowledgeView.GenerateRelated.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/embedding',
+         views.KnowledgeView.Embedding.as_view()),
     path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/hit_test', views.KnowledgeView.HitTest.as_view()),
     path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/export', views.KnowledgeView.Export.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/export_zip', views.KnowledgeView.ExportZip.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/export_zip',
+         views.KnowledgeView.ExportZip.as_view()),
     path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document', views.DocumentView.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/split', views.DocumentView.Split.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/split_pattern', views.DocumentView.SplitPattern.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_create', views.DocumentView.BatchCreate.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_sync', views.DocumentView.BatchSync.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_delete', views.DocumentView.BatchDelete.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_refresh', views.DocumentView.BatchRefresh.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_generate_related', views.DocumentView.BatchGenerateRelated.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/split',
+         views.DocumentView.Split.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/split_pattern',
+         views.DocumentView.SplitPattern.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_create',
+         views.DocumentView.BatchCreate.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_sync',
+         views.DocumentView.BatchSync.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_delete',
+         views.DocumentView.BatchDelete.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_refresh',
+         views.DocumentView.BatchRefresh.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_generate_related',
+         views.DocumentView.BatchGenerateRelated.as_view()),
     path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/web', views.WebDocumentView.as_view()),
     path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/qa', views.QaDocumentView.as_view()),
     path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/table', views.TableDocumentView.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_hit_handling', views.DocumentView.BatchEditHitHandling.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/template/export', views.Template.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/table_template/export', views.TableTemplate.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/migrate/<str:target_knowledge_id>', views.DocumentView.Migrate.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>', views.DocumentView.Operate.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/sync', views.DocumentView.SyncWeb.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/refresh', views.DocumentView.Refresh.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/cancel_task', views.DocumentView.CancelTask.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/batch_cancel_task', views.DocumentView.BatchCancelTask.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/export', views.DocumentView.Export.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/export_zip', views.DocumentView.ExportZip.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/download_source_file', views.DocumentView.DownloadSourceFile.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph', views.ParagraphView.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/batch_delete', views.ParagraphView.BatchDelete.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/batch_generate_related', views.ParagraphView.BatchGenerateRelated.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/migrate/knowledge/<str:target_knowledge_id>/document/<str:target_document_id>', views.ParagraphView.BatchMigrate.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/association', views.ParagraphView.Association.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/unassociation', views.ParagraphView.UnAssociation.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/<str:paragraph_id>', views.ParagraphView.Operate.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/<str:paragraph_id>/problem', views.ParagraphView.Problem.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/<int:current_page>/<int:page_size>', views.ParagraphView.Page.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/batch_hit_handling',
+         views.DocumentView.BatchEditHitHandling.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/template/export',
+         views.Template.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/table_template/export',
+         views.TableTemplate.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/migrate/<str:target_knowledge_id>',
+         views.DocumentView.Migrate.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>',
+         views.DocumentView.Operate.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/sync',
+         views.DocumentView.SyncWeb.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/refresh',
+         views.DocumentView.Refresh.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/cancel_task',
+         views.DocumentView.CancelTask.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/batch_cancel_task',
+         views.DocumentView.BatchCancelTask.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/export',
+         views.DocumentView.Export.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/export_zip',
+         views.DocumentView.ExportZip.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/download_source_file',
+         views.DocumentView.DownloadSourceFile.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph',
+         views.ParagraphView.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/batch_delete',
+         views.ParagraphView.BatchDelete.as_view()),
+    path(
+        'workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/batch_generate_related',
+        views.ParagraphView.BatchGenerateRelated.as_view()),
+    path(
+        'workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/migrate/knowledge/<str:target_knowledge_id>/document/<str:target_document_id>',
+        views.ParagraphView.BatchMigrate.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/association',
+         views.ParagraphView.Association.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/unassociation',
+         views.ParagraphView.UnAssociation.as_view()),
+    path(
+        'workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/<str:paragraph_id>',
+        views.ParagraphView.Operate.as_view()),
+    path(
+        'workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/<str:paragraph_id>/problem',
+        views.ParagraphView.Problem.as_view()),
+    path(
+        'workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<str:document_id>/paragraph/<int:current_page>/<int:page_size>',
+        views.ParagraphView.Page.as_view()),
     path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem', views.ProblemView.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/batch_delete', views.ProblemView.BatchDelete.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/batch_association', views.ProblemView.BatchAssociation.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/<str:problem_id>', views.ProblemView.Operate.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/<str:problem_id>/paragraph', views.ProblemView.Paragraph.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/<int:current_page>/<int:page_size>', views.ProblemView.Page.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<int:current_page>/<int:page_size>', views.DocumentView.Page.as_view()),
-    path('workspace/<str:workspace_id>/knowledge/<int:current_page>/<int:page_size>', views.KnowledgeView.Page.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/batch_delete',
+         views.ProblemView.BatchDelete.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/batch_association',
+         views.ProblemView.BatchAssociation.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/<str:problem_id>',
+         views.ProblemView.Operate.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/<str:problem_id>/paragraph',
+         views.ProblemView.Paragraph.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/<int:current_page>/<int:page_size>',
+         views.ProblemView.Page.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<int:current_page>/<int:page_size>',
+         views.DocumentView.Page.as_view()),
+    path('workspace/<str:workspace_id>/knowledge/<int:current_page>/<int:page_size>',
+         views.KnowledgeView.Page.as_view()),
 
 ]

apps/models_provider/serializers/model_serializer.py

@@ -386,3 +386,30 @@ def save_model_params_form(self, model_params_form, with_valid=True):
             model.model_params_form = model_params_form
             model.save()
             return True
+
+
+class SharedModelSerializer(serializers.Serializer):
+    workspace_id = serializers.CharField(required=True, label=_('workspace id'))
+    name = serializers.CharField(required=False, max_length=64, label=_('model name'))
+    model_type = serializers.CharField(required=False, label=_('model type'))
+    model_name = serializers.CharField(required=False, label=_('base model'))
+    provider = serializers.CharField(required=False, label=_('provider'))
+    create_user = serializers.CharField(required=False, label=_('create user'))
+
+    def get_share_model_list(self):
+        self.is_valid(raise_exception=True)
+        queryset = QuerySet(Model).filter(workspace_id='None')
+        return [
+            {
+                'id': str(model.id),
+                'provider': model.provider,
+                'name': model.name,
+                'model_type': model.model_type,
+                'model_name': model.model_name,
+                'status': model.status,
+                'meta': model.meta,
+                'user_id': model.user_id,
+                'username': model.user.username
+            }
+            for model in queryset.order_by("-create_time")
+        ]

apps/models_provider/urls.py

@@ -18,6 +18,7 @@
     path('workspace/<str:workspace_id>/model/<str:model_id>/pause_download',
          views.ModelSetting.PauseDownload.as_view()),
     path('workspace/<str:workspace_id>/model/<str:model_id>/meta', views.ModelSetting.ModelMeta.as_view()),
+    path('workspace/<str:workspace_id>/shared/model', views.SharedModel.as_view()),
 ]
 
 if os.environ.get('SERVER_NAME', 'web') == 'local_model':

apps/models_provider/views/model.py

@@ -21,7 +21,7 @@
 from models_provider.api.model import ModelCreateAPI, GetModelApi, ModelEditApi, ModelListResponse, DefaultModelResponse
 from models_provider.api.provide import ProvideApi
 from models_provider.models import Model
-from models_provider.serializers.model_serializer import ModelSerializer
+from models_provider.serializers.model_serializer import ModelSerializer, SharedModelSerializer
 from system_manage.views import encryption_str
 
 
@@ -212,3 +212,21 @@ class PauseDownload(APIView):
         def put(self, request: Request, workspace_id: str, model_id: str):
             return result.success(
                 ModelSerializer.Operate(data={'id': model_id}).pause_download())
+
+
+class SharedModel(APIView):
+    authentication_classes = [TokenAuth]
+
+    @extend_schema(
+        methods=['Get'],
+        summary=_('Get Share model'),
+        description=_('Get Share model'),
+        operation_id=_('Get Share model'),  # type: ignore
+        parameters=ModelCreateAPI.get_parameters(),
+        responses=ModelListResponse.get_response(),
+        tags=[_('Shared Model')]
+    )  # type: ignore
+    @has_permissions(PermissionConstants.MODEL_READ)
+    def get(self, request: Request, workspace_id: str):
+        return result.success(
+            SharedModelSerializer(data={'workspace_id': workspace_id}).get_share_model_list())

installer/Dockerfile

@@ -48,6 +48,9 @@ ENV MAXKB_VERSION="${DOCKER_IMAGE_TAG} (build at ${BUILD_AT}, commit: ${GITHUB_C
     MAXKB_REDIS_PASSWORD=${REDIS_PASSWORD} \
     MAXKB_EMBEDDING_MODEL_PATH=/opt/maxkb-app/model/embedding \
     MAXKB_EMBEDDING_MODEL_NAME=/opt/maxkb-app/model/embedding/shibing624_text2vec-base-chinese \
+    MAXKB_LOCAL_MODEL_HOST=127.0.0.1 \
+    MAXKB_LOCAL_MODEL_PORT=11636 \
+    MAXKB_LOCAL_MODEL_PROTOCOL=http \
     MAXKB_SANDBOX=1 \
     PATH=/opt/py3/bin:$PATH \
     PIP_TARGET=/opt/maxkb/python-packages \