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

astrbot/core/utils/t2i/network_strategy.py

@@ -1,77 +1,137 @@
-import aiohttp
-import os
+import asyncio
+import logging
+import random
 import ssl
+
+import aiohttp
 import certifi
 
-from . import RenderStrategy
 from astrbot.core.config import VERSION
 from astrbot.core.utils.io import download_image_by_url
+from astrbot.core.utils.t2i.template_manager import TemplateManager
+
+from . import RenderStrategy
 
 ASTRBOT_T2I_DEFAULT_ENDPOINT = "https://t2i.soulter.top/text2img"
 
+logger = logging.getLogger("astrbot")
+
 
 class NetworkRenderStrategy(RenderStrategy):
-    def __init__(self, base_url: str = ASTRBOT_T2I_DEFAULT_ENDPOINT) -> None:
+    def __init__(self, base_url: str | None = None) -> None:
         super().__init__()
         if not base_url:
-            base_url = ASTRBOT_T2I_DEFAULT_ENDPOINT
-        self.BASE_RENDER_URL = base_url
-        self.TEMPLATE_PATH = os.path.join(os.path.dirname(__file__), "template")
+            self.BASE_RENDER_URL = ASTRBOT_T2I_DEFAULT_ENDPOINT
+        else:
+            self.BASE_RENDER_URL = self._clean_url(base_url)
 
-        if self.BASE_RENDER_URL.endswith("/"):
-            self.BASE_RENDER_URL = self.BASE_RENDER_URL[:-1]
-        if not self.BASE_RENDER_URL.endswith("text2img"):
-            self.BASE_RENDER_URL += "/text2img"
+        self.endpoints = [self.BASE_RENDER_URL]
+        self.template_manager = TemplateManager()
 
-    def set_endpoint(self, base_url: str):
-        if not base_url:
-            base_url = ASTRBOT_T2I_DEFAULT_ENDPOINT
-        self.BASE_RENDER_URL = base_url
+    async def initialize(self):
+        if self.BASE_RENDER_URL == ASTRBOT_T2I_DEFAULT_ENDPOINT:
+            asyncio.create_task(self.get_official_endpoints())
 
-        if self.BASE_RENDER_URL.endswith("/"):
-            self.BASE_RENDER_URL = self.BASE_RENDER_URL[:-1]
-        if not self.BASE_RENDER_URL.endswith("text2img"):
-            self.BASE_RENDER_URL += "/text2img"
+    async def get_template(self, name: str = "base") -> str:
+        """通过名称获取文转图 HTML 模板"""
+        return self.template_manager.get_template(name)
+
+    async def get_official_endpoints(self):
+        """获取官方的 t2i 端点列表。"""
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.get(
+                    "https://api.soulter.top/astrbot/t2i-endpoints",
+                ) as resp:
+                    if resp.status == 200:
+                        data = await resp.json()
+                        all_endpoints: list[dict] = data.get("data", [])
+                        self.endpoints = [
+                            ep.get("url")
+                            for ep in all_endpoints
+                            if ep.get("active") and ep.get("url")
+                        ]
+                        logger.info(
+                            f"Successfully got {len(self.endpoints)} official T2I endpoints.",
+                        )
+        except Exception as e:
+            logger.error(f"Failed to get official endpoints: {e}")
+
+    def _clean_url(self, url: str):
+        url = url.removesuffix("/")
+        if not url.endswith("text2img"):
+            url += "/text2img"
+        return url
 
     async def render_custom_template(
-        self, tmpl_str: str, tmpl_data: dict, return_url: bool = True
+        self,
+        tmpl_str: str,
+        tmpl_data: dict,
+        return_url: bool = True,
+        options: dict | None = None,
     ) -> str:
         """使用自定义文转图模板"""
+        default_options = {"full_page": True, "type": "jpeg", "quality": 40}
+        if options:
+            default_options |= options
+
         post_data = {
             "tmpl": tmpl_str,
             "json": return_url,
             "tmpldata": tmpl_data,
-            "options": {
-                "full_page": True,
-                "type": "jpeg",
-                "quality": 40,
-            },
+            "options": default_options,
         }
-        if return_url:
-            ssl_context = ssl.create_default_context(cafile=certifi.where())
-            connector = aiohttp.TCPConnector(ssl=ssl_context)
-            async with aiohttp.ClientSession(
-                trust_env=True, connector=connector
-            ) as session:
-                async with session.post(
-                    f"{self.BASE_RENDER_URL}/generate", json=post_data
-                ) as resp:
-                    ret = await resp.json()
-                    return f"{self.BASE_RENDER_URL}/{ret['data']['id']}"
-        return await download_image_by_url(
-            f"{self.BASE_RENDER_URL}/generate", post=True, post_data=post_data
-        )
 
-    async def render(self, text: str, return_url: bool = False) -> str:
-        """
-        返回图像的文件路径
-        """
-        with open(
-            os.path.join(self.TEMPLATE_PATH, "base.html"), "r", encoding="utf-8"
-        ) as f:
-            tmpl_str = f.read()
-        assert tmpl_str
+        endpoints = self.endpoints.copy() if self.endpoints else [self.BASE_RENDER_URL]
+        random.shuffle(endpoints)
+        last_exception = None
+        for endpoint in endpoints:
+            try:
+                if return_url:
+                    ssl_context = ssl.create_default_context(cafile=certifi.where())
+                    connector = aiohttp.TCPConnector(ssl=ssl_context)
+                    async with (
+                        aiohttp.ClientSession(
+                            trust_env=True,
+                            connector=connector,
+                        ) as session,
+                        session.post(
+                            f"{endpoint}/generate",
+                            json=post_data,
+                        ) as resp,
+                    ):
+                        if resp.status == 200:
+                            ret = await resp.json()
+                            return f"{endpoint}/{ret['data']['id']}"
+                        raise Exception(f"HTTP {resp.status}")
+                else:
+                    # download_image_by_url 失败时抛异常
+                    return await download_image_by_url(
+                        f"{endpoint}/generate",
+                        post=True,
+                        post_data=post_data,
+                    )
+            except Exception as e:
+                last_exception = e
+                logger.warning(f"Endpoint {endpoint} failed: {e}, trying next...")
+                continue
+        # 全部失败
+        logger.error(f"All endpoints failed: {last_exception}")
+        raise RuntimeError(f"All endpoints failed: {last_exception}")
+
+    async def render(
+        self,
+        text: str,
+        return_url: bool = False,
+        template_name: str | None = "base",
+    ) -> str:
+        """返回图像的文件路径"""
+        if not template_name:
+            template_name = "base"
+        tmpl_str = await self.get_template(name=template_name)
         text = text.replace("`", "\\`")
         return await self.render_custom_template(
-            tmpl_str, {"text": text, "version": f"v{VERSION}"}, return_url
+            tmpl_str,
+            {"text": text, "version": f"v{VERSION}"},
+            return_url,
         )

astrbot/core/utils/t2i/renderer.py

@@ -1,45 +1,60 @@
-from .network_strategy import NetworkRenderStrategy
-from .local_strategy import LocalRenderStrategy
 from astrbot.core.log import LogManager
 
+from .local_strategy import LocalRenderStrategy
+from .network_strategy import NetworkRenderStrategy
+
 logger = LogManager.GetLogger(log_name="astrbot")
 
 
 class HtmlRenderer:
-    def __init__(self, endpoint_url: str = None):
+    def __init__(self, endpoint_url: str | None = None):
         self.network_strategy = NetworkRenderStrategy(endpoint_url)
         self.local_strategy = LocalRenderStrategy()
 
-    def set_network_endpoint(self, endpoint_url: str):
-        """设置 t2i 的网络端点。"""
-        logger.info("文本转图像服务接口: " + endpoint_url)
-        self.network_strategy.set_endpoint(endpoint_url)
+    async def initialize(self):
+        await self.network_strategy.initialize()
 
     async def render_custom_template(
-        self, tmpl_str: str, tmpl_data: dict, return_url: bool = False
+        self,
+        tmpl_str: str,
+        tmpl_data: dict,
+        return_url: bool = False,
+        options: dict | None = None,
     ):
         """使用自定义文转图模板。该方法会通过网络调用 t2i 终结点图文渲染API。
         @param tmpl_str: HTML Jinja2 模板。
         @param tmpl_data: jinja2 模板数据。
+        @param options: 渲染选项。
 
         @return: 图片 URL 或者文件路径，取决于 return_url 参数。
 
         @example: 参见 https://astrbot.app 插件开发部分。
         """
-        local = locals()
-        local.pop("self")
-        return await self.network_strategy.render_custom_template(**local)
+        return await self.network_strategy.render_custom_template(
+            tmpl_str,
+            tmpl_data,
+            return_url,
+            options,
+        )
 
     async def render_t2i(
-        self, text: str, use_network: bool = True, return_url: bool = False
+        self,
+        text: str,
+        use_network: bool = True,
+        return_url: bool = False,
+        template_name: str | None = None,
     ):
         """使用默认文转图模板。"""
         if use_network:
             try:
-                return await self.network_strategy.render(text, return_url=return_url)
+                return await self.network_strategy.render(
+                    text,
+                    return_url=return_url,
+                    template_name=template_name,
+                )
             except BaseException as e:
                 logger.error(
-                    f"Failed to render image via AstrBot API: {e}. Falling back to local rendering."
+                    f"Failed to render image via AstrBot API: {e}. Falling back to local rendering.",
                 )
                 return await self.local_strategy.render(text)
         else:

astrbot/core/utils/t2i/template/astrbot_powershell.html

@@ -0,0 +1,184 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>Astrbot PowerShell {{ version }} </title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.10/dist/katex.min.css" integrity="sha384-wcIxkf4k558AjM3Yz3BBFQUbk/zgIYC2R0QpeeYb+TwlBVMrlgLqwRjRtGZiK7ww" crossorigin="anonymous">
+  <script src="https://cdn.jsdelivr.net/npm/highlight.js@11.9.0/lib/common.min.js"></script>
+  <script>hljs.highlightAll();</script>
+  <script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.10/dist/katex.min.js" integrity="sha384-hIoBPJpTUs74ddyc4bFZSM1TVlQDA60VBbJS0oA934VSz82sBx1X7kSx2ATBDIyd" crossorigin="anonymous"></script>
+  <script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.10/dist/contrib/auto-render.min.js" integrity="sha384-43gviWU0YVjaDtb/GhzOouOXtZMP/7XUzwPTstBeZFe/+rCMvRwr4yROQP43s0Xk" crossorigin="anonymous"
+      onload="renderMathInElement(document.getElementById('content'),{delimiters: [{left: '$$', right: '$$', display: true},{left: '$', right: '$', display: false}]});"></script>
+  <style>
+    :root {
+        --bg-color: #010409;
+        --text-color: #e6edf3;
+        --title-bar-color: #161b22;
+        --title-text-color: #e6edf3;
+        --font-family: 'Consolas', 'Microsoft YaHei Mono', 'Dengxian Mono', 'Courier New', monospace;
+        --glow-color: rgba(200, 220, 255, 0.7);
+    }
+
+    @keyframes scanline {
+        0% {
+            background-position: 0 0;
+        }
+        100% {
+            background-position: 0 100%;
+        }
+    }
+
+    body {
+        background-color: var(--bg-color);
+        color: var(--text-color);
+        font-family: var(--font-family);
+        margin: 0;
+        padding: 0;
+        line-height: 1.6;
+        font-size: 18px;
+        /* The CRT glow effect from the image */
+        text-shadow: 0 0 15px var(--glow-color), 0 0 7px rgba(255, 255, 255, 1);
+        position: relative;
+        overflow: hidden;
+    }
+
+    body::after {
+        content: " ";
+        display: block;
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: linear-gradient(to bottom, transparent 50%, rgba(0, 0, 0, 0.3) 50%);
+        background-size: 100% 4px;
+        z-index: 2;
+        pointer-events: none;
+        animation: scanline 8s linear infinite;
+    }
+
+    .header {
+        background-color: var(--title-bar-color);
+        padding: 12px 18px;
+        color: var(--title-text-color);
+        font-size: 16px;
+        border-bottom: 1px solid #30363d;
+        text-shadow: none; /* No glow for title bar */
+    }
+    
+    .header .title {
+        font-weight: bold;
+        font-size: 28px;
+    }
+
+    .header .version {
+        opacity: 0.8;
+        margin-left: 1rem;
+    }
+
+    main {
+        padding: 1rem 1.5rem;
+    }
+
+    #content {
+        /* min-width and max-width removed as per request */
+    }
+
+    /* --- Markdown Styles adjusted for terminal look --- */
+    h1, h2, h3, h4, h5, h6 {
+        line-height: 1.4;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        padding-bottom: 5px;
+        border-bottom: 1px solid #30363d;
+        color: var(--text-color);
+    }
+    h1 { font-size: 2rem; }
+    h2 { font-size: 1.7rem; }
+    h3 { font-size: 1.4rem; }
+
+    p {
+        margin-top: 1rem;
+        margin-bottom: 1rem;
+    }
+
+    strong {
+      color: var(--text-color);
+      font-weight: bold;
+    }
+
+    img {
+        max-width: 100%;
+        border: 1px solid #30363d;
+        display: block;
+        margin: 1rem auto;
+    }
+
+    hr {
+        border: 0;
+        border-top: 1px dashed #30363d;
+        margin: 2rem 0;
+    }
+
+    code {
+        font-family: var(--font-family);
+        padding: 0.2em 0.4em;
+        margin: 0;
+        font-size: 90%;
+        background-color: #161b22;
+        border-radius: 4px;
+    }
+
+    pre {
+        font-family: var(--font-family);
+        border-radius: 4px;
+        background: #0d1117;
+        padding: 1rem;
+        overflow-x: auto;
+        border: 1px solid #30363d;
+    }
+
+    pre > code {
+        padding: 0;
+        margin: 0;
+        font-size: 100%;
+        background-color: transparent;
+        border-radius: 0;
+        text-shadow: none; /* Disable glow inside code blocks for clarity */
+    }
+
+    a {
+        color: #58a6ff;
+        text-decoration: underline;
+    }
+    a:hover {
+        text-decoration: underline;
+    }
+
+    blockquote {
+        border-left: 4px solid #30363d;
+        padding: 0.5rem 1rem;
+        margin: 1.5rem 0;
+        color: #8b949e;
+        background-color: #161b22;
+    }
+  </style>
+</head>
+<body>
+
+  <div class="header">
+    <span class="title">> Astrbot PowerShell</span>
+    <span class="version">{{ version }}</span>
+  </div>
+
+  <main>
+    <div id="content"></div>
+  </main>
+
+  <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+  <script>
+    document.getElementById('content').innerHTML = marked.parse(`{{ text | safe }}`);
+  </script>
+
+</body>
+</html>

astrbot/core/utils/t2i/template_manager.py

@@ -0,0 +1,111 @@
+# astrbot/core/utils/t2i/template_manager.py
+
+import os
+import shutil
+
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path, get_astrbot_path
+
+
+class TemplateManager:
+    """负责管理 t2i HTML 模板的 CRUD 和重置操作。
+    采用“用户覆盖内置”策略：用户模板存储在 data 目录中，并优先于内置模板加载。
+    所有创建、更新、删除操作仅影响用户目录，以确保更新框架时用户数据安全。
+    """
+
+    CORE_TEMPLATES = ["base.html", "astrbot_powershell.html"]
+
+    def __init__(self):
+        self.builtin_template_dir = os.path.join(
+            get_astrbot_path(),
+            "astrbot",
+            "core",
+            "utils",
+            "t2i",
+            "template",
+        )
+        self.user_template_dir = os.path.join(get_astrbot_data_path(), "t2i_templates")
+
+        os.makedirs(self.user_template_dir, exist_ok=True)
+        self._initialize_user_templates()
+
+    def _copy_core_templates(self, overwrite: bool = False):
+        """从内置目录复制核心模板到用户目录。"""
+        for filename in self.CORE_TEMPLATES:
+            src = os.path.join(self.builtin_template_dir, filename)
+            dst = os.path.join(self.user_template_dir, filename)
+            if os.path.exists(src) and (overwrite or not os.path.exists(dst)):
+                shutil.copyfile(src, dst)
+
+    def _initialize_user_templates(self):
+        """如果用户目录下缺少核心模板，则进行复制。"""
+        self._copy_core_templates(overwrite=False)
+
+    def _get_user_template_path(self, name: str) -> str:
+        """获取用户模板的完整路径，防止路径遍历漏洞。"""
+        if ".." in name or "/" in name or "\\" in name:
+            raise ValueError("模板名称包含非法字符。")
+        return os.path.join(self.user_template_dir, f"{name}.html")
+
+    def _read_file(self, path: str) -> str:
+        """读取文件内容。"""
+        with open(path, encoding="utf-8") as f:
+            return f.read()
+
+    def list_templates(self) -> list[dict]:
+        """列出所有可用模板。
+        该列表是内置模板和用户模板的合并视图，用户模板将覆盖同名的内置模板。
+        """
+        dirs_to_scan = [self.builtin_template_dir, self.user_template_dir]
+        all_names = {
+            os.path.splitext(f)[0]
+            for d in dirs_to_scan
+            for f in os.listdir(d)
+            if f.endswith(".html")
+        }
+        return [
+            {"name": name, "is_default": name == "base"} for name in sorted(all_names)
+        ]
+
+    def get_template(self, name: str) -> str:
+        """获取指定模板的内容。
+        优先从用户目录加载，如果不存在则回退到内置目录。
+        """
+        user_path = self._get_user_template_path(name)
+        if os.path.exists(user_path):
+            return self._read_file(user_path)
+
+        builtin_path = os.path.join(self.builtin_template_dir, f"{name}.html")
+        if os.path.exists(builtin_path):
+            return self._read_file(builtin_path)
+
+        raise FileNotFoundError("模板不存在。")
+
+    def create_template(self, name: str, content: str):
+        """在用户目录中创建一个新的模板文件。"""
+        path = self._get_user_template_path(name)
+        if os.path.exists(path):
+            raise FileExistsError("同名模板已存在。")
+        with open(path, "w", encoding="utf-8") as f:
+            f.write(content)
+
+    def update_template(self, name: str, content: str):
+        """更新一个模板。此操作始终写入用户目录。
+        如果更新的是一个内置模板，此操作实际上会在用户目录中创建一个修改后的副本，
+        从而实现对内置模板的“覆盖”。
+        """
+        path = self._get_user_template_path(name)
+        with open(path, "w", encoding="utf-8") as f:
+            f.write(content)
+
+    def delete_template(self, name: str):
+        """仅删除用户目录中的模板文件。
+        如果删除的是一个覆盖了内置模板的用户模板，这将有效地“恢复”到内置版本。
+        """
+        path = self._get_user_template_path(name)
+        if not os.path.exists(path):
+            raise FileNotFoundError("用户模板不存在，无法删除。")
+        os.remove(path)
+
+    def reset_default_template(self):
+        """将核心模板从内置目录强制重置到用户目录。"""
+        self._copy_core_templates(overwrite=True)

astrbot/core/utils/tencent_record_helper.py

@@ -1,6 +1,14 @@
+import asyncio
+import base64
+import os
+import subprocess
+import tempfile
 import wave
 from io import BytesIO
 
+from astrbot.core import logger
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+
 
 async def tencent_silk_to_wav(silk_path: str, output_path: str) -> str:
     import pysilk
@@ -28,7 +36,7 @@ async def wav_to_tencent_silk(wav_path: str, output_path: str) -> int:
         import pilk
     except (ImportError, ModuleNotFoundError) as _:
         raise Exception(
-            "pilk 模块未安装，请前往管理面板->控制台->安装pip库 安装 pilk 这个库"
+            "pilk 模块未安装，请前往管理面板->控制台->安装pip库 安装 pilk 这个库",
         )
     # with wave.open(wav_path, 'rb') as wav:
     #     wav_data = wav.readframes(wav.getnframes())
@@ -50,3 +58,109 @@ async def wav_to_tencent_silk(wav_path: str, output_path: str) -> int:
         rate = wav.getframerate()
         duration = pilk.encode(wav_path, output_path, pcm_rate=rate, tencent=True)
         return duration
+
+
+async def convert_to_pcm_wav(input_path: str, output_path: str) -> str:
+    """将 MP3 或其他音频格式转换为 PCM 16bit WAV，采样率24000Hz，单声道。
+    若转换失败则抛出异常。
+    """
+    try:
+        from pyffmpeg import FFmpeg
+
+        ff = FFmpeg()
+        ff.convert(input=input_path, output=output_path)
+    except Exception as e:
+        logger.debug(f"pyffmpeg 转换失败: {e}, 尝试使用 ffmpeg 命令行进行转换")
+
+        p = await asyncio.create_subprocess_exec(
+            "ffmpeg",
+            "-y",
+            "-i",
+            input_path,
+            "-acodec",
+            "pcm_s16le",
+            "-ar",
+            "24000",
+            "-ac",
+            "1",
+            "-af",
+            "apad=pad_dur=2",
+            "-fflags",
+            "+genpts",
+            "-hide_banner",
+            output_path,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+        stdout, stderr = await p.communicate()
+        logger.info(f"[FFmpeg] stdout: {stdout.decode().strip()}")
+        logger.debug(f"[FFmpeg] stderr: {stderr.decode().strip()}")
+        logger.info(f"[FFmpeg] return code: {p.returncode}")
+
+    if os.path.exists(output_path) and os.path.getsize(output_path) > 0:
+        return output_path
+    raise RuntimeError("生成的WAV文件不存在或为空")
+
+
+async def audio_to_tencent_silk_base64(audio_path: str) -> tuple[str, float]:
+    """将 MP3/WAV 文件转为 Tencent Silk 并返回 base64 编码与时长（秒）。
+
+    参数:
+    - audio_path: 输入音频文件路径（.mp3 或 .wav）
+
+    返回:
+    - silk_b64: Base64 编码的 Silk 字符串
+    - duration: 音频时长（秒）
+    """
+    try:
+        import pilk
+    except ImportError as e:
+        raise Exception("未安装 pilk: pip install pilk") from e
+
+    temp_dir = os.path.join(get_astrbot_data_path(), "temp")
+    os.makedirs(temp_dir, exist_ok=True)
+
+    # 是否需要转换为 WAV
+    ext = os.path.splitext(audio_path)[1].lower()
+    temp_wav = tempfile.NamedTemporaryFile(
+        suffix=".wav",
+        delete=False,
+        dir=temp_dir,
+    ).name
+
+    if ext != ".wav":
+        await convert_to_pcm_wav(audio_path, temp_wav)
+        # 删除原文件
+        os.remove(audio_path)
+        wav_path = temp_wav
+    else:
+        wav_path = audio_path
+
+    with wave.open(wav_path, "rb") as wav_file:
+        rate = wav_file.getframerate()
+
+    silk_path = tempfile.NamedTemporaryFile(
+        suffix=".silk",
+        delete=False,
+        dir=temp_dir,
+    ).name
+
+    try:
+        duration = await asyncio.to_thread(
+            pilk.encode,
+            wav_path,
+            silk_path,
+            pcm_rate=rate,
+            tencent=True,
+        )
+
+        with open(silk_path, "rb") as f:
+            silk_bytes = await asyncio.to_thread(f.read)
+            silk_b64 = base64.b64encode(silk_bytes).decode("utf-8")
+
+        return silk_b64, duration  # 已是秒
+    finally:
+        if os.path.exists(wav_path) and wav_path != audio_path:
+            os.remove(wav_path)
+        if os.path.exists(silk_path):
+            os.remove(silk_path)