From fbbff427dcaa970d75ab044a1742c5a3a877c156 Mon Sep 17 00:00:00 2001 From: yawiii <77927734@qq.com> Date: Wed, 22 Apr 2026 15:41:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Ollama=20=E8=B0=83?= =?UTF-8?q?=E7=94=A8=20qwen=E7=B3=BB=E5=88=97=E6=A8=A1=E5=9E=8B=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/llm.py | 4 ++-- services/vlm.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/llm.py b/services/llm.py index cb8bfdb..77b0d7c 100644 --- a/services/llm.py +++ b/services/llm.py @@ -369,7 +369,7 @@ class LLMService(OpenAICompatibleService): disable_thinking_enabled = service.get('disable_thinking', True) if service else True # 始终调用 build_thinking_suppression，传递 disable_thinking 参数 - _thinking_extra = build_thinking_suppression(provider, model, disable_thinking=disable_thinking_enabled) + _thinking_extra = build_thinking_suppression(service.get('type', provider) if service else provider, model, disable_thinking=disable_thinking_enabled) thinking_disabled = _thinking_extra is not None and disable_thinking_enabled model_display = format_model_with_thinking(model, thinking_disabled) @@ -612,7 +612,7 @@ class LLMService(OpenAICompatibleService): disable_thinking_enabled = service.get('disable_thinking', True) enable_advanced_params = service.get('enable_advanced_params', False) filter_thinking_output = service.get('filter_thinking_output', True) - _ollama_thinking_extra = build_thinking_suppression(provider, model) if disable_thinking_enabled else None + _ollama_thinking_extra = build_thinking_suppression(service.get('type', provider) if service else provider, model) if disable_thinking_enabled else None # 统一计算 native_base (确保移除 /v1 和末尾斜杠) native_base = base_url.rstrip('/') diff --git a/services/vlm.py b/services/vlm.py index 454b662..c56c8fe 100644 --- a/services/vlm.py +++ b/services/vlm.py @@ -364,7 +364,7 @@ class VisionService(OpenAICompatibleService): # 读取 Ollama 服务的配置 enable_advanced_params = service.get('enable_advanced_params', False) filter_thinking_output = service.get('filter_thinking_output', True) - _ollama_thinking_extra = build_thinking_suppression(provider, model) if disable_thinking_enabled else None + _ollama_thinking_extra = build_thinking_suppression(service.get('type', provider), model) if disable_thinking_enabled else None # 提取纯base64 b64 = processed_image.split(',')[1] if ',' in processed_image else processed_image @@ -566,7 +566,7 @@ class VisionService(OpenAICompatibleService): disable_thinking_enabled = service.get('disable_thinking', True) enable_advanced_params = service.get('enable_advanced_params', False) filter_thinking_output = service.get('filter_thinking_output', True) - _ollama_thinking_extra = build_thinking_suppression(provider, model) if disable_thinking_enabled else None + _ollama_thinking_extra = build_thinking_suppression(service.get('type', provider), model) if disable_thinking_enabled else None # 提前计算auto_unload配置 native_base = base_url[:-3] if base_url.endswith('/v1') else (base_url or 'http://localhost:11434')