AstrBot 4.5.1__py3-none-any.whl → 4.5.3__py3-none-any.whl

astrbot/core/provider/sources/gemini_source.py

@@ -3,7 +3,6 @@ import base64
 import json
 import logging
 import random
-from typing import Optional, List
 from collections.abc import AsyncGenerator
 
 from google import genai
@@ -32,7 +31,8 @@ logging.getLogger("google_genai.types").addFilter(SuppressNonTextPartsWarning())
 
 
 @register_provider_adapter(
-    "googlegenai_chat_completion", "Google Gemini Chat Completion 提供商适配器"
+    "googlegenai_chat_completion",
+    "Google Gemini Chat Completion 提供商适配器",
 )
 class ProviderGoogleGenAI(Provider):
     CATEGORY_MAPPING = {
@@ -60,11 +60,11 @@ class ProviderGoogleGenAI(Provider):
             provider_settings,
             default_persona,
         )
-        self.api_keys: List = super().get_keys()
+        self.api_keys: list = super().get_keys()
         self.chosen_api_key: str = self.api_keys[0] if len(self.api_keys) > 0 else ""
         self.timeout: int = int(provider_config.get("timeout", 180))
 
-        self.api_base: Optional[str] = provider_config.get("api_base", None)
+        self.api_base: str | None = provider_config.get("api_base", None)
         if self.api_base and self.api_base.endswith("/"):
             self.api_base = self.api_base[:-1]
 
@@ -87,7 +87,8 @@ class ProviderGoogleGenAI(Provider):
         user_safety_config = self.provider_config.get("gm_safety_settings", {})
         self.safety_settings = [
             types.SafetySetting(
-                category=harm_category, threshold=self.THRESHOLD_MAPPING[threshold_str]
+                category=harm_category,
+                threshold=self.THRESHOLD_MAPPING[threshold_str],
             )
             for config_key, harm_category in self.CATEGORY_MAPPING.items()
             if (threshold_str := user_safety_config.get(config_key))
@@ -104,27 +105,25 @@ class ProviderGoogleGenAI(Provider):
             if len(keys) > 0:
                 self.set_key(random.choice(keys))
                 logger.info(
-                    f"检测到 Key 异常({e.message})，正在尝试更换 API Key 重试... 当前 Key: {self.chosen_api_key[:12]}..."
+                    f"检测到 Key 异常({e.message})，正在尝试更换 API Key 重试... 当前 Key: {self.chosen_api_key[:12]}...",
                 )
                 await asyncio.sleep(1)
                 return True
-            else:
-                logger.error(
-                    f"检测到 Key 异常({e.message})，且已没有可用的 Key。 当前 Key: {self.chosen_api_key[:12]}..."
-                )
-                raise Exception("达到了 Gemini 速率限制, 请稍后再试...")
-        else:
             logger.error(
-                f"发生了错误(gemini_source)。Provider 配置如下: {self.provider_config}"
+                f"检测到 Key 异常({e.message})，且已没有可用的 Key。 当前 Key: {self.chosen_api_key[:12]}...",
             )
-            raise e
+            raise Exception("达到了 Gemini 速率限制, 请稍后再试...")
+        logger.error(
+            f"发生了错误(gemini_source)。Provider 配置如下: {self.provider_config}",
+        )
+        raise e
 
     async def _prepare_query_config(
         self,
         payloads: dict,
-        tools: Optional[ToolSet] = None,
-        system_instruction: Optional[str] = None,
-        modalities: Optional[list[str]] = None,
+        tools: ToolSet | None = None,
+        system_instruction: str | None = None,
+        modalities: list[str] | None = None,
         temperature: float = 0.7,
     ) -> types.GenerateContentConfig:
         """准备查询配置"""
@@ -152,7 +151,7 @@ class ProviderGoogleGenAI(Provider):
                     logger.warning("代码执行工具与搜索工具互斥，已忽略搜索工具")
                 if url_context:
                     logger.warning(
-                        "代码执行工具与URL上下文工具互斥，已忽略URL上下文工具"
+                        "代码执行工具与URL上下文工具互斥，已忽略URL上下文工具",
                     )
             else:
                 if native_search:
@@ -163,13 +162,13 @@ class ProviderGoogleGenAI(Provider):
                         tool_list.append(types.Tool(url_context=types.UrlContext()))
                     else:
                         logger.warning(
-                            "当前 SDK 版本不支持 URL 上下文工具，已忽略该设置，请升级 google-genai 包"
+                            "当前 SDK 版本不支持 URL 上下文工具，已忽略该设置，请升级 google-genai 包",
                         )
 
         elif "gemini-2.0-lite" in model_name:
             if native_coderunner or native_search or url_context:
                 logger.warning(
-                    "gemini-2.0-lite 不支持代码执行、搜索工具和URL上下文，将忽略这些设置"
+                    "gemini-2.0-lite 不支持代码执行、搜索工具和URL上下文，将忽略这些设置",
                 )
             tool_list = None
 
@@ -186,7 +185,7 @@ class ProviderGoogleGenAI(Provider):
                     tool_list.append(types.Tool(url_context=types.UrlContext()))
                 else:
                     logger.warning(
-                        "当前 SDK 版本不支持 URL 上下文工具，已忽略该设置，请升级 google-genai 包"
+                        "当前 SDK 版本不支持 URL 上下文工具，已忽略该设置，请升级 google-genai 包",
                     )
 
         if not tool_list:
@@ -196,7 +195,7 @@ class ProviderGoogleGenAI(Provider):
             logger.warning("已启用原生工具，函数工具将被忽略")
         elif tools and (func_desc := tools.get_func_desc_google_genai_style()):
             tool_list = [
-                types.Tool(function_declarations=func_desc["function_declarations"])
+                types.Tool(function_declarations=func_desc["function_declarations"]),
             ]
 
         return types.GenerateContentConfig(
@@ -223,8 +222,9 @@ class ProviderGoogleGenAI(Provider):
                     thinking_budget=min(
                         int(
                             self.provider_config.get("gm_thinking_config", {}).get(
-                                "budget", 0
-                            )
+                                "budget",
+                                0,
+                            ),
                         ),
                         24576,
                     ),
@@ -234,7 +234,7 @@ class ProviderGoogleGenAI(Provider):
                 else None
             ),
             automatic_function_calling=types.AutomaticFunctionCallingConfig(
-                disable=True
+                disable=True,
             ),
         )
 
@@ -268,7 +268,7 @@ class ProviderGoogleGenAI(Provider):
             [
                 self.provider_config.get("gm_native_coderunner", False),
                 self.provider_config.get("gm_native_search", False),
-            ]
+            ],
         )
         for message in payloads["messages"]:
             role, content = message["role"], message.get("content")
@@ -304,7 +304,7 @@ class ProviderGoogleGenAI(Provider):
                     logger.warning("assistant 角色的消息内容为空，已添加空格占位")
                     if native_tool_enabled and "tool_calls" in message:
                         logger.warning(
-                            "检测到启用Gemini原生工具，且上下文中存在函数调用，建议使用 /reset 重置上下文"
+                            "检测到启用Gemini原生工具，且上下文中存在函数调用，建议使用 /reset 重置上下文",
                         )
                     parts = [types.Part.from_text(text=" ")]
                     append_or_extend(gemini_contents, parts, types.ModelContent)
@@ -317,7 +317,7 @@ class ProviderGoogleGenAI(Provider):
                             "name": message["tool_call_id"],
                             "content": message["content"],
                         },
-                    )
+                    ),
                 ]
                 append_or_extend(gemini_contents, parts, types.UserContent)
 
@@ -328,7 +328,8 @@ class ProviderGoogleGenAI(Provider):
 
     @staticmethod
     def _process_content_parts(
-        candidate: types.Candidate, llm_response: LLMResponse
+        candidate: types.Candidate,
+        llm_response: LLMResponse,
     ) -> MessageChain:
         """处理内容部分并构建消息链"""
         if not candidate.content:
@@ -381,7 +382,7 @@ class ProviderGoogleGenAI(Provider):
                 llm_response.tools_call_args.append(part.function_call.args)
                 # gemini 返回的 function_call.id 可能为 None
                 llm_response.tools_call_ids.append(
-                    part.function_call.id or part.function_call.name
+                    part.function_call.id or part.function_call.name,
                 )
             elif (
                 part.inline_data
@@ -406,11 +407,15 @@ class ProviderGoogleGenAI(Provider):
         conversation = self._prepare_conversation(payloads)
         temperature = payloads.get("temperature", 0.7)
 
-        result: Optional[types.GenerateContentResponse] = None
+        result: types.GenerateContentResponse | None = None
         while True:
             try:
                 config = await self._prepare_query_config(
-                    payloads, tools, system_instruction, modalities, temperature
+                    payloads,
+                    tools,
+                    system_instruction,
+                    modalities,
+                    temperature,
                 )
                 result = await self.client.models.generate_content(
                     model=self.get_model(),
@@ -427,7 +432,7 @@ class ProviderGoogleGenAI(Provider):
                         raise Exception("温度参数已超过最大值2，仍然发生recitation")
                     temperature += 0.2
                     logger.warning(
-                        f"发生了recitation，正在提高温度至{temperature:.1f}重试..."
+                        f"发生了recitation，正在提高温度至{temperature:.1f}重试...",
                     )
                     continue
 
@@ -438,7 +443,7 @@ class ProviderGoogleGenAI(Provider):
                     e.message = ""
                 if "Developer instruction is not enabled" in e.message:
                     logger.warning(
-                        f"{self.get_model()} 不支持 system prompt，已自动去除(影响人格设置)"
+                        f"{self.get_model()} 不支持 system prompt，已自动去除(影响人格设置)",
                     )
                     system_instruction = None
                 elif "Function calling is not enabled" in e.message:
@@ -451,7 +456,7 @@ class ProviderGoogleGenAI(Provider):
                     or "only supports text output" in e.message
                 ):
                     logger.warning(
-                        f"{self.get_model()} 不支持多模态输出，降级为文本模态"
+                        f"{self.get_model()} 不支持多模态输出，降级为文本模态",
                     )
                     modalities = ["Text"]
                 else:
@@ -461,12 +466,15 @@ class ProviderGoogleGenAI(Provider):
         llm_response = LLMResponse("assistant")
         llm_response.raw_completion = result
         llm_response.result_chain = self._process_content_parts(
-            result.candidates[0], llm_response
+            result.candidates[0],
+            llm_response,
         )
         return llm_response
 
     async def _query_stream(
-        self, payloads: dict, tools: ToolSet | None
+        self,
+        payloads: dict,
+        tools: ToolSet | None,
     ) -> AsyncGenerator[LLMResponse, None]:
         """流式请求 Gemini API"""
         system_instruction = next(
@@ -480,7 +488,9 @@ class ProviderGoogleGenAI(Provider):
         while True:
             try:
                 config = await self._prepare_query_config(
-                    payloads, tools, system_instruction
+                    payloads,
+                    tools,
+                    system_instruction,
                 )
                 result = await self.client.models.generate_content_stream(
                     model=self.get_model(),
@@ -493,7 +503,7 @@ class ProviderGoogleGenAI(Provider):
                     e.message = ""
                 if "Developer instruction is not enabled" in e.message:
                     logger.warning(
-                        f"{self.get_model()} 不支持 system prompt，已自动去除(影响人格设置)"
+                        f"{self.get_model()} 不支持 system prompt，已自动去除(影响人格设置)",
                     )
                     system_instruction = None
                 elif "Function calling is not enabled" in e.message:
@@ -523,7 +533,8 @@ class ProviderGoogleGenAI(Provider):
                 llm_response = LLMResponse("assistant", is_chunk=False)
                 llm_response.raw_completion = chunk
                 llm_response.result_chain = self._process_content_parts(
-                    chunk.candidates[0], llm_response
+                    chunk.candidates[0],
+                    llm_response,
                 )
                 yield llm_response
                 return
@@ -539,7 +550,8 @@ class ProviderGoogleGenAI(Provider):
                     final_response = LLMResponse("assistant", is_chunk=False)
                     final_response.raw_completion = chunk
                     final_response.result_chain = self._process_content_parts(
-                        chunk.candidates[0], final_response
+                        chunk.candidates[0],
+                        final_response,
                     )
                 break
 
@@ -550,7 +562,7 @@ class ProviderGoogleGenAI(Provider):
         # Set the complete accumulated text in the final response
         if accumulated_text:
             final_response.result_chain = MessageChain(
-                chain=[Comp.Plain(accumulated_text)]
+                chain=[Comp.Plain(accumulated_text)],
             )
         elif not final_response.result_chain:
             # If no text was accumulated and no final response was set, provide empty space
@@ -560,7 +572,7 @@ class ProviderGoogleGenAI(Provider):
 
     async def text_chat(
         self,
-        prompt: str,
+        prompt=None,
         session_id=None,
         image_urls=None,
         func_tool=None,
@@ -572,8 +584,12 @@ class ProviderGoogleGenAI(Provider):
     ) -> LLMResponse:
         if contexts is None:
             contexts = []
-        new_record = await self.assemble_context(prompt, image_urls)
-        context_query = [*contexts, new_record]
+        new_record = None
+        if prompt is not None:
+            new_record = await self.assemble_context(prompt, image_urls)
+        context_query = self._ensure_message_to_dicts(contexts)
+        if new_record:
+            context_query.append(new_record)
         if system_prompt:
             context_query.insert(0, {"role": "system", "content": system_prompt})
 
@@ -609,7 +625,7 @@ class ProviderGoogleGenAI(Provider):
 
     async def text_chat_stream(
         self,
-        prompt,
+        prompt=None,
         session_id=None,
         image_urls=None,
         func_tool=None,
@@ -621,8 +637,12 @@ class ProviderGoogleGenAI(Provider):
     ) -> AsyncGenerator[LLMResponse, None]:
         if contexts is None:
             contexts = []
-        new_record = await self.assemble_context(prompt, image_urls)
-        context_query = [*contexts, new_record]
+        new_record = None
+        if prompt is not None:
+            new_record = await self.assemble_context(prompt, image_urls)
+        context_query = self._ensure_message_to_dicts(contexts)
+        if new_record:
+            context_query.append(new_record)
         if system_prompt:
             context_query.insert(0, {"role": "system", "content": system_prompt})
 
@@ -680,9 +700,7 @@ class ProviderGoogleGenAI(Provider):
         self._init_client()
 
     async def assemble_context(self, text: str, image_urls: list[str] | None = None):
-        """
-        组装上下文。
-        """
+        """组装上下文。"""
         if image_urls:
             user_content = {
                 "role": "user",
@@ -704,22 +722,18 @@ class ProviderGoogleGenAI(Provider):
                     {
                         "type": "image_url",
                         "image_url": {"url": image_data},
-                    }
+                    },
                 )
             return user_content
-        else:
-            return {"role": "user", "content": text}
+        return {"role": "user", "content": text}
 
     async def encode_image_bs64(self, image_url: str) -> str:
-        """
-        将图片转换为 base64
-        """
+        """将图片转换为 base64"""
         if image_url.startswith("base64://"):
             return image_url.replace("base64://", "data:image/jpeg;base64,")
         with open(image_url, "rb") as f:
             image_bs64 = base64.b64encode(f.read()).decode("utf-8")
             return "data:image/jpeg;base64," + image_bs64
-        return ""
 
     async def terminate(self):
         logger.info("Google GenAI 适配器已终止。")

astrbot/core/provider/sources/gemini_tts_source.py

@@ -13,7 +13,9 @@ from ..register import register_provider_adapter
 
 
 @register_provider_adapter(
-    "gemini_tts", "Gemini TTS API", provider_type=ProviderType.TEXT_TO_SPEECH
+    "gemini_tts",
+    "Gemini TTS API",
+    provider_type=ProviderType.TEXT_TO_SPEECH,
 )
 class ProviderGeminiTTSAPI(TTSProvider):
     def __init__(
@@ -28,13 +30,13 @@ class ProviderGeminiTTSAPI(TTSProvider):
         http_options = types.HttpOptions(timeout=timeout * 1000)
 
         if api_base:
-            if api_base.endswith("/"):
-                api_base = api_base[:-1]
+            api_base = api_base.removesuffix("/")
             http_options.base_url = api_base
 
         self.client = genai.Client(api_key=api_key, http_options=http_options).aio
         self.model: str = provider_config.get(
-            "gemini_tts_model", "gemini-2.5-flash-preview-tts"
+            "gemini_tts_model",
+            "gemini-2.5-flash-preview-tts",
         )
         self.prefix: str | None = provider_config.get(
             "gemini_tts_prefix",
@@ -54,8 +56,8 @@ class ProviderGeminiTTSAPI(TTSProvider):
                     voice_config=types.VoiceConfig(
                         prebuilt_voice_config=types.PrebuiltVoiceConfig(
                             voice_name=self.voice_name,
-                        )
-                    )
+                        ),
+                    ),
                 ),
             ),
         )

astrbot/core/provider/sources/gsv_selfhosted_source.py

@@ -3,12 +3,14 @@ import os
 import uuid
 
 import aiohttp
-from ..provider import TTSProvider
-from ..entities import ProviderType
-from ..register import register_provider_adapter
+
 from astrbot import logger
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
+from ..entities import ProviderType
+from ..provider import TTSProvider
+from ..register import register_provider_adapter
+
 
 @register_provider_adapter(
     provider_type_name="gsv_tts_selfhost",
@@ -24,7 +26,7 @@ class ProviderGSVTTS(TTSProvider):
         super().__init__(provider_config, provider_settings)
 
         self.api_base = provider_config.get("api_base", "http://127.0.0.1:9880").rstrip(
-            "/"
+            "/",
         )
         self.gpt_weights_path: str = provider_config.get("gpt_weights_path", "")
         self.sovits_weights_path: str = provider_config.get("sovits_weights_path", "")
@@ -40,7 +42,7 @@ class ProviderGSVTTS(TTSProvider):
     async def initialize(self):
         """异步初始化：在 ProviderManager 中被调用"""
         self._session = aiohttp.ClientSession(
-            timeout=aiohttp.ClientTimeout(total=self.timeout)
+            timeout=aiohttp.ClientTimeout(total=self.timeout),
         )
         try:
             await self._set_model_weights()
@@ -52,12 +54,15 @@ class ProviderGSVTTS(TTSProvider):
     def get_session(self) -> aiohttp.ClientSession:
         if not self._session or self._session.closed:
             raise RuntimeError(
-                "[GSV TTS] Provider HTTP session is not ready or closed."
+                "[GSV TTS] Provider HTTP session is not ready or closed.",
             )
         return self._session
 
     async def _make_request(
-        self, endpoint: str, params=None, retries: int = 3
+        self,
+        endpoint: str,
+        params=None,
+        retries: int = 3,
     ) -> bytes | None:
         """发起请求"""
         for attempt in range(retries):
@@ -67,13 +72,13 @@ class ProviderGSVTTS(TTSProvider):
                     if response.status != 200:
                         error_text = await response.text()
                         raise Exception(
-                            f"[GSV TTS] Request to {endpoint} failed with status {response.status}: {error_text}"
+                            f"[GSV TTS] Request to {endpoint} failed with status {response.status}: {error_text}",
                         )
                     return await response.read()
             except Exception as e:
                 if attempt < retries - 1:
                     logger.warning(
-                        f"[GSV TTS] 请求 {endpoint} 第 {attempt + 1} 次失败：{e}，重试中..."
+                        f"[GSV TTS] 请求 {endpoint} 第 {attempt + 1} 次失败：{e}，重试中...",
                     )
                     await asyncio.sleep(1)
                 else:
@@ -98,7 +103,7 @@ class ProviderGSVTTS(TTSProvider):
                     {"weights_path": self.sovits_weights_path},
                 )
                 logger.info(
-                    f"[GSV TTS] 成功设置 SoVITS 模型路径：{self.sovits_weights_path}"
+                    f"[GSV TTS] 成功设置 SoVITS 模型路径：{self.sovits_weights_path}",
                 )
             else:
                 logger.info("[GSV TTS] SoVITS 模型路径未配置，将使用内置 SoVITS 模型")
@@ -127,12 +132,10 @@ class ProviderGSVTTS(TTSProvider):
             with open(path, "wb") as f:
                 f.write(result)
             return path
-        else:
-            raise Exception(f"[GSV TTS] 合成失败，输入文本：{text}，错误信息：{result}")
+        raise Exception(f"[GSV TTS] 合成失败，输入文本：{text}，错误信息：{result}")
 
     def build_synthesis_params(self, text: str) -> dict:
-        """
-        构建语音合成所需的参数字典。
+        """构建语音合成所需的参数字典。
 
         当前仅包含默认参数 + 文本，未来可在此基础上动态添加如情绪、角色等语义控制字段。
         """

astrbot/core/provider/sources/gsvi_tts_source.py

@@ -1,15 +1,20 @@
 import os
+import urllib.parse
 import uuid
+
 import aiohttp
-import urllib.parse
-from ..provider import TTSProvider
+
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+
 from ..entities import ProviderType
+from ..provider import TTSProvider
 from ..register import register_provider_adapter
-from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
 
 @register_provider_adapter(
-    "gsvi_tts_api", "GSVI TTS API", provider_type=ProviderType.TEXT_TO_SPEECH
+    "gsvi_tts_api",
+    "GSVI TTS API",
+    provider_type=ProviderType.TEXT_TO_SPEECH,
 )
 class ProviderGSVITTS(TTSProvider):
     def __init__(
@@ -19,8 +24,7 @@ class ProviderGSVITTS(TTSProvider):
     ) -> None:
         super().__init__(provider_config, provider_settings)
         self.api_base = provider_config.get("api_base", "http://127.0.0.1:5000")
-        if self.api_base.endswith("/"):
-            self.api_base = self.api_base[:-1]
+        self.api_base = self.api_base.removesuffix("/")
         self.character = provider_config.get("character")
         self.emotion = provider_config.get("emotion")
 
@@ -49,7 +53,7 @@ class ProviderGSVITTS(TTSProvider):
                 else:
                     error_text = await response.text()
                     raise Exception(
-                        f"GSVI TTS API 请求失败，状态码: {response.status}，错误: {error_text}"
+                        f"GSVI TTS API 请求失败，状态码: {response.status}，错误: {error_text}",
                     )
 
         return path