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

astrbot/core/provider/sources/dashscope_tts.py

@@ -3,7 +3,7 @@ import base64
 import logging
 import os
 import uuid
-from typing import Optional, Tuple
+
 import aiohttp
 import dashscope
 from dashscope.audio.tts_v2 import AudioFormat, SpeechSynthesizer
@@ -15,14 +15,17 @@ except (
 ):  # pragma: no cover - older dashscope versions without Qwen TTS support
     MultiModalConversation = None
 
+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(
-    "dashscope_tts", "Dashscope TTS API", provider_type=ProviderType.TEXT_TO_SPEECH
+    "dashscope_tts",
+    "Dashscope TTS API",
+    provider_type=ProviderType.TEXT_TO_SPEECH,
 )
 class ProviderDashscopeTTSAPI(TTSProvider):
     def __init__(
@@ -33,7 +36,7 @@ class ProviderDashscopeTTSAPI(TTSProvider):
         super().__init__(provider_config, provider_settings)
         self.chosen_api_key: str = provider_config.get("api_key", "")
         self.voice: str = provider_config.get("dashscope_tts_voice", "loongstella")
-        self.set_model(provider_config.get("model", None))
+        self.set_model(provider_config.get("model"))
         self.timeout_ms = float(provider_config.get("timeout", 20)) * 1000
         dashscope.api_key = self.chosen_api_key
 
@@ -52,7 +55,7 @@ class ProviderDashscopeTTSAPI(TTSProvider):
 
         if not audio_bytes:
             raise RuntimeError(
-                "Audio synthesis failed, returned empty content. The model may not be supported or the service is unavailable."
+                "Audio synthesis failed, returned empty content. The model may not be supported or the service is unavailable.",
             )
 
         path = os.path.join(temp_dir, f"dashscope_tts_{uuid.uuid4()}{ext}")
@@ -63,7 +66,7 @@ class ProviderDashscopeTTSAPI(TTSProvider):
     def _call_qwen_tts(self, model: str, text: str):
         if MultiModalConversation is None:
             raise RuntimeError(
-                "dashscope SDK missing MultiModalConversation. Please upgrade the dashscope package to use Qwen TTS models."
+                "dashscope SDK missing MultiModalConversation. Please upgrade the dashscope package to use Qwen TTS models.",
             )
 
         kwargs = {
@@ -74,24 +77,26 @@ class ProviderDashscopeTTSAPI(TTSProvider):
         }
         if not self.voice:
             logging.warning(
-                "No voice specified for Qwen TTS model, using default 'Cherry'."
+                "No voice specified for Qwen TTS model, using default 'Cherry'.",
             )
         return MultiModalConversation.call(**kwargs)
 
     async def _synthesize_with_qwen_tts(
-        self, model: str, text: str
-    ) -> Tuple[Optional[bytes], str]:
+        self,
+        model: str,
+        text: str,
+    ) -> tuple[bytes | None, str]:
         loop = asyncio.get_event_loop()
         response = await loop.run_in_executor(None, self._call_qwen_tts, model, text)
         audio_bytes = await self._extract_audio_from_response(response)
         if not audio_bytes:
             raise RuntimeError(
-                f"Audio synthesis failed for model '{model}'. {response}"
+                f"Audio synthesis failed for model '{model}'. {response}",
             )
         ext = ".wav"
         return audio_bytes, ext
 
-    async def _extract_audio_from_response(self, response) -> Optional[bytes]:
+    async def _extract_audio_from_response(self, response) -> bytes | None:
         output = getattr(response, "output", None)
         audio_obj = getattr(output, "audio", None) if output is not None else None
         if not audio_obj:
@@ -102,7 +107,7 @@ class ProviderDashscopeTTSAPI(TTSProvider):
             try:
                 return base64.b64decode(data_b64)
             except (ValueError, TypeError):
-                logging.error("Failed to decode base64 audio data.")
+                logging.exception("Failed to decode base64 audio data.")
                 return None
 
         url = getattr(audio_obj, "url", None)
@@ -110,23 +115,28 @@ class ProviderDashscopeTTSAPI(TTSProvider):
             return await self._download_audio_from_url(url)
         return None
 
-    async def _download_audio_from_url(self, url: str) -> Optional[bytes]:
+    async def _download_audio_from_url(self, url: str) -> bytes | None:
         if not url:
             return None
         timeout = max(self.timeout_ms / 1000, 1) if self.timeout_ms else 20
         try:
-            async with aiohttp.ClientSession() as session:
-                async with session.get(
-                    url, timeout=aiohttp.ClientTimeout(total=timeout)
-                ) as response:
-                    return await response.read()
+            async with (
+                aiohttp.ClientSession() as session,
+                session.get(
+                    url,
+                    timeout=aiohttp.ClientTimeout(total=timeout),
+                ) as response,
+            ):
+                return await response.read()
         except (aiohttp.ClientError, asyncio.TimeoutError, OSError) as e:
-            logging.error(f"Failed to download audio from URL {url}: {e}")
+            logging.exception(f"Failed to download audio from URL {url}: {e}")
             return None
 
     async def _synthesize_with_cosyvoice(
-        self, model: str, text: str
-    ) -> Tuple[Optional[bytes], str]:
+        self,
+        model: str,
+        text: str,
+    ) -> tuple[bytes | None, str]:
         synthesizer = SpeechSynthesizer(
             model=model,
             voice=self.voice,
@@ -134,13 +144,16 @@ class ProviderDashscopeTTSAPI(TTSProvider):
         )
         loop = asyncio.get_event_loop()
         audio_bytes = await loop.run_in_executor(
-            None, synthesizer.call, text, self.timeout_ms
+            None,
+            synthesizer.call,
+            text,
+            self.timeout_ms,
         )
         if not audio_bytes:
             resp = synthesizer.get_response()
             if resp and isinstance(resp, dict):
                 raise RuntimeError(
-                    f"Audio synthesis failed for model '{model}'. {resp}".strip()
+                    f"Audio synthesis failed for model '{model}'. {resp}".strip(),
                 )
         return audio_bytes, ".wav"
 

astrbot/core/provider/sources/dify_source.py

@@ -1,13 +1,15 @@
-import astrbot.core.message.components as Comp
 import os
-from .. import Provider
-from ..entities import LLMResponse
-from ..register import register_provider_adapter
-from astrbot.core.utils.dify_api_client import DifyAPIClient
-from astrbot.core.utils.io import download_image_by_url, download_file
+
+import astrbot.core.message.components as Comp
 from astrbot.core import logger, sp
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+from astrbot.core.utils.dify_api_client import DifyAPIClient
+from astrbot.core.utils.io import download_file, download_image_by_url
+
+from .. import Provider
+from ..entities import LLMResponse
+from ..register import register_provider_adapter
 
 
 @register_provider_adapter("dify", "Dify APP 适配器。")
@@ -32,10 +34,12 @@ class ProviderDify(Provider):
             raise Exception("Dify API 类型不能为空。")
         self.model_name = "dify"
         self.workflow_output_key = provider_config.get(
-            "dify_workflow_output_key", "astrbot_wf_output"
+            "dify_workflow_output_key",
+            "astrbot_wf_output",
         )
         self.dify_query_input_key = provider_config.get(
-            "dify_query_input_key", "astrbot_text_query"
+            "dify_query_input_key",
+            "astrbot_text_query",
         )
         if not self.dify_query_input_key:
             self.dify_query_input_key = "astrbot_text_query"
@@ -76,12 +80,13 @@ class ProviderDify(Provider):
                 else image_url
             )
             file_response = await self.api_client.file_upload(
-                image_path, user=session_id
+                image_path,
+                user=session_id,
             )
             logger.debug(f"Dify 上传图片响应：{file_response}")
             if "id" not in file_response:
                 logger.warning(
-                    f"上传图片后得到未知的 Dify 响应：{file_response}，图片将忽略。"
+                    f"上传图片后得到未知的 Dify 响应：{file_response}，图片将忽略。",
                 )
                 continue
             files_payload.append(
@@ -89,7 +94,7 @@ class ProviderDify(Provider):
                     "type": "image",
                     "transfer_method": "local_file",
                     "upload_file_id": file_response["id"],
-                }
+                },
             )
 
         # 获得会话变量
@@ -132,7 +137,7 @@ class ProviderDify(Provider):
                         elif chunk["event"] == "error":
                             logger.error(f"Dify 出现错误：{chunk}")
                             raise Exception(
-                                f"Dify 出现错误 status: {chunk['status']} message: {chunk['message']}"
+                                f"Dify 出现错误 status: {chunk['status']} message: {chunk['message']}",
                             )
 
                 case "workflow":
@@ -149,37 +154,37 @@ class ProviderDify(Provider):
                         match chunk["event"]:
                             case "workflow_started":
                                 logger.info(
-                                    f"Dify 工作流(ID: {chunk['workflow_run_id']})开始运行。"
+                                    f"Dify 工作流(ID: {chunk['workflow_run_id']})开始运行。",
                                 )
                             case "node_finished":
                                 logger.debug(
-                                    f"Dify 工作流节点(ID: {chunk['data']['node_id']} Title: {chunk['data'].get('title', '')})运行结束。"
+                                    f"Dify 工作流节点(ID: {chunk['data']['node_id']} Title: {chunk['data'].get('title', '')})运行结束。",
                                 )
                             case "workflow_finished":
                                 logger.info(
-                                    f"Dify 工作流(ID: {chunk['workflow_run_id']})运行结束"
+                                    f"Dify 工作流(ID: {chunk['workflow_run_id']})运行结束",
                                 )
                                 logger.debug(f"Dify 工作流结果：{chunk}")
                                 if chunk["data"]["error"]:
                                     logger.error(
-                                        f"Dify 工作流出现错误：{chunk['data']['error']}"
+                                        f"Dify 工作流出现错误：{chunk['data']['error']}",
                                     )
                                     raise Exception(
-                                        f"Dify 工作流出现错误：{chunk['data']['error']}"
+                                        f"Dify 工作流出现错误：{chunk['data']['error']}",
                                     )
                                 if (
                                     self.workflow_output_key
                                     not in chunk["data"]["outputs"]
                                 ):
                                     raise Exception(
-                                        f"Dify 工作流的输出不包含指定的键名：{self.workflow_output_key}"
+                                        f"Dify 工作流的输出不包含指定的键名：{self.workflow_output_key}",
                                     )
                                 result = chunk
                 case _:
                     raise Exception(f"未知的 Dify API 类型：{self.api_type}")
         except Exception as e:
-            logger.error(f"Dify 请求失败：{str(e)}")
-            return LLMResponse(role="err", completion_text=f"Dify 请求失败：{str(e)}")
+            logger.error(f"Dify 请求失败：{e!s}")
+            return LLMResponse(role="err", completion_text=f"Dify 请求失败：{e!s}")
 
         if not result:
             logger.warning("Dify 请求结果为空，请查看 Debug 日志。")

astrbot/core/provider/sources/edge_tts_source.py

@@ -1,14 +1,17 @@
-import uuid
+import asyncio
 import os
-import edge_tts
 import subprocess
-import asyncio
-from ..provider import TTSProvider
-from ..entities import ProviderType
-from ..register import register_provider_adapter
+import uuid
+
+import edge_tts
+
 from astrbot.core 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
+
 """
 edge_tts 方式，能够免费、快速生成语音，使用需要先安装edge-tts库
 ```
@@ -19,7 +22,9 @@ Windows 如果提示找不到指定文件，以管理员身份运行命令行窗
 
 
 @register_provider_adapter(
-    "edge_tts", "Microsoft Edge TTS", provider_type=ProviderType.TEXT_TO_SPEECH
+    "edge_tts",
+    "Microsoft Edge TTS",
+    provider_type=ProviderType.TEXT_TO_SPEECH,
 )
 class ProviderEdgeTTS(TTSProvider):
     def __init__(
@@ -31,9 +36,9 @@ class ProviderEdgeTTS(TTSProvider):
 
         # 设置默认语音，如果没有指定则使用中文小萱
         self.voice = provider_config.get("edge-tts-voice", "zh-CN-XiaoxiaoNeural")
-        self.rate = provider_config.get("rate", None)
-        self.volume = provider_config.get("volume", None)
-        self.pitch = provider_config.get("pitch", None)
+        self.rate = provider_config.get("rate")
+        self.volume = provider_config.get("volume")
+        self.pitch = provider_config.get("pitch")
         self.timeout = provider_config.get("timeout", 30)
 
         self.proxy = os.getenv("https_proxy", None)
@@ -97,26 +102,25 @@ class ProviderEdgeTTS(TTSProvider):
             os.remove(mp3_path)
             if os.path.exists(wav_path) and os.path.getsize(wav_path) > 0:
                 return wav_path
-            else:
-                logger.error("生成的WAV文件不存在或为空")
-                raise RuntimeError("生成的WAV文件不存在或为空")
+            logger.error("生成的WAV文件不存在或为空")
+            raise RuntimeError("生成的WAV文件不存在或为空")
 
         except subprocess.CalledProcessError as e:
             logger.error(
-                f"FFmpeg 转换失败: {e.stderr.decode() if e.stderr else str(e)}"
+                f"FFmpeg 转换失败: {e.stderr.decode() if e.stderr else str(e)}",
             )
             try:
                 if os.path.exists(mp3_path):
                     os.remove(mp3_path)
             except Exception:
                 pass
-            raise RuntimeError(f"FFmpeg 转换失败: {str(e)}")
+            raise RuntimeError(f"FFmpeg 转换失败: {e!s}")
 
         except Exception as e:
-            logger.error(f"音频生成失败: {str(e)}")
+            logger.error(f"音频生成失败: {e!s}")
             try:
                 if os.path.exists(mp3_path):
                     os.remove(mp3_path)
             except Exception:
                 pass
-            raise RuntimeError(f"音频生成失败: {str(e)}")
+            raise RuntimeError(f"音频生成失败: {e!s}")

astrbot/core/provider/sources/fishaudio_tts_api_source.py

@@ -1,14 +1,17 @@
 import os
-import uuid
 import re
+import uuid
+from typing import Annotated, Literal
+
 import ormsgpack
-from pydantic import BaseModel, conint
 from httpx import AsyncClient
-from typing import Annotated, Literal
-from ..provider import TTSProvider
+from pydantic import BaseModel, conint
+
+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
 
 
 class ServeReferenceAudio(BaseModel):
@@ -35,7 +38,9 @@ class ServeTTSRequest(BaseModel):
 
 
 @register_provider_adapter(
-    "fishaudio_tts_api", "FishAudio TTS API", provider_type=ProviderType.TEXT_TO_SPEECH
+    "fishaudio_tts_api",
+    "FishAudio TTS API",
+    provider_type=ProviderType.TEXT_TO_SPEECH,
 )
 class ProviderFishAudioTTSAPI(TTSProvider):
     def __init__(
@@ -48,16 +53,16 @@ class ProviderFishAudioTTSAPI(TTSProvider):
         self.reference_id: str = provider_config.get("fishaudio-tts-reference-id", "")
         self.character: str = provider_config.get("fishaudio-tts-character", "可莉")
         self.api_base: str = provider_config.get(
-            "api_base", "https://api.fish-audio.cn/v1"
+            "api_base",
+            "https://api.fish-audio.cn/v1",
         )
         self.headers = {
             "Authorization": f"Bearer {self.chosen_api_key}",
         }
-        self.set_model(provider_config.get("model", None))
+        self.set_model(provider_config.get("model"))
 
     async def _get_reference_id_by_character(self, character: str) -> str:
-        """
-        获取角色的reference_id
+        """获取角色的reference_id
 
         Args:
             character: 角色名称
@@ -67,13 +72,16 @@ class ProviderFishAudioTTSAPI(TTSProvider):
 
         exception:
             APIException: 获取语音角色列表为空
+
         """
         sort_options = ["score", "task_count", "created_at"]
         async with AsyncClient(base_url=self.api_base.replace("/v1", "")) as client:
             for sort_by in sort_options:
                 params = {"title": character, "sort_by": sort_by}
                 response = await client.get(
-                    "/model", params=params, headers=self.headers
+                    "/model",
+                    params=params,
+                    headers=self.headers,
                 )
                 resp_data = response.json()
                 if resp_data["total"] == 0:
@@ -84,14 +92,14 @@ class ProviderFishAudioTTSAPI(TTSProvider):
             return None
 
     def _validate_reference_id(self, reference_id: str) -> bool:
-        """
-        验证reference_id格式是否有效
+        """验证reference_id格式是否有效
 
         Args:
             reference_id: 参考模型ID
 
         Returns:
             bool: ID是否有效
+
         """
         if not reference_id or not reference_id.strip():
             return False
@@ -109,7 +117,7 @@ class ProviderFishAudioTTSAPI(TTSProvider):
                 raise ValueError(
                     f"无效的FishAudio参考模型ID: '{self.reference_id}'. "
                     f"请确保ID是32位十六进制字符串（例如: 626bb6d3f3364c9cbc3aa6a67300a664）。"
-                    f"您可以从 https://fish.audio/zh-CN/discovery 获取有效的模型ID。"
+                    f"您可以从 https://fish.audio/zh-CN/discovery 获取有效的模型ID。",
                 )
             reference_id = self.reference_id.strip()
         else:

astrbot/core/provider/sources/gemini_embedding_source.py

@@ -1,9 +1,10 @@
 from google import genai
 from google.genai import types
 from google.genai.errors import APIError
+
+from ..entities import ProviderType
 from ..provider import EmbeddingProvider
 from ..register import register_provider_adapter
-from ..entities import ProviderType
 
 
 @register_provider_adapter(
@@ -18,40 +19,38 @@ class GeminiEmbeddingProvider(EmbeddingProvider):
         self.provider_settings = provider_settings
 
         api_key: str = provider_config.get("embedding_api_key")
-        api_base: str = provider_config.get("embedding_api_base", None)
+        api_base: str = provider_config.get("embedding_api_base")
         timeout: int = int(provider_config.get("timeout", 20))
 
         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 = provider_config.get(
-            "embedding_model", "gemini-embedding-exp-03-07"
+            "embedding_model",
+            "gemini-embedding-exp-03-07",
         )
 
     async def get_embedding(self, text: str) -> list[float]:
-        """
-        获取文本的嵌入
-        """
+        """获取文本的嵌入"""
         try:
             result = await self.client.models.embed_content(
-                model=self.model, contents=text
+                model=self.model,
+                contents=text,
             )
             return result.embeddings[0].values
         except APIError as e:
             raise Exception(f"Gemini Embedding API请求失败: {e.message}")
 
     async def get_embeddings(self, texts: list[str]) -> list[list[float]]:
-        """
-        批量获取文本的嵌入
-        """
+        """批量获取文本的嵌入"""
         try:
             result = await self.client.models.embed_content(
-                model=self.model, contents=texts
+                model=self.model,
+                contents=texts,
             )
             return [embedding.values for embedding in result.embeddings]
         except APIError as e: