gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 兼容新旧格式的模型名称获取，保留provider兼容性

Browse Source
This commit is contained in:
墨梓柒
2025-07-25 16:44:55 +08:00
parent 97def0e931
commit 2335ec6577
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/chat/replyer/default_generator.py
View File

@@ -213,8 +213,10 @@ class DefaultReplyer:
with Timer("LLM生成", {}): # 内部计时器，可选保留
# 加权随机选择一个模型配置
selected_model_config = self._select_weighted_model_config()
# 兼容新旧格式的模型名称获取
model_display_name = selected_model_config.get('model_name', selected_model_config.get('name', 'N/A'))
logger.info(
f"使用模型生成回复: {selected_model_config.get('name', 'N/A')} (选中概率: {selected_model_config.get('weight', 1.0)})"
f"使用模型生成回复: {model_display_name} (选中概率: {selected_model_config.get('weight', 1.0)})"
)
express_model = LLMRequest(
@@ -277,8 +279,10 @@ class DefaultReplyer:
with Timer("LLM生成", {}): # 内部计时器，可选保留
# 加权随机选择一个模型配置
selected_model_config = self._select_weighted_model_config()
# 兼容新旧格式的模型名称获取
model_display_name = selected_model_config.get('model_name', selected_model_config.get('name', 'N/A'))
logger.info(
f"使用模型重写回复: {selected_model_config.get('name', 'N/A')} (选中概率: {selected_model_config.get('weight', 1.0)})"
f"使用模型重写回复: {model_display_name} (选中概率: {selected_model_config.get('weight', 1.0)})"
)
express_model = LLMRequest(

3
src/llm_models/utils_model.py
View File

@@ -126,7 +126,8 @@ class LLMRequest:
# 兼容新旧模型配置格式
# 新格式使用 model_name，旧格式使用 name
self.model_name: str = model.get("model_name", model.get("name", ""))
self.provider = model.get("provider", "")
# 在新架构中，provider信息从model_config.toml自动获取，不需要在这里设置
self.provider = model.get("provider", "") # 保留兼容性，但在新架构中不使用
# 从全局配置中获取任务配置
self.request_type = kwargs.pop("request_type", "default")