nonebot-plugin-dotcharacter 2.0.4__tar.gz → 2.0.6__tar.gz

{nonebot_plugin_dotcharacter-2.0.4 → nonebot_plugin_dotcharacter-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-dotcharacter
-Version: 2.0.4
+Version: 2.0.6
 Summary: NoneBot 插件：加载 dot-skill / colleague-skill 蒸馏角色，通过 QQ Bot 进行 AI 角色扮演对话
 Author: tghrt
 License: MIT
@@ -20,7 +20,6 @@ Requires-Dist: nonebot2>=2.3.0
 Requires-Dist: nonebot-adapter-onebot>=0.3.0
 Requires-Dist: httpx>=0.24.0
 Requires-Dist: pyyaml>=6.0
-Requires-Dist: nonebot-plugin-localstore>=0.4.0
 Dynamic: license-file
 
 <div align="center">
@@ -65,6 +64,8 @@ _✨ 加载 dot-skill / colleague-skill 蒸馏角色，通过 QQ Bot 进行 AI
 - 💬 群聊 @机器人 触发对话，命令无需 @
 - 👑 管理员权限控制（命令仅管理员可用）
 - 🧠 私聊会话独立，群聊会话按群共享
+- 🔄 LLM API 超时自动重试（3次，指数退避）
+- ⚡ 连接池优化，避免长时间运行后连接失效
 
 ## 💿 安装
 

{nonebot_plugin_dotcharacter-2.0.4 → nonebot_plugin_dotcharacter-2.0.6}/README.md

@@ -40,6 +40,8 @@ _✨ 加载 dot-skill / colleague-skill 蒸馏角色，通过 QQ Bot 进行 AI
 - 💬 群聊 @机器人 触发对话，命令无需 @
 - 👑 管理员权限控制（命令仅管理员可用）
 - 🧠 私聊会话独立，群聊会话按群共享
+- 🔄 LLM API 超时自动重试（3次，指数退避）
+- ⚡ 连接池优化，避免长时间运行后连接失效
 
 ## 💿 安装
 

{nonebot_plugin_dotcharacter-2.0.4 → nonebot_plugin_dotcharacter-2.0.6}/nonebot_plugin_dotcharacter/__init__.py

@@ -25,21 +25,6 @@ from nonebot.permission import Permission
 from nonebot.plugin import PluginMetadata
 from nonebot.rule import Rule
 
-# 本地存储实例（NoneBot 启动后才可用）
-_store = None
-
-
-def _get_store():
-    """懒加载 localstore，仅在 NoneBot 运行时导入。"""
-    global _store
-    if _store is None:
-        try:
-            import nonebot_plugin_localstore as s
-            _store = s
-        except Exception:
-            pass
-    return _store
-
 from .config import get_config, PROVIDER_PRESETS, DotCharacterConfig
 from .character_loader import (
     CharacterMeta,
@@ -74,7 +59,7 @@ __plugin_meta__ = PluginMetadata(
     supported_adapters={"~onebot.v11"},
     extra={
         "author": "tghrt",
-        "version": "2.0.4",
+        "version": "2.0.6",
     },
 )
 
@@ -622,9 +607,16 @@ async def handle_chat(matcher: Matcher, event: Event):
         await matcher.finish(f"❌ {e}")
     except RuntimeError as e:
         logger.error(f"[dotcharacter] LLM 调用失败: {e}")
-        await matcher.finish(
-            f"😵 {char.display_name} 暂时无法回应...\n（API 错误，请稍后再试）"
-        )
+        err_msg = str(e)
+        if "超时" in err_msg or "timeout" in err_msg.lower():
+            await matcher.finish(
+                f"😵 {char.display_name} 响应超时了...\n"
+                f"（API 连不上或太慢，等几秒再试试？）"
+            )
+        else:
+            await matcher.finish(
+                f"😵 {char.display_name} 暂时无法回应...\n（API 错误，请稍后再试）"
+            )
     except Exception as e:
         logger.error(f"[dotcharacter] 未知错误: {e}")
         await matcher.finish(f"😵 出了点问题：{type(e).__name__}")
@@ -646,8 +638,6 @@ driver = get_driver()
 @driver.on_startup
 async def _on_startup():
     logger.info("[dotcharacter] 插件启动中...")
-    # 懒加载 localstore（仅在 NoneBot 环境中可用）
-    _get_store()
     await _ensure_initialized()
     cfg = get_config()
     admins = cfg.get_admin_qqs()

{nonebot_plugin_dotcharacter-2.0.4 → nonebot_plugin_dotcharacter-2.0.6}/nonebot_plugin_dotcharacter/llm_client.py

@@ -4,6 +4,7 @@
 OpenAI / DeepSeek / Kimi / Qwen / Zhipu / SiliconFlow / Groq / Ollama / 自定义
 """
 
+import asyncio
 from typing import List, Optional
 
 import httpx
@@ -36,6 +37,7 @@ async def chat_completion(
 
     自动根据 Provider 预设或自定义 api_base 构造请求 URL。
     兼容所有 OpenAI Chat Completions 格式的 API。
+    支持 3 次重试（指数退避）。
     """
     api_key = config.dotcharacter_api_key
     if not api_key or api_key.startswith("sk-your-"):
@@ -57,22 +59,45 @@ async def chat_completion(
         "max_tokens": max_tokens or config.dotcharacter_max_tokens,
     }
 
-    async with httpx.AsyncClient(timeout=config.dotcharacter_timeout) as client:
-        response = await client.post(url, json=payload, headers=headers)
-
-        if response.status_code != 200:
-            err_detail = response.text[:500]
-            raise RuntimeError(
-                f"LLM API 返回错误 (HTTP {response.status_code}): {err_detail}"
-            )
-
-        data = response.json()
-        choices = data.get("choices", [])
-        if not choices:
-            raise RuntimeError(f"LLM API 返回空 choices: {data}")
-
-        content = choices[0].get("message", {}).get("content", "")
-        return content.strip()
+    max_retries = 3
+    for attempt in range(1, max_retries + 1):
+        try:
+            async with httpx.AsyncClient(
+                timeout=config.dotcharacter_timeout,
+                limits=httpx.Limits(max_connections=20, max_keepalive_connections=10),
+            ) as client:
+                response = await client.post(url, json=payload, headers=headers)
+
+                if response.status_code != 200:
+                    err_detail = response.text[:500]
+                    raise RuntimeError(
+                        f"LLM API 返回错误 (HTTP {response.status_code}): {err_detail}"
+                    )
+
+                data = response.json()
+                choices = data.get("choices", [])
+                if not choices:
+                    raise RuntimeError(f"LLM API 返回空 choices: {data}")
+
+                content = choices[0].get("message", {}).get("content", "")
+                return content.strip()
+
+        except (httpx.TimeoutException, httpx.ReadTimeout, httpx.ConnectTimeout) as e:
+            if attempt == max_retries:
+                raise RuntimeError(
+                    f"LLM API 请求超时（已重试 {max_retries} 次）: {type(e).__name__}"
+                )
+            wait = 2 ** attempt  # 指数退避: 2s, 4s
+            await asyncio.sleep(wait)
+            continue
+
+        except httpx.HTTPStatusError as e:
+            raise RuntimeError(f"LLM API HTTP 错误: {e}")
+        except httpx.RequestError as e:
+            raise RuntimeError(f"LLM API 网络请求失败: {type(e).__name__}: {e}")
+
+    # 理论上不会走到这里
+    raise RuntimeError("LLM API 调用失败，超出最大重试次数")
 
 
 async def test_api_connection(config: DotCharacterConfig) -> bool:

{nonebot_plugin_dotcharacter-2.0.4 → nonebot_plugin_dotcharacter-2.0.6}/nonebot_plugin_dotcharacter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-dotcharacter
-Version: 2.0.4
+Version: 2.0.6
 Summary: NoneBot 插件：加载 dot-skill / colleague-skill 蒸馏角色，通过 QQ Bot 进行 AI 角色扮演对话
 Author: tghrt
 License: MIT
@@ -20,7 +20,6 @@ Requires-Dist: nonebot2>=2.3.0
 Requires-Dist: nonebot-adapter-onebot>=0.3.0
 Requires-Dist: httpx>=0.24.0
 Requires-Dist: pyyaml>=6.0
-Requires-Dist: nonebot-plugin-localstore>=0.4.0
 Dynamic: license-file
 
 <div align="center">
@@ -65,6 +64,8 @@ _✨ 加载 dot-skill / colleague-skill 蒸馏角色，通过 QQ Bot 进行 AI
 - 💬 群聊 @机器人 触发对话，命令无需 @
 - 👑 管理员权限控制（命令仅管理员可用）
 - 🧠 私聊会话独立，群聊会话按群共享
+- 🔄 LLM API 超时自动重试（3次，指数退避）
+- ⚡ 连接池优化，避免长时间运行后连接失效
 
 ## 💿 安装
 

{nonebot_plugin_dotcharacter-2.0.4 → nonebot_plugin_dotcharacter-2.0.6}/nonebot_plugin_dotcharacter.egg-info/requires.txt

@@ -2,4 +2,3 @@ nonebot2>=2.3.0
 nonebot-adapter-onebot>=0.3.0
 httpx>=0.24.0
 pyyaml>=6.0
-nonebot-plugin-localstore>=0.4.0

{nonebot_plugin_dotcharacter-2.0.4 → nonebot_plugin_dotcharacter-2.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-dotcharacter"
-version = "2.0.4"
+version = "2.0.6"
 description = "NoneBot 插件：加载 dot-skill / colleague-skill 蒸馏角色，通过 QQ Bot 进行 AI 角色扮演对话"
 requires-python = ">=3.9"
 readme = "README.md"
@@ -23,7 +23,6 @@ dependencies = [
     "nonebot-adapter-onebot>=0.3.0",
     "httpx>=0.24.0",
     "pyyaml>=6.0",
-    "nonebot-plugin-localstore>=0.4.0",
 ]
 
 [project.entry-points."nonebot"]