From 402c8aef5d745cdf661df69ed105886bf5913a46 Mon Sep 17 00:00:00 2001
From: wwq <wwq@example.com>
Date: Tue, 21 Apr 2026 17:04:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor(knowledge=5Fservice):=20=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=E6=A8=A1=E5=9E=8B=E7=BB=91=E5=AE=9A=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8C=BA=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除_get_model_by_id_or_fallback方法，直接使用工作区配置的模型ID
对于image2text模型，放宽类型限制并移除composite检查
---
 api/app/services/knowledge_service.py | 38 +++------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/api/app/services/knowledge_service.py b/api/app/services/knowledge_service.py
index 8937dd1e..7f141b76 100644
--- a/api/app/services/knowledge_service.py
+++ b/api/app/services/knowledge_service.py
@@ -76,51 +76,21 @@ def create_knowledge(
 
         tenant_id = workspace.tenant_id
 
-        def _get_model_by_id_or_fallback(model_id: str | None, model_types: list, label: str):
-            """优先按 workspace 绑定的 model_config id 查，找不到再 fallback 到 tenant 下最新创建的一个"""
-            if model_id:
-                model = db.query(ModelConfig).filter(
-                    ModelConfig.id == model_id,
-                    ModelConfig.tenant_id == tenant_id,
-                    ModelConfig.is_active == True,
-                    ModelConfig.is_composite == False
-                ).first()
-                if model:
-                    business_logger.debug(f"Auto-bind {label} model from workspace default: {model.id}")
-                    return model
-                business_logger.debug(f"Workspace default {label} model id '{model_id}' not found, falling back to tenant latest")
-            model = db.query(ModelConfig).filter(
-                ModelConfig.tenant_id == tenant_id,
-                ModelConfig.type.in_([t.value for t in model_types]),
-                ModelConfig.is_active == True,
-                ModelConfig.is_composite == False
-            ).order_by(ModelConfig.created_at.desc()).first()
-            if model:
-                business_logger.debug(f"Auto-bind {label} model from tenant fallback (latest): {model.id}")
-            return model
-
         if not knowledge.embedding_id:
-            model = _get_model_by_id_or_fallback(workspace.embedding, [ModelType.EMBEDDING], "embedding")
-            if model:
-                knowledge.embedding_id = model.id
+            knowledge.embedding_id = workspace.embedding
 
         if not knowledge.reranker_id:
-            model = _get_model_by_id_or_fallback(workspace.rerank, [ModelType.RERANK], "rerank")
-            if model:
-                knowledge.reranker_id = model.id
+            knowledge.reranker_id = workspace.rerank
 
         if not knowledge.llm_id:
-            model = _get_model_by_id_or_fallback(workspace.llm, [ModelType.LLM, ModelType.CHAT], "llm")
-            if model:
-                knowledge.llm_id = model.id
+            knowledge.llm_id = workspace.llm
 
         if not knowledge.image2text_id:
             model = db.query(ModelConfig).filter(
                 ModelConfig.tenant_id == tenant_id,
-                ModelConfig.type.in_([ModelType.CHAT.value]),
+                ModelConfig.type.in_([ModelType.CHAT.value, ModelType.LLM.value]),
                 ModelConfig.capability.contains(["vision"]),
                 ModelConfig.is_active == True,
-                ModelConfig.is_composite == False
             ).order_by(ModelConfig.created_at.desc()).first()
             if not model:
                 raise Exception("租户下没有可用的视觉模型，创建知识库失败")