Merge remote-tracking branch 'origin/v2' into v2

Author: liqiang-fit2cloud

apps/common/constants/permission_constants.py

@@ -211,12 +211,13 @@ class PermissionConstants(Enum):
                                          )
     KNOWLEDGE_READ = Permission(group=Group.KNOWLEDGE, operate=Operate.READ, role_list=[RoleConstants.ADMIN,
                                                                                         RoleConstants.USER],
-                                resource_permission_group_list=[
-                                    ResourcePermissionGroup.VIEW
-                                ]
-                                )
+                                resource_permission_group_list=[ResourcePermissionGroup.VIEW])
     KNOWLEDGE_CREATE = Permission(group=Group.KNOWLEDGE, operate=Operate.CREATE, role_list=[RoleConstants.ADMIN,
                                                                                             RoleConstants.USER])
+    KNOWLEDGE_EDIT = Permission(group=Group.KNOWLEDGE, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN,
+                                                                                            RoleConstants.USER])
+    KNOWLEDGE_DELETE = Permission(group=Group.KNOWLEDGE, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN,
+                                                                                            RoleConstants.USER])
 
     def get_workspace_application_permission(self):
         return lambda r, kwargs: Permission(group=self.value.group, operate=self.value.operate,

apps/common/db/search.py

@@ -24,7 +24,7 @@ def get_dynamics_model(attr: dict, table_name='dynamics'):
     :return: django 模型
     """
     attributes = {
-        "__module__": "dataset.models",
+        "__module__": "knowledge.models",
         "Meta": type("Meta", (), {'db_table': table_name}),
         **attr
     }

apps/knowledge/api/knowledge.py

@@ -3,14 +3,40 @@
 
 from common.mixins.api_mixin import APIMixin
 from common.result import ResultSerializer
-from knowledge.serializers.knowledge import KnowledgeBaseCreateRequest, KnowledgeModelSerializer
+from knowledge.serializers.knowledge import KnowledgeBaseCreateRequest, KnowledgeModelSerializer, KnowledgeEditRequest, \
+    KnowledgeWebCreateRequest
 
 
 class KnowledgeCreateResponse(ResultSerializer):
     def get_data(self):
         return KnowledgeModelSerializer()
 
 
+class KnowledgeReadAPI(APIMixin):
+    @staticmethod
+    def get_parameters():
+        return [
+            OpenApiParameter(
+                name="workspace_id",
+                description="工作空间id",
+                type=OpenApiTypes.STR,
+                location='path',
+                required=True,
+            ),
+            OpenApiParameter(
+                name="knowledge_id",
+                description="知识库id",
+                type=OpenApiTypes.STR,
+                location='path',
+                required=True,
+            )
+        ]
+
+    @staticmethod
+    def get_response():
+        return KnowledgeCreateResponse
+
+
 class KnowledgeBaseCreateAPI(APIMixin):
     @staticmethod
     def get_parameters():
@@ -48,14 +74,43 @@ def get_parameters():
 
     @staticmethod
     def get_request():
-        return KnowledgeBaseCreateRequest
+        return KnowledgeWebCreateRequest
+
+    @staticmethod
+    def get_response():
+        return KnowledgeCreateResponse
+
+
+class KnowledgeEditAPI(APIMixin):
+    @staticmethod
+    def get_parameters():
+        return [
+            OpenApiParameter(
+                name="workspace_id",
+                description="工作空间id",
+                type=OpenApiTypes.STR,
+                location='path',
+                required=True,
+            ),
+            OpenApiParameter(
+                name="knowledge_id",
+                description="知识库id",
+                type=OpenApiTypes.STR,
+                location='path',
+                required=True,
+            )
+        ]
+
+    @staticmethod
+    def get_request():
+        return KnowledgeEditRequest
 
     @staticmethod
     def get_response():
         return KnowledgeCreateResponse
 
 
-class KnowledgeTreeReadAPI(APIMixin):
+class KnowledgeTreeReadAPI(KnowledgeReadAPI):
     @staticmethod
     def get_parameters():
         return [
@@ -71,6 +126,83 @@ def get_parameters():
                 description="文件夹id",
                 type=OpenApiTypes.STR,
                 location='query',
+                required=True,
+            ),
+            OpenApiParameter(
+                name="user_id",
+                description="用户id",
+                type=OpenApiTypes.STR,
+                location='query',
                 required=False,
-            )
+            ),
+            OpenApiParameter(
+                name="name",
+                description="名称",
+                type=OpenApiTypes.STR,
+                location='query',
+                required=False,
+            ),
+            OpenApiParameter(
+                name="desc",
+                description="描述",
+                type=OpenApiTypes.STR,
+                location='query',
+                required=False,
+            ),
+        ]
+
+
+class KnowledgePageAPI(KnowledgeReadAPI):
+    @staticmethod
+    def get_parameters():
+        return [
+            OpenApiParameter(
+                name="workspace_id",
+                description="工作空间id",
+                type=OpenApiTypes.STR,
+                location='path',
+                required=True,
+            ),
+            OpenApiParameter(
+                name="current_page",
+                description="当前页码",
+                type=OpenApiTypes.INT,
+                location='path',
+                required=True,
+            ),
+            OpenApiParameter(
+                name="page_size",
+                description="每页条数",
+                type=OpenApiTypes.INT,
+                location='path',
+                required=True,
+            ),
+            OpenApiParameter(
+                name="folder_id",
+                description="文件夹id",
+                type=OpenApiTypes.STR,
+                location='query',
+                required=True,
+            ),
+            OpenApiParameter(
+                name="user_id",
+                description="用户id",
+                type=OpenApiTypes.STR,
+                location='query',
+                required=False,
+            ),
+            OpenApiParameter(
+                name="name",
+                description="名称",
+                type=OpenApiTypes.STR,
+                location='query',
+                required=False,
+            ),
+            OpenApiParameter(
+                name="desc",
+                description="描述",
+                type=OpenApiTypes.STR,
+                location='query',
+                required=False,
+            ),
         ]

apps/knowledge/migrations/0003_alter_document_status_alter_paragraph_status_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 5.2 on 2025-04-29 08:02
+
+import django.db.models.deletion
+import knowledge.models.knowledge
+import uuid_utils.compat
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('knowledge', '0002_document_paragraph_embedding_problem_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='document',
+            name='status',
+            field=models.CharField(default=knowledge.models.knowledge.Status.__str__, max_length=20, verbose_name='状态'),
+        ),
+        migrations.AlterField(
+            model_name='paragraph',
+            name='status',
+            field=models.CharField(default=knowledge.models.knowledge.Status.__str__, max_length=20, verbose_name='状态'),
+        ),
+        migrations.CreateModel(
+            name='ApplicationKnowledgeMapping',
+            fields=[
+                ('create_time', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, verbose_name='修改时间')),
+                ('id', models.UUIDField(default=uuid_utils.compat.uuid7, editable=False, primary_key=True, serialize=False, verbose_name='主键id')),
+                ('knowledge', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='knowledge.knowledge')),
+            ],
+            options={
+                'db_table': 'application_knowledge_mapping',
+            },
+        ),
+    ]

apps/knowledge/models/knowledge.py

@@ -197,6 +197,15 @@ class ProblemParagraphMapping(AppModelMixin):
     class Meta:
         db_table = "problem_paragraph_mapping"
 
+class ApplicationKnowledgeMapping(AppModelMixin):
+    id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid7, editable=False, verbose_name="主键id")
+    # application = models.ForeignKey(Application, on_delete=models.CASCADE)
+    knowledge = models.ForeignKey(Knowledge, on_delete=models.CASCADE)
+
+    class Meta:
+        db_table = "application_knowledge_mapping"
+
+
 
 class SourceType(models.IntegerChoices):
     """订单类型"""

apps/knowledge/serializers/common.py

@@ -160,18 +160,26 @@ def to_problem_model_list(self):
                                                            content__in=problem_list).all()
         problem_content_dict = {}
         problem_model_list = [
-            or_get(exists_problem_list, problemParagraphObject.problem_content, problemParagraphObject.knowledge_id,
-                   problemParagraphObject.document_id, problemParagraphObject.paragraph_id, problem_content_dict) for
-            problemParagraphObject in self.problem_paragraph_object_list]
+            or_get(
+                exists_problem_list,
+                problemParagraphObject.problem_content,
+                problemParagraphObject.knowledge_id,
+                problemParagraphObject.document_id,
+                problemParagraphObject.paragraph_id, problem_content_dict
+            ) for problemParagraphObject in self.problem_paragraph_object_list]
 
         problem_paragraph_mapping_list = [
-            ProblemParagraphMapping(id=uuid.uuid7(), document_id=document_id, problem_id=problem_model.id,
-                                    paragraph_id=paragraph_id,
-                                    knowledge_id=self.knowledge_id) for
-            problem_model, document_id, paragraph_id in problem_model_list]
-
-        result = [problem_model for problem_model, is_create in problem_content_dict.values() if
-                  is_create], problem_paragraph_mapping_list
+            ProblemParagraphMapping(
+                id=uuid.uuid7(),
+                document_id=document_id,
+                problem_id=problem_model.id,
+                paragraph_id=paragraph_id,
+                knowledge_id=self.knowledge_id
+            ) for problem_model, document_id, paragraph_id in problem_model_list]
+
+        result = [
+            problem_model for problem_model, is_create in problem_content_dict.values() if is_create
+        ], problem_paragraph_mapping_list
         return result
 
 

apps/knowledge/serializers/document.py

@@ -72,13 +72,17 @@ def refresh(self, state_list=None, with_valid=True):
             if embedding_model.permission_type == 'PRIVATE' and knowledge_user_id != embedding_model.user_id:
                 raise AppApiException(500, _('No permission to use this model') + f"{embedding_model.name}")
             document_id = self.data.get("document_id")
-            ListenerManagement.update_status(QuerySet(Document).filter(id=document_id), TaskType.EMBEDDING,
-                                             State.PENDING)
-            ListenerManagement.update_status(QuerySet(Paragraph).annotate(
-                reversed_status=Reverse('status'),
-                task_type_status=Substr('reversed_status', TaskType.EMBEDDING.value, 1),
-            ).filter(task_type_status__in=state_list, document_id=document_id).values('id'),
-                                             TaskType.EMBEDDING, State.PENDING)
+            ListenerManagement.update_status(
+                QuerySet(Document).filter(id=document_id), TaskType.EMBEDDING, State.PENDING
+            )
+            ListenerManagement.update_status(
+                QuerySet(Paragraph).annotate(
+                    reversed_status=Reverse('status'),
+                    task_type_status=Substr('reversed_status', TaskType.EMBEDDING.value, 1),
+                ).filter(task_type_status__in=state_list, document_id=document_id).values('id'),
+                TaskType.EMBEDDING,
+                State.PENDING
+            )
             ListenerManagement.get_aggregation_document_status(document_id)()
 
             try:
@@ -122,8 +126,9 @@ def save(self, instance: Dict, with_valid=False, **kwargs):
             # 批量插入问题
             QuerySet(Problem).bulk_create(problem_model_list) if len(problem_model_list) > 0 else None
             # 批量插入关联问题
-            QuerySet(ProblemParagraphMapping).bulk_create(problem_paragraph_mapping_list) if len(
-                problem_paragraph_mapping_list) > 0 else None
+            QuerySet(ProblemParagraphMapping).bulk_create(
+                problem_paragraph_mapping_list
+            ) if len(problem_paragraph_mapping_list) > 0 else None
             document_id = str(document_model.id)
             return (DocumentSerializers.Operate(
                 data={'knowledge_id': knowledge_id, 'document_id': document_id}
@@ -160,13 +165,15 @@ def get_document_paragraph_model(knowledge_id, instance: Dict):
                     'knowledge_id': knowledge_id,
                     'id': uuid.uuid7(),
                     'name': instance.get('name'),
-                    'char_length': reduce(lambda x, y: x + y,
-                                          [len(p.get('content')) for p in instance.get('paragraphs', [])],
-                                          0),
+                    'char_length': reduce(
+                        lambda x, y: x + y,
+                        [len(p.get('content')) for p in instance.get('paragraphs', [])],
+                        0),
                     'meta': instance.get('meta') if instance.get('meta') is not None else {},
                     'type': instance.get('type') if instance.get('type') is not None else KnowledgeType.BASE
                 })
 
-            return DocumentSerializers.Create.get_paragraph_model(document_model,
-                                                                  instance.get('paragraphs') if
-                                                                  'paragraphs' in instance else [])
+            return DocumentSerializers.Create.get_paragraph_model(
+                document_model,
+                instance.get('paragraphs') if 'paragraphs' in instance else []
+            )