fix: 模型优先使用无需付费模型,并模型名称全局化

This commit is contained in:
HYY1116
2025-03-02 19:48:25 +08:00
parent b98314da4f
commit f48f33a999
8 changed files with 27 additions and 66 deletions

View File

@@ -3,7 +3,7 @@ import os
from typing import List, Dict
from .schedule_llm_module import LLMModel
from ...common.database import Database # 使用正确的导入语法
from ..chat.config import global_config
from src.plugins.chat.config import global_config
from nonebot import get_driver
driver = get_driver()
@@ -22,9 +22,9 @@ Database.initialize(
class ScheduleGenerator:
def __init__(self):
if global_config.API_USING == "siliconflow":
self.llm_scheduler = LLMModel(model_name="Pro/deepseek-ai/DeepSeek-V3")
self.llm_scheduler = LLMModel(model_name=global_config.SILICONFLOW_MODEL_V3)
elif global_config.API_USING == "deepseek":
self.llm_scheduler = LLMModel(model_name="deepseek-chat",api_using="deepseek")
self.llm_scheduler = LLMModel(model_name=global_config.DEEPSEEK_MODEL_V3)
self.db = Database.get_instance()
today = datetime.datetime.now()

View File

@@ -3,20 +3,17 @@ import requests
import aiohttp
from typing import Tuple, Union
from nonebot import get_driver
from src.plugins.chat.config import global_config
driver = get_driver()
config = driver.config
class LLMModel:
# def __init__(self, model_name="deepseek-ai/DeepSeek-R1-Distill-Qwen-32B", **kwargs):
def __init__(self, model_name="Pro/deepseek-ai/DeepSeek-R1",api_using=None, **kwargs):
def __init__(self, model_name=global_config.SILICONFLOW_MODEL_R1,api_using=None, **kwargs):
if api_using == "deepseek":
self.api_key = config.deep_seek_key
self.base_url = config.deep_seek_base_url
if model_name != "Pro/deepseek-ai/DeepSeek-R1":
self.model_name = model_name
else:
self.model_name = "deepseek-reasoner"
self.model_name = global_config.DEEPSEEK_MODEL_R1
else:
self.api_key = config.siliconflow_key
self.base_url = config.siliconflow_base_url