From 5825b767563361fadb0af9b2f147a86dcfb8adfc Mon Sep 17 00:00:00 2001 From: Taku <163737696+xinsenyan@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:09:21 +0800 Subject: [PATCH 1/3] Update __init__.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 防止解析时不显示日志 --- management/server/services/knowledgebases/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/management/server/services/knowledgebases/__init__.py b/management/server/services/knowledgebases/__init__.py index eea436a..9facd1d 100644 --- a/management/server/services/knowledgebases/__init__.py +++ b/management/server/services/knowledgebases/__init__.py @@ -1,3 +1,4 @@ import logging logger = logging.getLogger(__name__) +logger.setLevel(logging.INFO) From 84a16792d786f0b9745021b72243a6e3600485b4 Mon Sep 17 00:00:00 2001 From: Taku <163737696+xinsenyan@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:12:49 +0800 Subject: [PATCH 2/3] Update document_parser.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除没用到的数据库连接 --- .../server/services/knowledgebases/document_parser.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/management/server/services/knowledgebases/document_parser.py b/management/server/services/knowledgebases/document_parser.py index 78ae958..901d10f 100644 --- a/management/server/services/knowledgebases/document_parser.py +++ b/management/server/services/knowledgebases/document_parser.py @@ -484,11 +484,8 @@ def perform_parse(doc_id, doc_info, file_info, embedding_config, kb_info): # 4. 更新文本块的图像信息 if image_info_list and chunk_ids_list: - conn = None - cursor = None + try: - conn = get_db_connection() - cursor = conn.cursor() # 为每个文本块找到最近的图片 for i, chunk_id in enumerate(chunk_ids_list): @@ -516,11 +513,7 @@ def perform_parse(doc_id, doc_info, file_info, embedding_config, kb_info): except Exception as e: logger.error(f"[Parser-ERROR] 更新文本块图片关联失败: {e}") raise Exception(f"[Parser-ERROR] 更新文本块图片关联失败: {e}") - finally: - if cursor: - cursor.close() - if conn: - conn.close() + # 5. 更新最终状态 process_duration = time.time() - start_time From eaa4ad1aa223be293b211382fc9e34a32d1c01e7 Mon Sep 17 00:00:00 2001 From: Taku <163737696+xinsenyan@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:16:08 +0800 Subject: [PATCH 3/3] Update service.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 优化删除文档的数据库查询语句 --- management/server/services/knowledgebases/service.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/management/server/services/knowledgebases/service.py b/management/server/services/knowledgebases/service.py index 6725980..cc2f0a8 100644 --- a/management/server/services/knowledgebases/service.py +++ b/management/server/services/knowledgebases/service.py @@ -711,12 +711,19 @@ class KnowledgebaseService: cursor = conn.cursor(dictionary=True) # 先检查文档是否存在 + # check_query = """ + # SELECT + # d.kb_id, + # kb.created_by AS tenant_id -- 获取 tenant_id (knowledgebase的创建者) + # FROM document d + # JOIN knowledgebase kb ON d.kb_id = kb.id -- JOIN knowledgebase 表 + # WHERE d.id = %s + # """ check_query = """ SELECT d.kb_id, - kb.created_by AS tenant_id -- 获取 tenant_id (knowledgebase的创建者) + d.created_by AS tenant_id FROM document d - JOIN knowledgebase kb ON d.kb_id = kb.id -- JOIN knowledgebase 表 WHERE d.id = %s """ cursor.execute(check_query, (doc_id,))