AstrBot 4.5.0__py3-none-any.whl → 4.5.2__py3-none-any.whl

astrbot/core/provider/sources/coze_api_client.py

@@ -1,8 +1,11 @@
-import json
 import asyncio
-import aiohttp
 import io
-from typing import Dict, List, Any, AsyncGenerator
+import json
+from collections.abc import AsyncGenerator
+from typing import Any
+
+import aiohttp
+
 from astrbot.core import logger
 
 
@@ -32,7 +35,9 @@ class CozeAPIClient:
                 "Accept": "text/event-stream",
             }
             self.session = aiohttp.ClientSession(
-                headers=headers, timeout=timeout, connector=connector
+                headers=headers,
+                timeout=timeout,
+                connector=connector,
             )
         return self.session
 
@@ -46,6 +51,7 @@ class CozeAPIClient:
             file_data (bytes): 文件的二进制数据
         Returns:
             str: 上传成功后返回的 file_id
+
         """
         session = await self._ensure_session()
         url = f"{self.api_base}/v1/files/upload"
@@ -64,12 +70,12 @@ class CozeAPIClient:
 
                 response_text = await response.text()
                 logger.debug(
-                    f"文件上传响应状态: {response.status}, 内容: {response_text}"
+                    f"文件上传响应状态: {response.status}, 内容: {response_text}",
                 )
 
                 if response.status != 200:
                     raise Exception(
-                        f"文件上传失败，状态码: {response.status}, 响应: {response_text}"
+                        f"文件上传失败，状态码: {response.status}, 响应: {response_text}",
                     )
 
                 try:
@@ -88,8 +94,8 @@ class CozeAPIClient:
             logger.error("文件上传超时")
             raise Exception("文件上传超时")
         except Exception as e:
-            logger.error(f"文件上传失败: {str(e)}")
-            raise Exception(f"文件上传失败: {str(e)}")
+            logger.error(f"文件上传失败: {e!s}")
+            raise Exception(f"文件上传失败: {e!s}")
 
     async def download_image(self, image_url: str) -> bytes:
         """下载图片并返回字节数据
@@ -98,6 +104,7 @@ class CozeAPIClient:
             image_url (str): 图片的URL
         Returns:
             bytes: 图片的二进制数据
+
         """
         session = await self._ensure_session()
 
@@ -110,19 +117,19 @@ class CozeAPIClient:
                 return image_data
 
         except Exception as e:
-            logger.error(f"下载图片失败 {image_url}: {str(e)}")
-            raise Exception(f"下载图片失败: {str(e)}")
+            logger.error(f"下载图片失败 {image_url}: {e!s}")
+            raise Exception(f"下载图片失败: {e!s}")
 
     async def chat_messages(
         self,
         bot_id: str,
         user_id: str,
-        additional_messages: List[Dict] | None = None,
+        additional_messages: list[dict] | None = None,
         conversation_id: str | None = None,
         auto_save_history: bool = True,
         stream: bool = True,
         timeout: float = 120,
-    ) -> AsyncGenerator[Dict[str, Any], None]:
+    ) -> AsyncGenerator[dict[str, Any], None]:
         """发送聊天消息并返回流式响应
 
         Args:
@@ -133,6 +140,7 @@ class CozeAPIClient:
             auto_save_history: 是否自动保存历史
             stream: 是否流式响应
             timeout: 超时时间
+
         """
         session = await self._ensure_session()
         url = f"{self.api_base}/v3/chat"
@@ -198,7 +206,7 @@ class CozeAPIClient:
         except asyncio.TimeoutError:
             raise Exception(f"Coze API 流式请求超时 ({timeout}秒)")
         except Exception as e:
-            raise Exception(f"Coze API 流式请求失败: {str(e)}")
+            raise Exception(f"Coze API 流式请求失败: {e!s}")
 
     async def clear_context(self, conversation_id: str):
         """清空会话上下文
@@ -207,6 +215,7 @@ class CozeAPIClient:
             conversation_id: 会话ID
         Returns:
             dict: API响应结果
+
         """
         session = await self._ensure_session()
         url = f"{self.api_base}/v3/conversation/message/clear_context"
@@ -230,7 +239,7 @@ class CozeAPIClient:
         except asyncio.TimeoutError:
             raise Exception("Coze API 请求超时")
         except aiohttp.ClientError as e:
-            raise Exception(f"Coze API 请求失败: {str(e)}")
+            raise Exception(f"Coze API 请求失败: {e!s}")
 
     async def get_message_list(
         self,
@@ -248,6 +257,7 @@ class CozeAPIClient:
             offset: 偏移量
         Returns:
             dict: API响应结果
+
         """
         session = await self._ensure_session()
         url = f"{self.api_base}/v3/conversation/message/list"
@@ -264,8 +274,8 @@ class CozeAPIClient:
                 return await response.json()
 
         except Exception as e:
-            logger.error(f"获取Coze消息列表失败: {str(e)}")
-            raise Exception(f"获取Coze消息列表失败: {str(e)}")
+            logger.error(f"获取Coze消息列表失败: {e!s}")
+            raise Exception(f"获取Coze消息列表失败: {e!s}")
 
     async def close(self):
         """关闭会话"""
@@ -275,8 +285,8 @@ class CozeAPIClient:
 
 
 if __name__ == "__main__":
-    import os
     import asyncio
+    import os
 
     async def test_coze_api_client():
         api_key = os.getenv("COZE_API_KEY", "")

astrbot/core/provider/sources/coze_source.py

@@ -1,13 +1,15 @@
-import json
-import os
 import base64
 import hashlib
-from typing import AsyncGenerator, Dict
-from astrbot.core.message.message_event_result import MessageChain
+import json
+import os
+from collections.abc import AsyncGenerator
+
 import astrbot.core.message.components as Comp
-from astrbot.api.provider import Provider
 from astrbot import logger
+from astrbot.api.provider import Provider
+from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.provider.entities import LLMResponse
+
 from ..register import register_provider_adapter
 from .coze_api_client import CozeAPIClient
 
@@ -34,18 +36,18 @@ class ProviderCoze(Provider):
         self.api_base: str = provider_config.get("coze_api_base", "https://api.coze.cn")
 
         if not isinstance(self.api_base, str) or not self.api_base.startswith(
-            ("http://", "https://")
+            ("http://", "https://"),
         ):
             raise Exception(
-                "Coze API Base URL 格式不正确，必须以 http:// 或 https:// 开头。"
+                "Coze API Base URL 格式不正确，必须以 http:// 或 https:// 开头。",
             )
 
         self.timeout = provider_config.get("timeout", 120)
         if isinstance(self.timeout, str):
             self.timeout = int(self.timeout)
         self.auto_save_history = provider_config.get("auto_save_history", True)
-        self.conversation_ids: Dict[str, str] = {}
-        self.file_id_cache: Dict[str, Dict[str, str]] = {}
+        self.conversation_ids: dict[str, str] = {}
+        self.file_id_cache: dict[str, dict[str, str]] = {}
 
         # 创建 API 客户端
         self.api_client = CozeAPIClient(api_key=self.api_key, api_base=self.api_base)
@@ -59,8 +61,8 @@ class ProviderCoze(Provider):
 
         Returns:
             str: 缓存键
-        """
 
+        """
         try:
             if is_base64 and data.startswith("data:image/"):
                 try:
@@ -71,26 +73,24 @@ class ProviderCoze(Provider):
                 except Exception:
                     cache_key = hashlib.md5(encoded.encode("utf-8")).hexdigest()
                     return cache_key
+            elif data.startswith(("http://", "https://")):
+                # URL图片，使用URL作为缓存键
+                cache_key = hashlib.md5(data.encode("utf-8")).hexdigest()
+                return cache_key
             else:
-                if data.startswith(("http://", "https://")):
-                    # URL图片，使用URL作为缓存键
-                    cache_key = hashlib.md5(data.encode("utf-8")).hexdigest()
-                    return cache_key
-                else:
-                    clean_path = (
-                        data.split("_")[0]
-                        if "_" in data and len(data.split("_")) >= 3
-                        else data
-                    )
+                clean_path = (
+                    data.split("_")[0]
+                    if "_" in data and len(data.split("_")) >= 3
+                    else data
+                )
 
-                    if os.path.exists(clean_path):
-                        with open(clean_path, "rb") as f:
-                            file_content = f.read()
-                        cache_key = hashlib.md5(file_content).hexdigest()
-                        return cache_key
-                    else:
-                        cache_key = hashlib.md5(clean_path.encode("utf-8")).hexdigest()
-                        return cache_key
+                if os.path.exists(clean_path):
+                    with open(clean_path, "rb") as f:
+                        file_content = f.read()
+                    cache_key = hashlib.md5(file_content).hexdigest()
+                    return cache_key
+                cache_key = hashlib.md5(clean_path.encode("utf-8")).hexdigest()
+                return cache_key
 
         except Exception as e:
             cache_key = hashlib.md5(data.encode("utf-8")).hexdigest()
@@ -117,7 +117,9 @@ class ProviderCoze(Provider):
         return file_id
 
     async def _download_and_upload_image(
-        self, image_url: str, session_id: str | None = None
+        self,
+        image_url: str,
+        session_id: str | None = None,
     ) -> str:
         """下载图片并上传到 Coze，返回 file_id"""
         # 计算哈希实现缓存
@@ -142,14 +144,15 @@ class ProviderCoze(Provider):
             return file_id
 
         except Exception as e:
-            logger.error(f"处理图片失败 {image_url}: {str(e)}")
-            raise Exception(f"处理图片失败: {str(e)}")
+            logger.error(f"处理图片失败 {image_url}: {e!s}")
+            raise Exception(f"处理图片失败: {e!s}")
 
     async def _process_context_images(
-        self, content: str | list, session_id: str
+        self,
+        content: str | list,
+        session_id: str,
     ) -> str:
         """处理上下文中的图片内容，将 base64 图片上传并替换为 file_id"""
-
         try:
             if isinstance(content, str):
                 return content
@@ -184,14 +187,15 @@ class ProviderCoze(Provider):
                             continue
                         # 计算哈希用于缓存
                         cache_key = self._generate_cache_key(
-                            image_data, is_base64=image_data.startswith("data:image/")
+                            image_data,
+                            is_base64=image_data.startswith("data:image/"),
                         )
 
                         # 检查缓存
                         if cache_key in self.file_id_cache[session_id]:
                             file_id = self.file_id_cache[session_id][cache_key]
                             processed_content.append(
-                                {"type": "image", "file_id": file_id}
+                                {"type": "image", "file_id": file_id},
                             )
                         else:
                             # 上传图片并缓存
@@ -207,7 +211,8 @@ class ProviderCoze(Provider):
                             elif image_data.startswith(("http://", "https://")):
                                 # URL 图片
                                 file_id = await self._download_and_upload_image(
-                                    image_data, session_id
+                                    image_data,
+                                    session_id,
                                 )
                                 # 为URL图片也添加缓存
                                 self.file_id_cache[session_id][cache_key] = file_id
@@ -222,22 +227,21 @@ class ProviderCoze(Provider):
                                 )
                             else:
                                 logger.warning(
-                                    f"无法处理的图片格式: {image_data[:50]}..."
+                                    f"无法处理的图片格式: {image_data[:50]}...",
                                 )
                                 continue
 
                             processed_content.append(
-                                {"type": "image", "file_id": file_id}
+                                {"type": "image", "file_id": file_id},
                             )
 
             result = json.dumps(processed_content, ensure_ascii=False)
             return result
         except Exception as e:
-            logger.error(f"处理上下文图片失败: {str(e)}")
+            logger.error(f"处理上下文图片失败: {e!s}")
             if isinstance(content, str):
                 return content
-            else:
-                return json.dumps(content, ensure_ascii=False)
+            return json.dumps(content, ensure_ascii=False)
 
     async def text_chat(
         self,
@@ -262,8 +266,10 @@ class ProviderCoze(Provider):
             system_prompt (str): 系统提示语
             tool_calls_result (ToolCallsResult | List[ToolCallsResult]): 工具调用结果(不支持)
             model (str): 模型名称(不支持)
+
         Returns:
             LLMResponse: LLM响应对象
+
         """
         accumulated_content = ""
         final_response = None
@@ -291,8 +297,7 @@ class ProviderCoze(Provider):
         if accumulated_content:
             chain = MessageChain(chain=[Comp.Plain(accumulated_content)])
             return LLMResponse(role="assistant", result_chain=chain)
-        else:
-            return LLMResponse(role="assistant", completion_text="")
+        return LLMResponse(role="assistant", completion_text="")
 
     async def text_chat_stream(
         self,
@@ -319,9 +324,14 @@ class ProviderCoze(Provider):
         if system_prompt:
             if not self.auto_save_history or not conversation_id:
                 additional_messages.append(
-                    {"role": "system", "content": system_prompt, "content_type": "text"}
+                    {
+                        "role": "system",
+                        "content": system_prompt,
+                        "content_type": "text",
+                    },
                 )
 
+        contexts = self._ensure_message_to_dicts(contexts)
         if not self.auto_save_history and contexts:
             # 如果关闭了自动保存历史，传入上下文
             for ctx in contexts:
@@ -343,14 +353,15 @@ class ProviderCoze(Provider):
                         )
                     ):
                         processed_content = await self._process_context_images(
-                            content, user_id
+                            content,
+                            user_id,
                         )
                         additional_messages.append(
                             {
                                 "role": ctx["role"],
                                 "content": processed_content,
                                 "content_type": "object_string",
-                            }
+                            },
                         )
                     else:
                         # 纯文本
@@ -363,7 +374,7 @@ class ProviderCoze(Provider):
                                     else json.dumps(content, ensure_ascii=False)
                                 ),
                                 "content_type": "text",
-                            }
+                            },
                         )
                 else:
                     logger.info(f"[Coze] 跳过格式不正确的上下文: {ctx}")
@@ -380,7 +391,8 @@ class ProviderCoze(Provider):
                         if url.startswith(("http://", "https://")):
                             # 网络图片
                             file_id = await self._download_and_upload_image(
-                                url, user_id
+                                url,
+                                user_id,
                             )
                         else:
                             # 本地文件或 base64
@@ -389,37 +401,41 @@ class ProviderCoze(Provider):
                                 _, encoded = url.split(",", 1)
                                 image_data = base64.b64decode(encoded)
                                 cache_key = self._generate_cache_key(
-                                    url, is_base64=True
+                                    url,
+                                    is_base64=True,
+                                )
+                                file_id = await self._upload_file(
+                                    image_data,
+                                    user_id,
+                                    cache_key,
+                                )
+                            # 本地文件
+                            elif os.path.exists(url):
+                                with open(url, "rb") as f:
+                                    image_data = f.read()
+                                # 用文件路径和修改时间来缓存
+                                file_stat = os.stat(url)
+                                cache_key = self._generate_cache_key(
+                                    f"{url}_{file_stat.st_mtime}_{file_stat.st_size}",
+                                    is_base64=False,
                                 )
                                 file_id = await self._upload_file(
-                                    image_data, user_id, cache_key
+                                    image_data,
+                                    user_id,
+                                    cache_key,
                                 )
                             else:
-                                # 本地文件
-                                if os.path.exists(url):
-                                    with open(url, "rb") as f:
-                                        image_data = f.read()
-                                    # 用文件路径和修改时间来缓存
-                                    file_stat = os.stat(url)
-                                    cache_key = self._generate_cache_key(
-                                        f"{url}_{file_stat.st_mtime}_{file_stat.st_size}",
-                                        is_base64=False,
-                                    )
-                                    file_id = await self._upload_file(
-                                        image_data, user_id, cache_key
-                                    )
-                                else:
-                                    logger.warning(f"图片文件不存在: {url}")
-                                    continue
+                                logger.warning(f"图片文件不存在: {url}")
+                                continue
 
                             object_string_content.append(
                                 {
                                     "type": "image",
                                     "file_id": file_id,
-                                }
+                                },
                             )
                     except Exception as e:
-                        logger.error(f"处理图片失败 {url}: {str(e)}")
+                        logger.error(f"处理图片失败 {url}: {e!s}")
                         continue
 
                 if object_string_content:
@@ -429,18 +445,17 @@ class ProviderCoze(Provider):
                             "role": "user",
                             "content": content,
                             "content_type": "object_string",
-                        }
-                    )
-            else:
-                # 纯文本
-                if prompt:
-                    additional_messages.append(
-                        {
-                            "role": "user",
-                            "content": prompt,
-                            "content_type": "text",
-                        }
+                        },
                     )
+            # 纯文本
+            elif prompt:
+                additional_messages.append(
+                    {
+                        "role": "user",
+                        "content": prompt,
+                        "content_type": "text",
+                    },
+                )
 
         try:
             accumulated_content = ""
@@ -534,10 +549,10 @@ class ProviderCoze(Provider):
                 )
 
         except Exception as e:
-            logger.error(f"Coze 流式请求失败: {str(e)}")
+            logger.error(f"Coze 流式请求失败: {e!s}")
             yield LLMResponse(
                 role="err",
-                completion_text=f"Coze 流式请求失败: {str(e)}",
+                completion_text=f"Coze 流式请求失败: {e!s}",
                 is_chunk=False,
             )
 
@@ -558,12 +573,11 @@ class ProviderCoze(Provider):
             if "code" in response and response["code"] == 0:
                 self.conversation_ids.pop(user_id, None)
                 return True
-            else:
-                logger.warning(f"清空 Coze 会话上下文失败: {response}")
-                return False
+            logger.warning(f"清空 Coze 会话上下文失败: {response}")
+            return False
 
         except Exception as e:
-            logger.error(f"清空 Coze 会话失败: {str(e)}")
+            logger.error(f"清空 Coze 会话失败: {e!s}")
             return False
 
     async def get_current_key(self):
@@ -590,7 +604,10 @@ class ProviderCoze(Provider):
             self.bot_id = model
 
     async def get_human_readable_context(
-        self, session_id: str, page: int = 1, page_size: int = 10
+        self,
+        session_id: str,
+        page: int = 1,
+        page_size: int = 10,
     ):
         """获取人类可读的上下文历史"""
         user_id = session_id
@@ -627,7 +644,7 @@ class ProviderCoze(Provider):
             return readable_history
 
         except Exception as e:
-            logger.error(f"获取 Coze 消息历史失败: {str(e)}")
+            logger.error(f"获取 Coze 消息历史失败: {e!s}")
             return []
 
     async def terminate(self):

astrbot/core/provider/sources/dashscope_source.py

@@ -1,14 +1,17 @@
-import re
 import asyncio
 import functools
-from .. import Provider, Personality
+import re
+
+from dashscope import Application
+from dashscope.app.application_response import ApplicationResponse
+
+from astrbot.core import logger, sp
+from astrbot.core.message.message_event_result import MessageChain
+
+from .. import Personality, Provider
 from ..entities import LLMResponse
 from ..register import register_provider_adapter
-from astrbot.core.message.message_event_result import MessageChain
 from .openai_source import ProviderOpenAIOfficial
-from astrbot.core import logger, sp
-from dashscope import Application
-from dashscope.app.application_response import ApplicationResponse
 
 
 @register_provider_adapter("dashscope", "Dashscope APP 适配器。")
@@ -50,6 +53,7 @@ class ProviderDashscope(ProviderOpenAIOfficial):
 
         Returns:
             bool: 是否有 RAG 选项
+
         """
         if self.rag_options and (
             len(self.rag_options.get("pipeline_ids", [])) > 0
@@ -62,13 +66,15 @@ class ProviderDashscope(ProviderOpenAIOfficial):
         self,
         prompt: str,
         session_id=None,
-        image_urls=[],
+        image_urls=None,
         func_tool=None,
         contexts=None,
         system_prompt=None,
         model=None,
         **kwargs,
     ) -> LLMResponse:
+        if image_urls is None:
+            image_urls = []
         if contexts is None:
             contexts = []
         # 获得会话变量
@@ -127,12 +133,12 @@ class ProviderDashscope(ProviderOpenAIOfficial):
 
         if response.status_code != 200:
             logger.error(
-                f"阿里云百炼请求失败: request_id={response.request_id}, code={response.status_code}, message={response.message}, 请参考文档：https://help.aliyun.com/zh/model-studio/developer-reference/error-code"
+                f"阿里云百炼请求失败: request_id={response.request_id}, code={response.status_code}, message={response.message}, 请参考文档：https://help.aliyun.com/zh/model-studio/developer-reference/error-code",
             )
             return LLMResponse(
                 role="err",
                 result_chain=MessageChain().message(
-                    f"阿里云百炼请求失败: message={response.message} code={response.status_code}"
+                    f"阿里云百炼请求失败: message={response.message} code={response.status_code}",
                 ),
             )
 
@@ -140,14 +146,15 @@ class ProviderDashscope(ProviderOpenAIOfficial):
         # RAG 引用脚标格式化
         output_text = re.sub(r"<ref>\[(\d+)\]</ref>", r"[\1]", output_text)
         if self.output_reference and response.output.get("doc_references", None):
-            ref_str = ""
+            ref_parts = []
             for ref in response.output.get("doc_references", []) or []:
                 ref_title = (
                     ref.get("title", "")
                     if ref.get("title")
                     else ref.get("doc_name", "")
                 )
-                ref_str += f"{ref['index_id']}. {ref_title}\n"
+                ref_parts.append(f"{ref['index_id']}. {ref_title}\n")
+            ref_str = "".join(ref_parts)
             output_text += f"\n\n回答来源:\n{ref_str}"
 
         llm_response = LLMResponse("assistant")