From 5c0ab21f685dfc3d35c0d00688dd877685dad64c Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Wed, 5 Feb 2025 17:05:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20/model=20=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- astrbot/core/provider/sources/gemini_source.py | 5 ++++- astrbot/core/provider/sources/openai_source.py | 6 +++++- astrbot/core/provider/sources/zhipu_source.py | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/astrbot/core/provider/sources/gemini_source.py b/astrbot/core/provider/sources/gemini_source.py index 98ea32f97..3de22a4fc 100644 --- a/astrbot/core/provider/sources/gemini_source.py +++ b/astrbot/core/provider/sources/gemini_source.py @@ -166,10 +166,13 @@ class ProviderGoogleGenAI(Provider): for part in context_query: if '_no_save' in part: del part['_no_save'] + + model_config = self.provider_config.get("model_config", {}) + model_config['model'] = self.get_model() payloads = { "messages": context_query, - **self.provider_config.get("model_config", {}) + **model_config } llm_response = None try: diff --git a/astrbot/core/provider/sources/openai_source.py b/astrbot/core/provider/sources/openai_source.py index 6cb403b84..fd940c987 100644 --- a/astrbot/core/provider/sources/openai_source.py +++ b/astrbot/core/provider/sources/openai_source.py @@ -116,10 +116,14 @@ class ProviderOpenAIOfficial(Provider): for part in context_query: if '_no_save' in part: del part['_no_save'] + + + model_config = self.provider_config.get("model_config", {}) + model_config['model'] = self.get_model() payloads = { "messages": context_query, - **self.provider_config.get("model_config", {}) + **model_config } llm_response = None try: diff --git a/astrbot/core/provider/sources/zhipu_source.py b/astrbot/core/provider/sources/zhipu_source.py index 21820bbce..1e1f67802 100644 --- a/astrbot/core/provider/sources/zhipu_source.py +++ b/astrbot/core/provider/sources/zhipu_source.py @@ -35,8 +35,8 @@ class ProviderZhipu(ProviderOpenAIOfficial): context_query = [*contexts, new_record] model_cfgs: dict = self.provider_config.get("model_config", {}) + model = self.get_model() # glm-4v-flash 只支持一张图片 - model: str = model_cfgs.get("model", "") if model.lower() == 'glm-4v-flash' and image_urls and len(context_query) > 1: logger.debug("glm-4v-flash 只支持一张图片,将只保留最后一张图片") logger.debug(context_query)