zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: improve code formatting and enhance folder_id handling in knowledge serializers

Browse Source
This commit is contained in:
CaptainB 2025-06-06 18:54:59 +08:00
parent c3c6a551ae
commit 7abd9dfb71
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/knowledge/serializers/knowledge.py
View File

@ -341,8 +341,10 @@ class KnowledgeSerializer(serializers.Serializer):
if with_valid: if with_valid:
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)
document_list = QuerySet(Document).filter(knowledge_id=self.data.get('id')) document_list = QuerySet(Document).filter(knowledge_id=self.data.get('id'))
paragraph_list = native_search(QuerySet(Paragraph).filter(knowledge_id=self.data.get("id")), get_file_content( paragraph_list = native_search(QuerySet(Paragraph).filter(knowledge_id=self.data.get("id")),
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_paragraph_document_name.sql'))) get_file_content(
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql',
'list_paragraph_document_name.sql')))
problem_mapping_list = native_search( problem_mapping_list = native_search(
QuerySet(ProblemParagraphMapping).filter(knowledge_id=self.data.get("id")), get_file_content( QuerySet(ProblemParagraphMapping).filter(knowledge_id=self.data.get("id")), get_file_content(
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_problem_mapping.sql')), os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_problem_mapping.sql')),
@ -359,8 +361,10 @@ class KnowledgeSerializer(serializers.Serializer):
if with_valid: if with_valid:
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)
document_list = QuerySet(Document).filter(knowledge_id=self.data.get('id')) document_list = QuerySet(Document).filter(knowledge_id=self.data.get('id'))
paragraph_list = native_search(QuerySet(Paragraph).filter(knowledge_id=self.data.get("id")), get_file_content( paragraph_list = native_search(QuerySet(Paragraph).filter(knowledge_id=self.data.get("id")),
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_paragraph_document_name.sql'))) get_file_content(
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql',
'list_paragraph_document_name.sql')))
problem_mapping_list = native_search( problem_mapping_list = native_search(
QuerySet(ProblemParagraphMapping).filter(knowledge_id=self.data.get("id")), get_file_content( QuerySet(ProblemParagraphMapping).filter(knowledge_id=self.data.get("id")), get_file_content(
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_problem_mapping.sql')), os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_problem_mapping.sql')),
@ -411,7 +415,8 @@ class KnowledgeSerializer(serializers.Serializer):
class Create(serializers.Serializer): class Create(serializers.Serializer):
user_id = serializers.UUIDField(required=True, label=_('user id')) user_id = serializers.UUIDField(required=True, label=_('user id'))
workspace_id = serializers.CharField(required=True, label=_('workspace id')) workspace_id = serializers.CharField(required=True, label=_('workspace id'))
scope = serializers.ChoiceField(required=False, label=_('scope'), default=KnowledgeScope.WORKSPACE, choices=KnowledgeScope.choices) scope = serializers.ChoiceField(required=False, label=_('scope'), default=KnowledgeScope.WORKSPACE,
choices=KnowledgeScope.choices)
@staticmethod @staticmethod
def post_embedding_knowledge(document_list, knowledge_id): def post_embedding_knowledge(document_list, knowledge_id):
@ -428,7 +433,9 @@ class KnowledgeSerializer(serializers.Serializer):
if with_valid: if with_valid:
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)
KnowledgeBaseCreateRequest(data=instance).is_valid(raise_exception=True) KnowledgeBaseCreateRequest(data=instance).is_valid(raise_exception=True)
folder_id = instance.get('folder_id', 'root')
if QuerySet(Knowledge).filter(workspace_id=self.data.get('workspace_id'), if QuerySet(Knowledge).filter(workspace_id=self.data.get('workspace_id'),
folder_id=folder_id,
name=instance.get('name')).exists(): name=instance.get('name')).exists():
raise AppApiException(500, _('Knowledge base name duplicate!')) raise AppApiException(500, _('Knowledge base name duplicate!'))
@ -441,7 +448,7 @@ class KnowledgeSerializer(serializers.Serializer):
type=instance.get('type', KnowledgeType.BASE), type=instance.get('type', KnowledgeType.BASE),
user_id=self.data.get('user_id'), user_id=self.data.get('user_id'),
scope=self.data.get('scope', KnowledgeScope.WORKSPACE), scope=self.data.get('scope', KnowledgeScope.WORKSPACE),
folder_id=instance.get('folder_id', 'root'), folder_id=folder_id,
embedding_model_id=instance.get('embedding'), embedding_model_id=instance.get('embedding'),
meta=instance.get('meta', {}), meta=instance.get('meta', {}),
) )
@ -488,7 +495,9 @@ class KnowledgeSerializer(serializers.Serializer):
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)
KnowledgeWebCreateRequest(data=instance).is_valid(raise_exception=True) KnowledgeWebCreateRequest(data=instance).is_valid(raise_exception=True)
folder_id = instance.get('folder_id', 'root')
if QuerySet(Knowledge).filter(workspace_id=self.data.get('workspace_id'), if QuerySet(Knowledge).filter(workspace_id=self.data.get('workspace_id'),
folder_id=folder_id,
name=instance.get('name')).exists(): name=instance.get('name')).exists():
raise AppApiException(500, _('Knowledge base name duplicate!')) raise AppApiException(500, _('Knowledge base name duplicate!'))
@ -500,7 +509,7 @@ class KnowledgeSerializer(serializers.Serializer):
user_id=self.data.get('user_id'), user_id=self.data.get('user_id'),
type=instance.get('type', KnowledgeType.WEB), type=instance.get('type', KnowledgeType.WEB),
scope=self.data.get('scope', KnowledgeScope.WORKSPACE), scope=self.data.get('scope', KnowledgeScope.WORKSPACE),
folder_id=instance.get('folder_id', 'root'), folder_id=folder_id,
embedding_model_id=instance.get('embedding'), embedding_model_id=instance.get('embedding'),
meta={ meta={
'source_url': instance.get('source_url'), 'source_url': instance.get('source_url'),