Merge pull request #190 from xinsenyan/main

优化逻辑与去除冗余代码

management/server/services/knowledgebases/__init__.py

@@ -1,3 +1,4 @@
 import logging
 
 logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)

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

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,))