Pr@main@problem manage (#37)

* feat: 问题模块

Author: shaohuzhang1

apps/dataset/serializers/paragraph_serializers.py

@@ -218,7 +218,7 @@ def is_valid(self, *, raise_exception=True):
         def association(self, with_valid=True, with_embedding=True):
             if with_valid:
                 self.is_valid(raise_exception=True)
-            problem = QuerySet(Problem).filter(id=self.data.get("problem_id"))
+            problem = QuerySet(Problem).filter(id=self.data.get("problem_id")).first()
             problem_paragraph_mapping = ProblemParagraphMapping(id=uuid.uuid1(),
                                                                 document_id=self.data.get('document_id'),
                                                                 paragraph_id=self.data.get('paragraph_id'),

apps/dataset/serializers/problem_serializers.py

@@ -8,7 +8,7 @@
 """
 import os
 import uuid
-from typing import Dict
+from typing import Dict, List
 
 from django.db import transaction
 from django.db.models import QuerySet
@@ -83,6 +83,7 @@ def get_query_set(self):
                 **{'dataset_id': self.data.get('dataset_id')})
             if 'content' in self.data:
                 query_set = query_set.filter(**{'content__contains': self.data.get('content')})
+            query_set = query_set.order_by("-create_time")
             return query_set
 
         def list(self):
@@ -95,6 +96,22 @@ def page(self, current_page, page_size):
             return native_page_search(current_page, page_size, query_set, select_string=get_file_content(
                 os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'list_problem.sql')))
 
+    class BatchOperate(serializers.Serializer):
+        dataset_id = serializers.UUIDField(required=True, error_messages=ErrMessage.uuid("知识库id"))
+
+        def delete(self, problem_id_list: List, with_valid=True):
+            if with_valid:
+                self.is_valid(raise_exception=True)
+            dataset_id = self.data.get('dataset_id')
+            problem_paragraph_mapping_list = QuerySet(ProblemParagraphMapping).filter(
+                dataset_id=dataset_id,
+                problem_id__in=problem_id_list)
+            source_ids = [row.id for row in problem_paragraph_mapping_list]
+            problem_paragraph_mapping_list.delete()
+            QuerySet(Problem).filter(id__in=problem_id_list).delete()
+            ListenerManagement.delete_embedding_by_source_ids_signal.send(source_ids)
+            return True
+
     class Operate(serializers.Serializer):
         dataset_id = serializers.UUIDField(required=True, error_messages=ErrMessage.uuid("知识库id"))
 
@@ -105,6 +122,8 @@ def list_paragraph(self, with_valid=True):
                 self.is_valid(raise_exception=True)
             problem_paragraph_mapping = QuerySet(ProblemParagraphMapping).filter(dataset_id=self.data.get("dataset_id"),
                                                                                  problem_id=self.data.get("problem_id"))
+            if problem_paragraph_mapping is None or len(problem_paragraph_mapping)==0:
+                return []
             return native_search(
                 QuerySet(Paragraph).filter(id__in=[row.paragraph_id for row in problem_paragraph_mapping]),
                 select_string=get_file_content(
@@ -123,6 +142,7 @@ def delete(self, with_valid=True):
                 dataset_id=self.data.get('dataset_id'),
                 problem_id=self.data.get('problem_id'))
             source_ids = [row.id for row in problem_paragraph_mapping_list]
+            problem_paragraph_mapping_list.delete()
             QuerySet(Problem).filter(id=self.data.get('problem_id')).delete()
             ListenerManagement.delete_embedding_by_source_ids_signal.send(source_ids)
             return True

apps/dataset/swagger_api/problem_api.py

@@ -36,6 +36,25 @@ def get_response_body_api():
             }
         )
 
+    class BatchOperate(ApiMixin):
+        @staticmethod
+        def get_request_params_api():
+            return [openapi.Parameter(name='dataset_id',
+                                      in_=openapi.IN_PATH,
+                                      type=openapi.TYPE_STRING,
+                                      required=True,
+                                      description='知识库id'),
+                    ]
+
+        @staticmethod
+        def get_request_body_api():
+            return openapi.Schema(
+                title="问题id列表",
+                description="问题id列表",
+                type=openapi.TYPE_ARRAY,
+                items=openapi.Schema(type=openapi.TYPE_STRING)
+            )
+
     class Operate(ApiMixin):
         @staticmethod
         def get_request_params_api():

apps/dataset/urls.py

@@ -36,6 +36,7 @@
         'dataset/<str:dataset_id>/document/<str:document_id>/paragraph/<str:paragraph_id>/problem/<str:problem_id>/association',
         views.Paragraph.Problem.Association.as_view()),
     path('dataset/<str:dataset_id>/problem', views.Problem.as_view()),
+    path('dataset/<str:dataset_id>/problem/_batch', views.Problem.OperateBatch.as_view()),
     path('dataset/<str:dataset_id>/problem/<int:current_page>/<int:page_size>', views.Problem.Page.as_view()),
     path('dataset/<str:dataset_id>/problem/<str:problem_id>', views.Problem.Operate.as_view()),
     path('dataset/<str:dataset_id>/problem/<str:problem_id>/paragraph', views.Problem.Paragraph.as_view()),

apps/dataset/views/problem.py

@@ -51,7 +51,7 @@ def get(self, request: Request, dataset_id: str):
     def post(self, request: Request, dataset_id: str):
         return result.success(
             ProblemSerializers.Create(
-                data={'dataset_id': dataset_id, 'problem_list': request.query_params.get('problem_list')}).save())
+                data={'dataset_id': dataset_id, 'problem_list': request.data}).batch())
 
     class Paragraph(APIView):
         authentication_classes = [TokenAuth]
@@ -70,6 +70,24 @@ def get(self, request: Request, dataset_id: str, problem_id: str):
                 data={**query_params_to_single_dict(request.query_params), 'dataset_id': dataset_id,
                       'problem_id': problem_id}).list_paragraph())
 
+    class OperateBatch(APIView):
+        authentication_classes = [TokenAuth]
+
+        @action(methods=['DELETE'], detail=False)
+        @swagger_auto_schema(operation_summary="批量删除问题",
+                             operation_id="批量删除问题",
+                             request_body=
+                             ProblemApi.BatchOperate.get_request_body_api(),
+                             manual_parameters=ProblemApi.BatchOperate.get_request_params_api(),
+                             responses=result.get_default_response(),
+                             tags=["知识库/文档/段落/问题"])
+        @has_permissions(
+            lambda r, k: Permission(group=Group.DATASET, operate=Operate.MANAGE,
+                                    dynamic_tag=k.get('dataset_id')))
+        def delete(self, request: Request, dataset_id: str):
+            return result.success(
+                ProblemSerializers.BatchOperate(data={'dataset_id': dataset_id}).delete(request.data))
+
     class Operate(APIView):
         authentication_classes = [TokenAuth]
 

ui/src/api/paragraph.ts

@@ -129,25 +129,55 @@ const postProblem: (
   dataset_id: string,
   document_id: string,
   paragraph_id: string,
-  data: any
-) => Promise<Result<any>> = (dataset_id, document_id, paragraph_id, data: any) => {
+  data: any,
+  loading?: Ref<boolean>
+) => Promise<Result<any>> = (dataset_id, document_id, paragraph_id, data: any, loading) => {
   return post(
     `${prefix}/${dataset_id}/document/${document_id}/paragraph/${paragraph_id}/problem`,
-    data
+    data,
+    {},
+    loading
+  )
+}
+/**
+ *
+ * @param dataset_id 数据集id
+ * @param document_id 文档id
+ * @param paragraph_id 段落id
+ * @param problem_id 问题id
+ * @param loading 加载器
+ * @returns
+ */
+const associationProblem: (
+  dataset_id: string,
+  document_id: string,
+  paragraph_id: string,
+  problem_id: string,
+  loading?: Ref<boolean>
+) => Promise<Result<any>> = (dataset_id, document_id, paragraph_id, problem_id, loading) => {
+  return put(
+    `${prefix}/${dataset_id}/document/${document_id}/paragraph/${paragraph_id}/problem/${problem_id}/association`,
+    {},
+    {},
+    loading
   )
 }
 /**
  * 解除关联问题
  * @param 参数 dataset_id, document_id, paragraph_id,problem_id
  */
-const delProblem: (
+const disassociationProblem: (
   dataset_id: string,
   document_id: string,
   paragraph_id: string,
-  problem_id: string
-) => Promise<Result<boolean>> = (dataset_id, document_id, paragraph_id, problem_id) => {
+  problem_id: string,
+  loading?: Ref<boolean>
+) => Promise<Result<boolean>> = (dataset_id, document_id, paragraph_id, problem_id, loading) => {
   return put(
-    `${prefix}/${dataset_id}/document/${document_id}/paragraph/${paragraph_id}/problem/${problem_id}/un_association`
+    `${prefix}/${dataset_id}/document/${document_id}/paragraph/${paragraph_id}/problem/${problem_id}/un_association`,
+    {},
+    {},
+    loading
   )
 }
 
@@ -158,5 +188,6 @@ export default {
   postParagraph,
   getProblem,
   postProblem,
-  delProblem
+  disassociationProblem,
+  associationProblem
 }

ui/src/api/problem.ts

@@ -0,0 +1,107 @@
+import { Result } from '@/request/Result'
+import { get, post, del, put } from '@/request/index'
+import type { Ref } from 'vue'
+import type { KeyValue } from '@/api/type/common'
+import type { pageRequest } from '@/api/type/common'
+const prefix = '/dataset'
+
+/**
+ * 文档分页列表
+ * @param 参数  dataset_id,   
+ * page {
+              "current_page": "string",
+              "page_size": "string",
+            }
+* query {
+          "content": "string",
+        }
+ */
+
+const getProblems: (
+  dataset_id: string,
+  page: pageRequest,
+  param: any,
+  loading?: Ref<boolean>
+) => Promise<Result<any>> = (dataset_id, page, param, loading) => {
+  return get(
+    `${prefix}/${dataset_id}/problem/${page.current_page}/${page.page_size}`,
+    param,
+    loading
+  )
+}
+
+/**
+ * 创建问题
+ * @param 参数 dataset_id
+ * data: array[string]
+ */
+const postProblems: (
+  dataset_id: string,
+  data: any,
+  loading?: Ref<boolean>
+) => Promise<Result<any>> = (dataset_id, data, loading) => {
+  return post(`${prefix}/${dataset_id}/problem`, data, undefined, loading)
+}
+
+/**
+ * 删除问题
+ * @param 参数 dataset_id, problem_id,
+ */
+const delProblems: (
+  dataset_id: string,
+  problem_id: string,
+  loading?: Ref<boolean>
+) => Promise<Result<boolean>> = (dataset_id, problem_id, loading) => {
+  return del(`${prefix}/${dataset_id}/problem/${problem_id}`, loading)
+}
+
+/**
+ * 批量删除问题
+ * @param 参数 dataset_id,
+ */
+const delMulProblem: (
+  dataset_id: string,
+  data: any,
+  loading?: Ref<boolean>
+) => Promise<Result<boolean>> = (dataset_id, data, loading) => {
+  return del(`${prefix}/${dataset_id}/problem/_batch`, undefined, data, loading)
+}
+
+/**
+ * 修改问题
+ * @param 参数 
+ * dataset_id, problem_id, 
+ * {
+      "content": "string",
+    }
+ */
+const putProblems: (
+  dataset_id: string,
+  problem_id: string,
+  data: any,
+  loading?: Ref<boolean>
+) => Promise<Result<any>> = (dataset_id, problem_id, data: any, loading) => {
+  return put(`${prefix}/${dataset_id}/problem/${problem_id}`, data, undefined, loading)
+}
+
+/**
+ * 问题详情
+ * @param 参数
+ * dataset_id, problem_id,
+ */
+const getDetailProblems: (
+  dataset_id: string,
+  problem_id: string,
+  loading?: Ref<boolean>
+) => Promise<Result<any>> = (dataset_id, problem_id, loading) => {
+  return get(`${prefix}/${dataset_id}/problem/${problem_id}/paragraph`, undefined, loading)
+}
+
+export default {
+  getProblems,
+  postProblems,
+  delProblems,
+  putProblems,
+  getDetailProblems,
+  delMulProblem
+}

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

@@ -102,13 +102,4 @@ defineExpose({ open })
     height: calc(100vh - 260px);
   }
 }
-.paragraph-source-card {
-  height: 210px;
-  width: 100%;
-  .active-button {
-    position: absolute;
-    right: 16px;
-    top: 16px;
-  }
-}
 </style>

ui/src/components/app-table/index.vue

@@ -6,9 +6,11 @@
           <el-input
             ref="quickInputRef"
             v-model="inputValue"
-            placeholder="请输入文档名称"
+            :placeholder="`请输入${quickCreateName}`"
             class="w-500 mr-12"
             autofocus
+            :maxlength="quickCreateMaxlength"
+            :show-word-limit="quickCreateMaxlength ? true : false"
           />
 
           <el-button type="primary" @click="submitHandle" :disabled="loading">创建</el-button>
@@ -17,7 +19,7 @@
         <div v-else @click="quickCreateHandel" class="w-full">
           <el-button type="primary" link class="quich-button">
             <el-icon><Plus /></el-icon>
-            <span class="ml-4">快速创建空白文档</span>
+            <span class="ml-4">{{ quickCreatePlaceholder }}</span>
           </el-button>
         </div>
       </template>
@@ -51,6 +53,18 @@ const props = defineProps({
   quickCreate: {
     type: Boolean,
     default: false
+  },
+  quickCreateName: {
+    type: String,
+    default: '文档名称'
+  },
+  quickCreatePlaceholder: {
+    type: String,
+    default: '快速创建空白文档'
+  },
+  quickCreateMaxlength: {
+    type: Number,
+    default: () => 0
   }
 })
 const emit = defineEmits(['changePage', 'sizeChange', 'creatQuick'])
@@ -81,7 +95,7 @@ function submitHandle() {
       loading.value = false
     }, 200)
   } else {
-    MsgError('文件名称不能为空！')
+    MsgError(`${props.quickCreateName}不能为空！`)
   }
 }