AstrBot 3.5.6__py3-none-any.whl → 4.7.0__py3-none-any.whl

astrbot/core/provider/sources/xinference_stt_provider.py

@@ -0,0 +1,197 @@
+import os
+import uuid
+
+import aiohttp
+from xinference_client.client.restful.async_restful_client import (
+    AsyncClient as Client,
+)
+
+from astrbot.core import logger
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+from astrbot.core.utils.tencent_record_helper import tencent_silk_to_wav
+
+from ..entities import ProviderType
+from ..provider import STTProvider
+from ..register import register_provider_adapter
+
+
+@register_provider_adapter(
+    "xinference_stt",
+    "Xinference STT",
+    provider_type=ProviderType.SPEECH_TO_TEXT,
+)
+class ProviderXinferenceSTT(STTProvider):
+    def __init__(self, provider_config: dict, provider_settings: dict) -> None:
+        super().__init__(provider_config, provider_settings)
+        self.provider_config = provider_config
+        self.provider_settings = provider_settings
+        self.base_url = provider_config.get("api_base", "http://127.0.0.1:9997")
+        self.base_url = self.base_url.rstrip("/")
+        self.timeout = provider_config.get("timeout", 180)
+        self.model_name = provider_config.get("model", "whisper-large-v3")
+        self.api_key = provider_config.get("api_key")
+        self.launch_model_if_not_running = provider_config.get(
+            "launch_model_if_not_running",
+            False,
+        )
+        self.client = None
+        self.model_uid = None
+
+    async def initialize(self):
+        if self.api_key:
+            logger.info("Xinference STT: Using API key for authentication.")
+            self.client = Client(self.base_url, api_key=self.api_key)
+        else:
+            logger.info("Xinference STT: No API key provided.")
+            self.client = Client(self.base_url)
+
+        try:
+            running_models = await self.client.list_models()
+            for uid, model_spec in running_models.items():
+                if model_spec.get("model_name") == self.model_name:
+                    logger.info(
+                        f"Model '{self.model_name}' is already running with UID: {uid}",
+                    )
+                    self.model_uid = uid
+                    break
+
+            if self.model_uid is None:
+                if self.launch_model_if_not_running:
+                    logger.info(f"Launching {self.model_name} model...")
+                    self.model_uid = await self.client.launch_model(
+                        model_name=self.model_name,
+                        model_type="audio",
+                    )
+                    logger.info("Model launched.")
+                else:
+                    logger.warning(
+                        f"Model '{self.model_name}' is not running and auto-launch is disabled. Provider will not be available.",
+                    )
+                    return
+
+        except Exception as e:
+            logger.error(f"Failed to initialize Xinference model: {e}")
+            logger.debug(
+                f"Xinference initialization failed with exception: {e}",
+                exc_info=True,
+            )
+
+    async def get_text(self, audio_url: str) -> str:
+        if not self.model_uid or self.client is None or self.client.session is None:
+            logger.error("Xinference STT model is not initialized.")
+            return ""
+
+        audio_bytes = None
+        temp_files = []
+        is_tencent = False
+
+        try:
+            # 1. Get audio bytes
+            if audio_url.startswith("http"):
+                if "multimedia.nt.qq.com.cn" in audio_url:
+                    is_tencent = True
+                async with aiohttp.ClientSession() as session:
+                    async with session.get(audio_url, timeout=self.timeout) as resp:
+                        if resp.status == 200:
+                            audio_bytes = await resp.read()
+                        else:
+                            logger.error(
+                                f"Failed to download audio from {audio_url}, status: {resp.status}",
+                            )
+                            return ""
+            elif os.path.exists(audio_url):
+                with open(audio_url, "rb") as f:
+                    audio_bytes = f.read()
+            else:
+                logger.error(f"File not found: {audio_url}")
+                return ""
+
+            if not audio_bytes:
+                logger.error("Audio bytes are empty.")
+                return ""
+
+            # 2. Check for conversion
+            needs_conversion = False
+            if (
+                audio_url.endswith((".amr", ".silk"))
+                or is_tencent
+                or b"SILK" in audio_bytes[:8]
+            ):
+                needs_conversion = True
+
+            # 3. Perform conversion if needed
+            if needs_conversion:
+                logger.info("Audio requires conversion, using temporary files...")
+                temp_dir = os.path.join(get_astrbot_data_path(), "temp")
+                os.makedirs(temp_dir, exist_ok=True)
+
+                input_path = os.path.join(temp_dir, str(uuid.uuid4()))
+                output_path = os.path.join(temp_dir, str(uuid.uuid4()) + ".wav")
+                temp_files.extend([input_path, output_path])
+
+                with open(input_path, "wb") as f:
+                    f.write(audio_bytes)
+
+                logger.info("Converting silk/amr file to wav ...")
+                await tencent_silk_to_wav(input_path, output_path)
+
+                with open(output_path, "rb") as f:
+                    audio_bytes = f.read()
+
+            # 4. Transcribe
+            # 官方asyncCLient的客户端似乎实现有点问题，这里直接用aiohttp实现openai标准兼容请求，提交issue等待官方修复后再改回来
+            url = f"{self.base_url}/v1/audio/transcriptions"
+            headers = {
+                "accept": "application/json",
+            }
+            if self.client and self.client._headers:
+                headers.update(self.client._headers)
+
+            data = aiohttp.FormData()
+            data.add_field("model", self.model_uid)
+            data.add_field(
+                "file",
+                audio_bytes,
+                filename="audio.wav",
+                content_type="audio/wav",
+            )
+
+            async with self.client.session.post(
+                url,
+                data=data,
+                headers=headers,
+                timeout=self.timeout,
+            ) as resp:
+                if resp.status == 200:
+                    result = await resp.json()
+                    text = result.get("text", "")
+                    logger.debug(f"Xinference STT result: {text}")
+                    return text
+                error_text = await resp.text()
+                logger.error(
+                    f"Xinference STT transcription failed with status {resp.status}: {error_text}",
+                )
+                return ""
+
+        except Exception as e:
+            logger.error(f"Xinference STT failed: {e}")
+            logger.debug(f"Xinference STT failed with exception: {e}", exc_info=True)
+            return ""
+        finally:
+            # 5. Cleanup
+            for temp_file in temp_files:
+                try:
+                    if os.path.exists(temp_file):
+                        os.remove(temp_file)
+                        logger.debug(f"Removed temporary file: {temp_file}")
+                except Exception as e:
+                    logger.error(f"Failed to remove temporary file {temp_file}: {e}")
+
+    async def terminate(self) -> None:
+        """关闭客户端会话"""
+        if self.client:
+            logger.info("Closing Xinference STT client...")
+            try:
+                await self.client.close()
+            except Exception as e:
+                logger.error(f"Failed to close Xinference client: {e}", exc_info=True)

astrbot/core/provider/sources/zhipu_source.py

@@ -1,83 +1,16 @@
-from astrbot.core.db import BaseDatabase
-from astrbot import logger
-from astrbot.core.provider.func_tool_manager import FuncCall
-from typing import List
+# This file was originally created to adapt to glm-4v-flash, which only supports one image in the context.
+# It is no longer specifically adapted to Zhipu's models. To ensure compatibility, this
+
+
 from ..register import register_provider_adapter
-from astrbot.core.provider.entities import LLMResponse
 from .openai_source import ProviderOpenAIOfficial
 
 
-@register_provider_adapter("zhipu_chat_completion", "智浦 Chat Completion 提供商适配器")
+@register_provider_adapter("zhipu_chat_completion", "智谱 Chat Completion 提供商适配器")
 class ProviderZhipu(ProviderOpenAIOfficial):
     def __init__(
         self,
         provider_config: dict,
         provider_settings: dict,
-        db_helper: BaseDatabase,
-        persistant_history=True,
-        default_persona=None,
     ) -> None:
-        super().__init__(
-            provider_config,
-            provider_settings,
-            db_helper,
-            persistant_history,
-            default_persona,
-        )
-
-    async def text_chat(
-        self,
-        prompt: str,
-        session_id: str = None,
-        image_urls: List[str] = None,
-        func_tool: FuncCall = None,
-        contexts=[],
-        system_prompt=None,
-        **kwargs,
-    ) -> LLMResponse:
-        new_record = await self.assemble_context(prompt, image_urls)
-        context_query = []
-
-        context_query = [*contexts, new_record]
-
-        model_cfgs: dict = self.provider_config.get("model_config", {})
-        model = self.get_model()
-        # glm-4v-flash 只支持一张图片
-        if model.lower() == "glm-4v-flash" and image_urls and len(context_query) > 1:
-            logger.debug("glm-4v-flash 只支持一张图片，将只保留最后一张图片")
-            logger.debug(context_query)
-            new_context_query_ = []
-            for i in range(0, len(context_query) - 1, 2):
-                if isinstance(context_query[i].get("content", ""), list):
-                    continue
-                new_context_query_.append(context_query[i])
-                new_context_query_.append(context_query[i + 1])
-            new_context_query_.append(context_query[-1])  # 保留最后一条记录
-            context_query = new_context_query_
-            logger.debug(context_query)
-
-        if system_prompt:
-            context_query.insert(0, {"role": "system", "content": system_prompt})
-
-        payloads = {"messages": context_query, **model_cfgs}
-        try:
-            llm_response = await self._query(payloads, func_tool)
-            return llm_response
-        except Exception as e:
-            if "maximum context length" in str(e):
-                retry_cnt = 10
-                while retry_cnt > 0:
-                    logger.warning(
-                        f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。"
-                    )
-                    try:
-                        self.pop_record(session_id)
-                        llm_response = await self._query(payloads, func_tool)
-                        break
-                    except Exception as e:
-                        if "maximum context length" in str(e):
-                            retry_cnt -= 1
-                        else:
-                            raise e
-            else:
-                raise e
+        super().__init__(provider_config, provider_settings)

astrbot/core/star/__init__.py

@@ -1,32 +1,64 @@
-from .star import StarMetadata
-from .star_manager import PluginManager
-from .context import Context
-from astrbot.core.provider import Provider
-from astrbot.core.utils.command_parser import CommandParserMixin
 from astrbot.core import html_renderer
+from astrbot.core.provider import Provider
 from astrbot.core.star.star_tools import StarTools
+from astrbot.core.utils.command_parser import CommandParserMixin
+
+from .context import Context
+from .star import StarMetadata, star_map, star_registry
+from .star_manager import PluginManager
 
 
 class Star(CommandParserMixin):
     """所有插件（Star）的父类，所有插件都应该继承于这个类"""
 
-    def __init__(self, context: Context):
+    def __init__(self, context: Context, config: dict | None = None):
         StarTools.initialize(context)
         self.context = context
 
+    def __init_subclass__(cls, **kwargs):
+        super().__init_subclass__(**kwargs)
+        if not star_map.get(cls.__module__):
+            metadata = StarMetadata(
+                star_cls_type=cls,
+                module_path=cls.__module__,
+            )
+            star_map[cls.__module__] = metadata
+            star_registry.append(metadata)
+        else:
+            star_map[cls.__module__].star_cls_type = cls
+            star_map[cls.__module__].module_path = cls.__module__
+
     async def text_to_image(self, text: str, return_url=True) -> str:
         """将文本转换为图片"""
-        return await html_renderer.render_t2i(text, return_url=return_url)
+        return await html_renderer.render_t2i(
+            text,
+            return_url=return_url,
+            template_name=self.context._config.get("t2i_active_template"),
+        )
 
-    async def html_render(self, tmpl: str, data: dict, return_url=True) -> str:
+    async def html_render(
+        self,
+        tmpl: str,
+        data: dict,
+        return_url=True,
+        options: dict | None = None,
+    ) -> str:
         """渲染 HTML"""
         return await html_renderer.render_custom_template(
-            tmpl, data, return_url=return_url
+            tmpl,
+            data,
+            return_url=return_url,
+            options=options,
         )
 
+    async def initialize(self):
+        """当插件被激活时会调用这个方法"""
+
     async def terminate(self):
         """当插件被禁用、重载插件时会调用这个方法"""
-        pass
+
+    def __del__(self):
+        """[Deprecated] 当插件被禁用、重载插件时会调用这个方法"""
 
 
-__all__ = ["Star", "StarMetadata", "PluginManager", "Context", "Provider", "StarTools"]
+__all__ = ["Context", "PluginManager", "Provider", "Star", "StarMetadata", "StarTools"]

astrbot/core/star/config.py

@@ -1,22 +1,20 @@
-"""
-此功能已过时，参考 https://astrbot.app/dev/plugin.html#%E6%B3%A8%E5%86%8C%E6%8F%92%E4%BB%B6%E9%85%8D%E7%BD%AE-beta
-"""
+"""此功能已过时，参考 https://astrbot.app/dev/plugin.html#%E6%B3%A8%E5%86%8C%E6%8F%92%E4%BB%B6%E9%85%8D%E7%BD%AE-beta"""
 
-from typing import Union
-import os
 import json
+import os
 
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-def load_config(namespace: str) -> Union[dict, bool]:
-    """
-    从配置文件中加载配置。
+
+def load_config(namespace: str) -> dict | bool:
+    """从配置文件中加载配置。
     namespace: str, 配置的唯一识别符，也就是配置文件的名字。
     返回值: 当配置文件存在时，返回 namespace 对应配置文件的内容dict，否则返回 False。
     """
-    path = f"data/config/{namespace}.json"
+    path = os.path.join(get_astrbot_data_path(), "config", f"{namespace}.json")
     if not os.path.exists(path):
         return False
-    with open(path, "r", encoding="utf-8-sig") as f:
+    with open(path, encoding="utf-8-sig") as f:
         ret = {}
         data = json.load(f)
         for k in data:
@@ -25,8 +23,7 @@ def load_config(namespace: str) -> Union[dict, bool]:
 
 
 def put_config(namespace: str, name: str, key: str, value, description: str):
-    """
-    将配置项写入以namespace为名字的配置文件，如果key不存在于目标配置文件中。当前 value 仅支持 str, int, float, bool, list 类型（暂不支持 dict）。
+    """将配置项写入以namespace为名字的配置文件，如果key不存在于目标配置文件中。当前 value 仅支持 str, int, float, bool, list 类型（暂不支持 dict）。
     namespace: str, 配置的唯一识别符，也就是配置文件的名字。
     name: str, 配置项的显示名字。
     key: str, 配置项的键。
@@ -43,11 +40,14 @@ def put_config(namespace: str, name: str, key: str, value, description: str):
         raise ValueError("key 只支持 str 类型。")
     if not isinstance(value, (str, int, float, bool, list)):
         raise ValueError("value 只支持 str, int, float, bool, list 类型。")
-    path = f"data/config/{namespace}.json"
+
+    config_dir = os.path.join(get_astrbot_data_path(), "config")
+    path = os.path.join(config_dir, f"{namespace}.json")
+
     if not os.path.exists(path):
         with open(path, "w", encoding="utf-8-sig") as f:
             f.write("{}")
-    with open(path, "r", encoding="utf-8-sig") as f:
+    with open(path, encoding="utf-8-sig") as f:
         d = json.load(f)
     assert isinstance(d, dict)
     if key not in d:
@@ -65,16 +65,15 @@ def put_config(namespace: str, name: str, key: str, value, description: str):
 
 
 def update_config(namespace: str, key: str, value):
-    """
-    更新配置文件中的配置项。
+    """更新配置文件中的配置项。
     namespace: str, 配置的唯一识别符，也就是配置文件的名字。
     key: str, 配置项的键。
     value: str, int, float, bool, list, 配置项的值。
     """
-    path = f"data/config/{namespace}.json"
+    path = os.path.join(get_astrbot_data_path(), "config", f"{namespace}.json")
     if not os.path.exists(path):
         raise FileNotFoundError(f"配置文件 {namespace}.json 不存在。")
-    with open(path, "r", encoding="utf-8-sig") as f:
+    with open(path, encoding="utf-8-sig") as f:
         d = json.load(f)
     assert isinstance(d, dict)
     if key not in d: