chore(core.provider): 🚨 修正实现错误Lint

Author: Dt8333

astrbot/core/provider/sources/azure_tts_source.py

@@ -1,3 +1,4 @@
+from typing import cast
 import uuid
 import time
 import json
@@ -40,7 +41,7 @@ async def __aexit__(self, exc_type, exc_val, exc_tb):
 
     async def _sync_time(self):
         try:
-            response = await self.client.get(self.auth_time_url)
+            response = await cast(AsyncClient, self.client).get(self.auth_time_url)
             response.raise_for_status()
             server_time = int(response.json()["timestamp"])
             local_time = int(time.time())
@@ -62,7 +63,7 @@ async def get_audio(self, text: str, voice_params: dict) -> str:
         signature = await self._generate_signature()
         for attempt in range(self.retry_count):
             try:
-                response = await self.client.post(
+                response = await cast(AsyncClient, self.client).post(
                     f"{self.api_url}?sign={signature}",
                     data={
                         "text": text,
@@ -87,6 +88,7 @@ async def get_audio(self, text: str, voice_params: dict) -> str:
                 if attempt == self.retry_count - 1:
                     raise RuntimeError(f"OTTS请求失败: {str(e)}") from e
                 await asyncio.sleep(0.5 * (attempt + 1))
+        raise RuntimeError("OTTS未返回音频文件")
 
 
 class AzureNativeProvider(TTSProvider):
@@ -130,7 +132,7 @@ async def _refresh_token(self):
         token_url = (
             f"https://{self.region}.api.cognitive.microsoft.com/sts/v1.0/issuetoken"
         )
-        response = await self.client.post(
+        response = await cast(AsyncClient, self.client).post(
             token_url, headers={"Ocp-Apim-Subscription-Key": self.subscription_key}
         )
         response.raise_for_status()
@@ -153,7 +155,7 @@ async def get_audio(self, text: str) -> str:
                 </mstts:express-as>
             </voice>
         </speak>"""
-        response = await self.client.post(
+        response = await cast(AsyncClient, self.client).post(
             self.endpoint,
             content=ssml,
             headers={
@@ -176,8 +178,11 @@ def __init__(self, provider_config: dict, provider_settings: dict):
         key_value = provider_config.get("azure_tts_subscription_key", "")
         self.provider = self._parse_provider(key_value, provider_config)
 
-    def _parse_provider(self, key_value: str, config: dict) -> TTSProvider:
+    def _parse_provider(
+        self, key_value: str, config: dict
+    ) -> OTTSProvider | AzureNativeProvider:
         if key_value.lower().startswith("other["):
+            json_str = ""
             try:
                 match = re.match(r"other\[(.*)\]", key_value, re.DOTALL)
                 if not match:

astrbot/core/provider/sources/coze_source.py

@@ -26,7 +26,7 @@ def __init__(
             provider_settings,
             default_persona,
         )
-        self.api_key = provider_config.get("coze_api_key", "")
+        self.api_key: str = provider_config.get("coze_api_key", "")
         if not self.api_key:
             raise Exception("Coze API Key 不能为空。")
         self.bot_id = provider_config.get("bot_id", "")
@@ -64,8 +64,8 @@ def _generate_cache_key(self, data: str, is_base64: bool = False) -> str:
 
         try:
             if is_base64 and data.startswith("data:image/"):
+                header, encoded = data.split(",", 1)
                 try:
-                    header, encoded = data.split(",", 1)
                     image_bytes = base64.b64decode(encoded)
                     cache_key = hashlib.md5(image_bytes).hexdigest()
                     return cache_key
@@ -567,11 +567,11 @@ async def forget(self, session_id: str):
             logger.error(f"清空 Coze 会话失败: {str(e)}")
             return False
 
-    async def get_current_key(self):
+    def get_current_key(self):
         """获取当前API Key"""
         return self.api_key
 
-    async def set_key(self, key: str):
+    def set_key(self, key: str):
         """设置新的API Key"""
         raise NotImplementedError("Coze 适配器不支持设置 API Key。")
 
@@ -583,12 +583,12 @@ def get_model(self):
         """获取当前模型"""
         return f"bot_{self.bot_id}"
 
-    def set_model(self, model: str):
+    def set_model(self, model_name: str):
         """设置模型（在Coze中是Bot ID）"""
-        if model.startswith("bot_"):
-            self.bot_id = model[4:]
+        if model_name.startswith("bot_"):
+            self.bot_id = model_name[4:]
         else:
-            self.bot_id = model
+            self.bot_id = model_name
 
     async def get_human_readable_context(
         self, session_id: str, page: int = 1, page_size: int = 10

astrbot/core/provider/sources/dashscope_source.py

@@ -25,7 +25,7 @@ def __init__(
             provider_settings,
             default_persona,
         )
-        self.api_key = provider_config.get("dashscope_api_key", "")
+        self.api_key: str = provider_config.get("dashscope_api_key", "")
         if not self.api_key:
             raise Exception("阿里云百炼 API Key 不能为空。")
         self.app_id = provider_config.get("dashscope_app_id", "")
@@ -66,6 +66,7 @@ async def text_chat(
         func_tool=None,
         contexts=None,
         system_prompt=None,
+        tool_calls_result=None,
         model=None,
         **kwargs,
     ) -> LLMResponse:
@@ -75,6 +76,8 @@ async def text_chat(
         payload_vars = self.variables.copy()
         # 动态变量
         session_var = await sp.session_get(session_id, "session_variables", default={})
+        if not isinstance(session_var, dict):
+            session_var = {}
         payload_vars.update(session_var)
 
         if (
@@ -159,9 +162,9 @@ async def text_chat_stream(
         self,
         prompt,
         session_id=None,
-        image_urls=...,
+        image_urls=None,
         func_tool=None,
-        contexts=...,
+        contexts=None,
         system_prompt=None,
         tool_calls_result=None,
         model=None,
@@ -186,10 +189,10 @@ async def text_chat_stream(
     async def forget(self, session_id):
         return True
 
-    async def get_current_key(self):
+    def get_current_key(self):
         return self.api_key
 
-    async def set_key(self, key):
+    def set_key(self, key):
         raise Exception("阿里云百炼 适配器不支持设置 API Key。")
 
     async def get_models(self):

astrbot/core/provider/sources/dashscope_tts.py

@@ -32,7 +32,7 @@ def __init__(
         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["model"])
         self.timeout_ms = float(provider_config.get("timeout", 20)) * 1000
         dashscope.api_key = self.chosen_api_key
 
@@ -67,9 +67,10 @@ def _call_qwen_tts(self, model: str, text: str):
 
         kwargs = {
             "model": model,
-            "text": text,
+            "messages": None,
             "api_key": self.chosen_api_key,
             "voice": self.voice or "Cherry",
+            "text": text,
         }
         if not self.voice:
             logging.warning(

astrbot/core/provider/sources/dify_source.py

@@ -96,6 +96,8 @@ async def text_chat(
         payload_vars = self.variables.copy()
         # 动态变量
         session_var = await sp.session_get(session_id, "session_variables", default={})
+        if not isinstance(session_var, dict):
+            session_var = {}
         payload_vars.update(session_var)
         payload_vars["system_prompt"] = system_prompt
 
@@ -266,10 +268,10 @@ async def forget(self, session_id):
         self.conversation_ids[session_id] = ""
         return True
 
-    async def get_current_key(self):
+    def get_current_key(self):
         return self.api_key
 
-    async def set_key(self, key):
+    def set_key(self, key):
         raise Exception("Dify 适配器不支持设置 API Key。")
 
     async def get_models(self):

astrbot/core/provider/sources/edge_tts_source.py

@@ -62,7 +62,7 @@ async def get_audio(self, text: str) -> str:
                 from pyffmpeg import FFmpeg
 
                 ff = FFmpeg()
-                ff.convert(input=mp3_path, output=wav_path)
+                ff.convert(input_file=mp3_path, output_file=wav_path)
             except Exception as e:
                 logger.debug(f"pyffmpeg 转换失败: {e}, 尝试使用 ffmpeg 命令行进行转换")
                 # use ffmpeg command line

astrbot/core/provider/sources/fishaudio_tts_api_source.py

@@ -53,9 +53,9 @@ def __init__(
         self.headers = {
             "Authorization": f"Bearer {self.chosen_api_key}",
         }
-        self.set_model(provider_config.get("model", None))
+        self.set_model(provider_config["model"])
 
-    async def _get_reference_id_by_character(self, character: str) -> str:
+    async def _get_reference_id_by_character(self, character: str) -> str | None:
         """
         获取角色的reference_id
 
@@ -120,7 +120,7 @@ async def _generate_request(self, text: str) -> dict:
             text=text,
             format="wav",
             reference_id=reference_id,
-        )
+        ).model_dump()
 
     async def get_audio(self, text: str) -> str:
         temp_dir = os.path.join(get_astrbot_data_path(), "temp")
@@ -138,5 +138,6 @@ async def get_audio(self, text: str) -> str:
                     async for chunk in response.aiter_bytes():
                         f.write(chunk)
                 return path
-            text = await response.aread()
+            body = await response.aread()
+            text = body.decode("utf-8", errors="replace")
             raise Exception(f"Fish Audio API请求失败: {text}")

astrbot/core/provider/sources/gemini_embedding_source.py

@@ -4,6 +4,7 @@
 from ..provider import EmbeddingProvider
 from ..register import register_provider_adapter
 from ..entities import ProviderType
+from typing import cast
 
 
 @register_provider_adapter(
@@ -17,8 +18,8 @@ def __init__(self, provider_config: dict, provider_settings: dict) -> None:
         self.provider_config = provider_config
         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_key: str = provider_config["embedding_api_key"]
+        api_base: str = provider_config["embedding_api_base"]
         timeout: int = int(provider_config.get("timeout", 20))
 
         http_options = types.HttpOptions(timeout=timeout * 1000)
@@ -41,19 +42,27 @@ async def get_embedding(self, text: str) -> list[float]:
             result = await self.client.models.embed_content(
                 model=self.model, contents=text
             )
+            assert result.embeddings is not None
+            assert result.embeddings[0].values is not None
             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]]:
+    async def get_embeddings(self, text: list[str]) -> list[list[float]]:
         """
         批量获取文本的嵌入
         """
         try:
             result = await self.client.models.embed_content(
-                model=self.model, contents=texts
+                model=self.model, contents=cast(types.ContentListUnion, text)
             )
-            return [embedding.values for embedding in result.embeddings]
+            assert result.embeddings is not None
+
+            embeddings: list[list[float]] = []
+            for embedding in result.embeddings:
+                assert embedding.values is not None
+                embeddings.append(embedding.values)
+            return embeddings
         except APIError as e:
             raise Exception(f"Gemini Embedding API批量请求失败: {e.message}")
 

astrbot/core/provider/sources/gemini_source.py

@@ -4,6 +4,7 @@
 import logging
 import random
 from collections.abc import AsyncGenerator
+from typing import cast
 
 from google import genai
 from google.genai import types
@@ -138,7 +139,7 @@ async def _prepare_query_config(
             logger.warning("流式输出不支持图片模态，已自动降级为文本模态")
             modalities = ["Text"]
 
-        tool_list = []
+        tool_list: list[types.Tool] | None = []
         model_name = self.get_model()
         native_coderunner = self.provider_config.get("gm_native_coderunner", False)
         native_search = self.provider_config.get("gm_native_search", False)
@@ -215,7 +216,7 @@ async def _prepare_query_config(
             logprobs=payloads.get("logprobs"),
             seed=payloads.get("seed"),
             response_modalities=modalities,
-            tools=tool_list,
+            tools=cast(types.ToolListUnion | None, tool_list),
             safety_settings=self.safety_settings if self.safety_settings else None,
             thinking_config=(
                 types.ThinkingConfig(
@@ -258,6 +259,7 @@ def append_or_extend(
             content_cls: type[types.Content],
         ) -> None:
             if contents and isinstance(contents[-1], content_cls):
+                assert contents[-1].parts is not None
                 contents[-1].parts.extend(part)
             else:
                 contents.append(content_cls(parts=part))
@@ -413,7 +415,7 @@ async def _query(self, payloads: dict, tools: ToolSet | None) -> LLMResponse:
                 )
                 result = await self.client.models.generate_content(
                     model=self.get_model(),
-                    contents=conversation,
+                    contents=cast(types.ContentListUnion, conversation),
                     config=config,
                 )
 
@@ -483,7 +485,7 @@ async def _query_stream(
                 )
                 result = await self.client.models.generate_content_stream(
                     model=self.get_model(),
-                    contents=conversation,
+                    contents=cast(types.ContentListUnion, conversation),
                     config=config,
                 )
                 break

astrbot/core/provider/sources/minimax_tts_api_source.py

@@ -80,7 +80,7 @@ def _build_tts_stream_body(self, text: str):
 
         return json.dumps(dict_body)
 
-    async def _call_tts_stream(self, text: str) -> AsyncIterator[bytes]:
+    async def _call_tts_stream(self, text: str) -> AsyncIterator[str]:
         """进行流式请求"""
         try:
             async with aiohttp.ClientSession() as session:
@@ -108,7 +108,9 @@ async def _call_tts_stream(self, text: str) -> AsyncIterator[bytes]:
                                         data = json.loads(message[6:])
                                         if "extra_info" in data:
                                             continue
-                                        audio = data.get("data", {}).get("audio")
+                                        audio: str | None = data.get("data", {}).get(
+                                            "audio"
+                                        )
                                         if audio is not None:
                                             yield audio
                                     except json.JSONDecodeError: