mirror of https://github.com/Mai-with-u/MaiBot.git
修复typing
parent
fad8b82d8b
commit
294b451c96
|
|
@ -1,7 +1,7 @@
|
||||||
import asyncio
|
import asyncio
|
||||||
import io
|
import io
|
||||||
import base64
|
import base64
|
||||||
from typing import Callable, AsyncIterator, Optional, Coroutine, Any, List
|
from typing import Callable, AsyncIterator, Optional, Coroutine, Any, List, Dict
|
||||||
|
|
||||||
from google import genai
|
from google import genai
|
||||||
from google.genai.types import (
|
from google.genai.types import (
|
||||||
|
|
@ -346,14 +346,14 @@ class GeminiClient(BaseClient):
|
||||||
|
|
||||||
def __init__(self, api_provider: APIProvider):
|
def __init__(self, api_provider: APIProvider):
|
||||||
super().__init__(api_provider)
|
super().__init__(api_provider)
|
||||||
|
|
||||||
# 增加传入参数处理
|
# 增加传入参数处理
|
||||||
http_options_kwargs = {"timeout": api_provider.timeout}
|
http_options_kwargs: Dict[str, Any] = {}
|
||||||
|
|
||||||
# 秒转换为毫秒传入
|
# 秒转换为毫秒传入
|
||||||
if api_provider.timeout is not None:
|
if api_provider.timeout is not None:
|
||||||
http_options_kwargs["timeout"] = int(api_provider.timeout * 1000)
|
http_options_kwargs["timeout"] = int(api_provider.timeout * 1000)
|
||||||
|
|
||||||
# 传入并处理地址和版本(必须为Gemini格式)
|
# 传入并处理地址和版本(必须为Gemini格式)
|
||||||
if api_provider.base_url:
|
if api_provider.base_url:
|
||||||
parts = api_provider.base_url.rstrip("/").rsplit("/", 1)
|
parts = api_provider.base_url.rstrip("/").rsplit("/", 1)
|
||||||
|
|
@ -463,7 +463,9 @@ class GeminiClient(BaseClient):
|
||||||
try:
|
try:
|
||||||
tb = int(extra_params["thinking_budget"])
|
tb = int(extra_params["thinking_budget"])
|
||||||
except (ValueError, TypeError):
|
except (ValueError, TypeError):
|
||||||
logger.warning(f"无效的 thinking_budget 值 {extra_params['thinking_budget']},将使用模型自动预算模式 {tb}")
|
logger.warning(
|
||||||
|
f"无效的 thinking_budget 值 {extra_params['thinking_budget']},将使用模型自动预算模式 {tb}"
|
||||||
|
)
|
||||||
# 裁剪到模型支持的范围
|
# 裁剪到模型支持的范围
|
||||||
tb = self.clamp_thinking_budget(tb, model_info.model_identifier)
|
tb = self.clamp_thinking_budget(tb, model_info.model_identifier)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue