From ac4bf303f43d5eb6a1065f728b0a9ed4ce7ce7fb Mon Sep 17 00:00:00 2001 From: CaptainB Date: Wed, 2 Jul 2025 14:27:03 +0800 Subject: [PATCH] refactor: update SQL queries to include embedding_model_id and adjust filters for knowledge_id --- apps/knowledge/serializers/knowledge.py | 4 ++-- apps/knowledge/sql/list_knowledge_user.sql | 7 ++++--- apps/knowledge/sql/list_knowledge_user_ee.sql | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/knowledge/serializers/knowledge.py b/apps/knowledge/serializers/knowledge.py index 4d87c0636..364de5c16 100644 --- a/apps/knowledge/serializers/knowledge.py +++ b/apps/knowledge/serializers/knowledge.py @@ -308,8 +308,8 @@ class KnowledgeSerializer(serializers.Serializer): model=get_dynamics_model({'temp.id': models.CharField()}) ).filter(**{'temp.id': self.data.get("knowledge_id")}), 'knowledge_custom_sql': QuerySet( - model=get_dynamics_model({'knowledge.user_id': models.CharField()}) - ).filter(**{'knowledge.user_id': self.data.get("user_id")}), + model=get_dynamics_model({'knowledge.id': models.CharField()}) + ).filter(**{'knowledge.id': self.data.get("knowledge_id")}), 'folder_query_set': QuerySet(KnowledgeFolder) } if not workspace_manage: diff --git a/apps/knowledge/sql/list_knowledge_user.sql b/apps/knowledge/sql/list_knowledge_user.sql index cb786d8fd..15418fad7 100644 --- a/apps/knowledge/sql/list_knowledge_user.sql +++ b/apps/knowledge/sql/list_knowledge_user.sql @@ -12,6 +12,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 @@ -21,9 +22,8 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name, FROM (SELECT knowledge.* FROM knowledge knowledge ${knowledge_custom_sql} AND id in (select target - from workspace_user_resource_permission - ${workspace_user_resource_permission_query_set} - and 'VIEW' = any (permission_list))) temp_knowledge + from workspace_user_resource_permission ${workspace_user_resource_permission_query_set} + and 'VIEW' = any (permission_list))) temp_knowledge LEFT JOIN (SELECT "count"("id") AS document_count, "sum"("char_length") "char_length", knowledge_id FROM "document" GROUP BY knowledge_id) "document_temp" ON temp_knowledge."id" = "document_temp".knowledge_id @@ -47,6 +47,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 diff --git a/apps/knowledge/sql/list_knowledge_user_ee.sql b/apps/knowledge/sql/list_knowledge_user_ee.sql index 0386c38c3..d8cb5eb65 100644 --- a/apps/knowledge/sql/list_knowledge_user_ee.sql +++ b/apps/knowledge/sql/list_knowledge_user_ee.sql @@ -12,6 +12,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 @@ -60,6 +61,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