AstrBot 4.10.3__py3-none-any.whl → 4.10.4__py3-none-any.whl

astrbot/core/provider/sources/openai_source.py

@@ -74,28 +74,6 @@ class ProviderOpenAIOfficial(Provider):
 
         self.reasoning_key = "reasoning_content"
 
-    def _maybe_inject_xai_search(self, payloads: dict, **kwargs):
-        """当开启 xAI 原生搜索时，向请求体注入 Live Search 参数。
-
-        - 仅在 provider_config.xai_native_search 为 True 时生效
-        - 默认注入 {"mode": "auto"}
-        - 允许通过 kwargs 使用 xai_search_mode 覆盖（on/auto/off）
-        """
-        if not bool(self.provider_config.get("xai_native_search", False)):
-            return
-
-        mode = kwargs.get("xai_search_mode", "auto")
-        mode = str(mode).lower()
-        if mode not in ("auto", "on", "off"):
-            mode = "auto"
-
-        # off 时不注入，保持与未开启一致
-        if mode == "off":
-            return
-
-        # OpenAI SDK 不识别的字段会在 _query/_query_stream 中放入 extra_body
-        payloads["search_parameters"] = {"mode": mode}
-
     async def get_models(self):
         try:
             models_str = []
@@ -134,10 +112,6 @@ class ProviderOpenAIOfficial(Provider):
 
         model = payloads.get("model", "").lower()
 
-        # 针对 deepseek 模型的特殊处理：deepseek-reasoner调用必须移除 tools ，否则将被切换至 deepseek-chat
-        if model == "deepseek-reasoner" and "tools" in payloads:
-            del payloads["tools"]
-
         completion = await self.client.chat.completions.create(
             **payloads,
             stream=False,
@@ -251,10 +225,14 @@ class ProviderOpenAIOfficial(Provider):
     def _extract_usage(self, usage: CompletionUsage) -> TokenUsage:
         ptd = usage.prompt_tokens_details
         cached = ptd.cached_tokens if ptd and ptd.cached_tokens else 0
+        prompt_tokens = 0 if usage.prompt_tokens is None else usage.prompt_tokens
+        completion_tokens = (
+            0 if usage.completion_tokens is None else usage.completion_tokens
+        )
         return TokenUsage(
-            input_other=usage.prompt_tokens - cached,
-            input_cached=ptd.cached_tokens if ptd and ptd.cached_tokens else 0,
-            output=usage.completion_tokens,
+            input_other=prompt_tokens - cached,
+            input_cached=cached,
+            output=completion_tokens,
         )
 
     async def _parse_openai_completion(
@@ -381,11 +359,27 @@ class ProviderOpenAIOfficial(Provider):
 
         payloads = {"messages": context_query, "model": model}
 
-        # xAI origin search tool inject
-        self._maybe_inject_xai_search(payloads, **kwargs)
+        self._finally_convert_payload(payloads)
 
         return payloads, context_query
 
+    def _finally_convert_payload(self, payloads: dict):
+        """Finally convert the payload. Such as think part conversion, tool inject."""
+        for message in payloads.get("messages", []):
+            if message.get("role") == "assistant" and isinstance(
+                message.get("content"), list
+            ):
+                reasoning_content = ""
+                new_content = []  # not including think part
+                for part in message["content"]:
+                    if part.get("type") == "think":
+                        reasoning_content += str(part.get("think"))
+                    else:
+                        new_content.append(part)
+                message["content"] = new_content
+                # reasoning key is "reasoning_content"
+                message["reasoning_content"] = reasoning_content
+
     async def _handle_api_error(
         self,
         e: Exception,

astrbot/core/provider/sources/xai_source.py

@@ -0,0 +1,29 @@
+from ..register import register_provider_adapter
+from .openai_source import ProviderOpenAIOfficial
+
+
+@register_provider_adapter(
+    "xai_chat_completion", "xAI Chat Completion Provider Adapter"
+)
+class ProviderXAI(ProviderOpenAIOfficial):
+    def __init__(
+        self,
+        provider_config: dict,
+        provider_settings: dict,
+    ) -> None:
+        super().__init__(provider_config, provider_settings)
+
+    def _maybe_inject_xai_search(self, payloads: dict):
+        """当开启 xAI 原生搜索时，向请求体注入 Live Search 参数。
+
+        - 仅在 provider_config.xai_native_search 为 True 时生效
+        - 默认注入 {"mode": "auto"}
+        """
+        if not bool(self.provider_config.get("xai_native_search", False)):
+            return
+        # OpenAI SDK 不识别的字段会在 _query/_query_stream 中放入 extra_body
+        payloads["search_parameters"] = {"mode": "auto"}
+
+    def _finally_convert_payload(self, payloads: dict):
+        self._maybe_inject_xai_search(payloads)
+        super()._finally_convert_payload(payloads)

astrbot/core/provider/sources/xinference_stt_provider.py

@@ -8,7 +8,10 @@ from xinference_client.client.restful.async_restful_client import (
 
 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 astrbot.core.utils.tencent_record_helper import (
+    convert_to_pcm_wav,
+    tencent_silk_to_wav,
+)
 
 from ..entities import ProviderType
 from ..provider import STTProvider
@@ -111,17 +114,22 @@ class ProviderXinferenceSTT(STTProvider):
                 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
+            conversion_type = None
+
+            if b"SILK" in audio_bytes[:8]:
+                conversion_type = "silk"
+            elif b"#!AMR" in audio_bytes[:6]:
+                conversion_type = "amr"
+            elif audio_url.endswith(".silk") or is_tencent:
+                conversion_type = "silk"
+            elif audio_url.endswith(".amr"):
+                conversion_type = "amr"
 
             # 3. Perform conversion if needed
-            if needs_conversion:
-                logger.info("Audio requires conversion, using temporary files...")
+            if conversion_type:
+                logger.info(
+                    f"Audio requires conversion ({conversion_type}), using temporary files..."
+                )
                 temp_dir = os.path.join(get_astrbot_data_path(), "temp")
                 os.makedirs(temp_dir, exist_ok=True)
 
@@ -132,8 +140,12 @@ class ProviderXinferenceSTT(STTProvider):
                 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)
+                if conversion_type == "silk":
+                    logger.info("Converting silk to wav ...")
+                    await tencent_silk_to_wav(input_path, output_path)
+                elif conversion_type == "amr":
+                    logger.info("Converting amr to wav ...")
+                    await convert_to_pcm_wav(input_path, output_path)
 
                 with open(output_path, "rb") as f:
                     audio_bytes = f.read()

astrbot/core/star/star_manager.py

@@ -944,8 +944,49 @@ class PluginManager:
         dir_name = os.path.basename(zip_file_path).replace(".zip", "")
         dir_name = dir_name.removesuffix("-master").removesuffix("-main").lower()
         desti_dir = os.path.join(self.plugin_store_path, dir_name)
+
+        # 第一步：检查是否已安装同目录名的插件，先终止旧插件
+        existing_plugin = None
+        for star in self.context.get_all_stars():
+            if star.root_dir_name == dir_name:
+                existing_plugin = star
+                break
+
+        if existing_plugin:
+            logger.info(f"检测到插件 {existing_plugin.name} 已安装，正在终止旧插件...")
+            try:
+                await self._terminate_plugin(existing_plugin)
+            except Exception:
+                logger.warning(traceback.format_exc())
+            if existing_plugin.name and existing_plugin.module_path:
+                await self._unbind_plugin(
+                    existing_plugin.name, existing_plugin.module_path
+                )
+
         self.updator.unzip_file(zip_file_path, desti_dir)
 
+        # 第二步：解压后，读取新插件的 metadata.yaml，检查是否存在同名但不同目录的插件
+        try:
+            new_metadata = self._load_plugin_metadata(desti_dir)
+            if new_metadata and new_metadata.name:
+                for star in self.context.get_all_stars():
+                    if (
+                        star.name == new_metadata.name
+                        and star.root_dir_name != dir_name
+                    ):
+                        logger.warning(
+                            f"检测到同名插件 {star.name} 存在于不同目录 {star.root_dir_name}，正在终止..."
+                        )
+                        try:
+                            await self._terminate_plugin(star)
+                        except Exception:
+                            logger.warning(traceback.format_exc())
+                        if star.name and star.module_path:
+                            await self._unbind_plugin(star.name, star.module_path)
+                        break  # 只处理第一个匹配的
+        except Exception as e:
+            logger.debug(f"读取新插件 metadata.yaml 失败，跳过同名检查: {e!s}")
+
         # remove the zip
         try:
             os.remove(zip_file_path)

astrbot/core/utils/pip_installer.py

@@ -1,10 +1,29 @@
 import asyncio
+import locale
 import logging
 import sys
 
 logger = logging.getLogger("astrbot")
 
 
+def _robust_decode(line: bytes) -> str:
+    """解码字节流，兼容不同平台的编码"""
+    try:
+        return line.decode("utf-8").strip()
+    except UnicodeDecodeError:
+        pass
+    try:
+        return line.decode(locale.getpreferredencoding(False)).strip()
+    except UnicodeDecodeError:
+        pass
+    if sys.platform.startswith("win"):
+        try:
+            return line.decode("gbk").strip()
+        except UnicodeDecodeError:
+            pass
+    return line.decode("utf-8", errors="replace").strip()
+
+
 class PipInstaller:
     def __init__(self, pip_install_arg: str, pypi_index_url: str | None = None):
         self.pip_install_arg = pip_install_arg
@@ -42,7 +61,7 @@ class PipInstaller:
 
             assert process.stdout is not None
             async for line in process.stdout:
-                logger.info(line.decode().strip())
+                logger.info(_robust_decode(line))
 
             await process.wait()