From 8a3989aa5e9ad2cfa0a956bb2cf298cf22e01e1a Mon Sep 17 00:00:00 2001 From: zxstty Date: Fri, 21 Nov 2025 10:11:05 +0800 Subject: [PATCH] =?UTF-8?q?conv=E6=96=B0=E5=BB=BA=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=81=8F=E5=A5=BD=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/services/conversation.py | 8 +++++++- apps/services/llm.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/services/conversation.py b/apps/services/conversation.py index f2b2551ad..9068badfc 100644 --- a/apps/services/conversation.py +++ b/apps/services/conversation.py @@ -12,6 +12,7 @@ from apps.schemas.collection import Conversation, KnowledgeBaseItem, LLMItem from apps.services.knowledge import KnowledgeBaseManager from apps.services.llm import LLMManager from apps.services.task import TaskManager +from apps.services.user import UserManager from apps.templates.generate_llm_operator_config import llm_provider_dict from apps.llm.adapters import get_provider_from_endpoint from apps.llm.enum import DefaultModelId @@ -48,7 +49,12 @@ class ConversationManager: """通过用户ID新建对话""" if not llm_id: # 获取系统默认模型的UUID - llm = await LLMManager.get_llm_by_id(DefaultModelId.DEFAULT_CHAT_MODEL_ID.value) + user_info = await UserManager.get_userinfo_by_user_sub(user_sub) + llm = None + if user_info.preferences.reasoning_model_preference: + llm = await LLMManager.get_llm_by_id(user_info.preferences.reasoning_model_preference.llm_id) + if llm is None: + llm = await LLMManager.get_llm_by_id(DefaultModelId.DEFAULT_CHAT_MODEL_ID.value) llm_item = LLMItem( llm_id=llm.id, model_name=llm.model_name, diff --git a/apps/services/llm.py b/apps/services/llm.py index babbb4e7b..2a1fbcba3 100644 --- a/apps/services/llm.py +++ b/apps/services/llm.py @@ -155,7 +155,7 @@ class LLMManager: if not result: err = f"[LLMManager] LLM {llm_id} 不存在" logger.error(err) - raise ValueError(err) + return None return LLM.model_validate(result) -- Gitee