-
-
-[](https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/018e705a-a1a7-409a-a849-3013485e6c8e)
-
-[](https://codecov.io/gh/Soulter/AstrBot)
-[](https://gitcode.com/Soulter/AstrBot)
+[](https://github.com/Soulter/AstrBot/releases/latest)
+
+
+
+[](https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/018e705a-a1a7-409a-a849-3013485e6c8e)
+
+[](https://codecov.io/gh/Soulter/AstrBot)
English ｜
日本語 ｜
@@ -27,6 +26,8 @@ _✨ 易上手的多平台 LLM 聊天机器人及开发框架 ✨_
AstrBot 是一个松耦合、异步、支持多消息平台部署、具有易用的插件系统和完善的大语言模型（LLM）接入功能的聊天机器人及开发框架。
+[](https://gitcode.com/Soulter/AstrBot)
+
## ✨ 主要功能
1. **大语言模型对话**。支持各种大语言模型，包括 OpenAI API、Google Gemini、Llama、Deepseek、ChatGLM 等，支持接入本地部署的大模型，通过 Ollama、LLMTuner。具有多轮对话、人格情境、多模态能力，支持图片理解、语音转文字（Whisper）。
@@ -51,15 +52,19 @@ AstrBot 是一个松耦合、异步、支持多消息平台部署、具有易用
需要电脑上安装有 Python（>3.10）。请参阅官方文档 [使用 Windows 一键安装器部署 AstrBot](https://astrbot.app/deploy/astrbot/windows.html) 。
-#### Replit 部署
+#### 宝塔面板部署
-[](https://repl.it/github/Soulter/AstrBot)
+请参阅官方文档 [宝塔面板部署](https://astrbot.app/deploy/astrbot/btpanel.html) 。
#### CasaOS 部署
社区贡献的部署方式。
-请参阅官方文档 [通过源码部署 AstrBot](https://astrbot.app/deploy/astrbot/casaos.html) 。
+请参阅官方文档 [CasaOS 部署](https://astrbot.app/deploy/astrbot/casaos.html) 。
+
+#### Replit 部署
+
+[](https://repl.it/github/Soulter/AstrBot)
#### 手动部署
@@ -106,6 +111,7 @@ AstrBot 是一个松耦合、异步、支持多消息平台部署、具有易用
| Whisper | ✔ | 语音转文本 | 支持 API、本地部署 |
| SenseVoice | ✔ | 语音转文本 | 本地部署 |
| OpenAI TTS API | ✔ | 文本转语音 | |
+| GSVI | ✔ | 文本转语音 | GPT-Sovits-Inference |
| Fishaudio | ✔ | 文本转语音 | GPT-Sovits 作者参与的项目 |
| Edge-TTS | ✔ | 文本转语音 | Edge 浏览器的免费 TTS |
diff --git a/astrbot/api/platform/__init__.py b/astrbot/api/platform/__init__.py
index dcc02bb49..5a98c5903 100644
--- a/astrbot/api/platform/__init__.py
+++ b/astrbot/api/platform/__init__.py
@@ -5,6 +5,7 @@ from astrbot.core.platform import (
MessageMember,
MessageType,
PlatformMetadata,
+ Group,
)
from astrbot.core.platform.register import register_platform_adapter
@@ -18,4 +19,5 @@ __all__ = [
"MessageType",
"PlatformMetadata",
"register_platform_adapter",
+ "Group",
]
diff --git a/astrbot/core/config/default.py b/astrbot/core/config/default.py
index 280c841d0..7db7ff5f7 100644
--- a/astrbot/core/config/default.py
+++ b/astrbot/core/config/default.py
@@ -2,7 +2,7 @@
如需修改配置，请在 `data/cmd_config.json` 中修改或者在管理面板中可视化修改。
"""
-VERSION = "3.4.37"
+VERSION = "3.4.39"
DB_PATH = "data/data_v3.db"
# 默认配置
@@ -85,7 +85,7 @@ DEFAULT_CONFIG = {
"enable": True,
"username": "astrbot",
"password": "77b90590a8945a7d36c963981a307dc9",
- "host": "127.0.0.1",
+ "host": "0.0.0.0",
"port": 6185,
},
"platform": [],
@@ -223,7 +223,7 @@ CONFIG_METADATA_2 = {
"hint": "启用后，机器人可以接收到频道的私聊消息。",
},
"ws_reverse_host": {
- "description": "反向 Websocket 主机地址",
+ "description": "反向 Websocket 主机地址(AstrBot 为服务器端)",
"type": "string",
"hint": "aiocqhttp 适配器的反向 Websocket 服务器 IP 地址，不包含端口号。",
},
@@ -581,7 +581,7 @@ CONFIG_METADATA_2 = {
"dify_api_type": "chat",
"dify_api_key": "",
"dify_api_base": "https://api.dify.ai/v1",
- "dify_workflow_output_key": "",
+ "dify_workflow_output_key": "astrbot_wf_output",
"dify_query_input_key": "astrbot_text_query",
"variables": {},
"timeout": 60,
@@ -593,6 +593,11 @@ CONFIG_METADATA_2 = {
"dashscope_app_type": "agent",
"dashscope_api_key": "",
"dashscope_app_id": "",
+ "rag_options": {
+ "pipeline_ids": [],
+ "file_ids": [],
+ "output_reference": False,
+ },
"variables": {},
"timeout": 60,
},
@@ -665,6 +670,30 @@ CONFIG_METADATA_2 = {
},
},
"items": {
+ "rag_options": {
+ "description": "RAG 选项",
+ "type": "object",
+ "hint": "检索知识库设置, 非必填。仅 Agent 应用类型支持(智能体应用, 包括 RAG 应用)",
+ "items": {
+ "pipeline_ids": {
+ "description": "知识库 ID 列表",
+ "type": "list",
+ "items": {"type": "string"},
+ "hint": "对指定知识库内所有文档进行检索, 前往 https://bailian.console.aliyun.com/ 数据应用->知识索引创建和获取 ID。",
+ },
+ "file_ids": {
+ "description": "非结构化文档 ID, 传入该参数将对指定非结构化文档进行检索。",
+ "type": "list",
+ "items": {"type": "string"},
+ "hint": "对指定非结构化文档进行检索。前往 https://bailian.console.aliyun.com/ 数据管理创建和获取 ID。",
+ },
+ "output_reference": {
+ "description": "是否输出知识库/文档的引用",
+ "type": "bool",
+ "hint": "在每次回答尾部加上引用源。默认为 False。",
+ },
+ },
+ },
"sensevoice_hint": {
"description": "部署SenseVoice",
"type": "string",
@@ -681,12 +710,14 @@ CONFIG_METADATA_2 = {
"type": "string",
"hint": "modelscope 上的模型名称。默认：iic/SenseVoiceSmall。",
},
- # "variables": {
- # "description": "工作流固定输入变量",
- # "type": "object",
- # "obvious_hint": True,
- # "hint": "可选。工作流固定输入变量，将会作为工作流的输入。也可以在对话时使用 /set 指令动态设置变量。如果变量名冲突，优先使用动态设置的变量。",
- # },
+ "variables": {
+ "description": "工作流固定输入变量",
+ "type": "object",
+ "obvious_hint": True,
+ "items": {},
+ "hint": "可选。工作流固定输入变量，将会作为工作流的输入。也可以在对话时使用 /set 指令动态设置变量。如果变量名冲突，优先使用动态设置的变量。",
+ "invisible": True,
+ },
# "fastgpt_app_type": {
# "description": "应用类型",
# "type": "string",
@@ -697,7 +728,7 @@ CONFIG_METADATA_2 = {
"dashscope_app_type": {
"description": "应用类型",
"type": "string",
- "hint": "阿里云百炼应用的应用类型。",
+ "hint": "百炼应用的应用类型。",
"options": [
"agent",
"agent-arrange",
diff --git a/astrbot/core/core_lifecycle.py b/astrbot/core/core_lifecycle.py
index e5485edb4..e52d94674 100644
--- a/astrbot/core/core_lifecycle.py
+++ b/astrbot/core/core_lifecycle.py
@@ -40,7 +40,6 @@ class AstrBotCoreLifecycle:
else:
logger.setLevel(self.astrbot_config["log_level"])
self.event_queue = Queue()
- self.event_queue.closed = False
self.provider_manager = ProviderManager(self.astrbot_config, self.db)
@@ -81,6 +80,8 @@ class AstrBotCoreLifecycle:
await self.platform_manager.initialize()
"""根据配置实例化各个平台适配器"""
+ self.dashboard_shutdown_event = asyncio.Event()
+
def _load(self):
event_bus_task = asyncio.create_task(
self.event_bus.dispatch(), name="event_bus"
@@ -129,11 +130,12 @@ class AstrBotCoreLifecycle:
await asyncio.gather(*self.curr_tasks, return_exceptions=True)
async def stop(self):
- self.event_queue.closed = True
for task in self.curr_tasks:
task.cancel()
await self.provider_manager.terminate()
+ await self.platform_manager.terminate()
+ self.dashboard_shutdown_event.set()
for task in self.curr_tasks:
try:
@@ -143,8 +145,10 @@ class AstrBotCoreLifecycle:
except Exception as e:
logger.error(f"任务 {task.get_name()} 发生错误: {e}")
- def restart(self):
- self.event_queue.closed = True
+ async def restart(self):
+ await self.provider_manager.terminate()
+ await self.platform_manager.terminate()
+ self.dashboard_shutdown_event.set()
threading.Thread(
target=self.astrbot_updator._reboot, name="restart", daemon=True
).start()
diff --git a/astrbot/dashboard/dashboard_lifecycle.py b/astrbot/core/initial_loader.py
similarity index 82%
rename from astrbot/dashboard/dashboard_lifecycle.py
rename to astrbot/core/initial_loader.py
index 9c5c9138d..f91a71da3 100644
--- a/astrbot/dashboard/dashboard_lifecycle.py
+++ b/astrbot/core/initial_loader.py
@@ -2,17 +2,16 @@ import asyncio
import traceback
from astrbot.core import logger
from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
-from .server import AstrBotDashboard
from astrbot.core.db import BaseDatabase
from astrbot.core import LogBroker
+from astrbot.dashboard.server import AstrBotDashboard
-class AstrBotDashBoardLifecycle:
+class InitialLoader:
def __init__(self, db: BaseDatabase, log_broker: LogBroker):
self.db = db
self.logger = logger
self.log_broker = log_broker
- self.dashboard_server = None
async def start(self):
core_lifecycle = AstrBotCoreLifecycle(self.log_broker, self.db)
@@ -25,7 +24,9 @@ class AstrBotDashBoardLifecycle:
logger.critical(traceback.format_exc())
logger.critical(f"😭 初始化 AstrBot 失败：{e} !!!")
- self.dashboard_server = AstrBotDashboard(core_lifecycle, self.db)
+ self.dashboard_server = AstrBotDashboard(
+ core_lifecycle, self.db, core_lifecycle.dashboard_shutdown_event
+ )
task = asyncio.gather(core_task, self.dashboard_server.run())
try:
diff --git a/astrbot/core/message/components.py b/astrbot/core/message/components.py
index 7f73e5d91..64c324a9e 100644
--- a/astrbot/core/message/components.py
+++ b/astrbot/core/message/components.py
@@ -25,9 +25,11 @@ SOFTWARE.
import base64
import json
import os
+import uuid
import typing as T
from enum import Enum
from pydantic.v1 import BaseModel
+from astrbot.core.utils.io import download_image_by_url, file_to_base64
class ComponentType(Enum):
@@ -146,6 +148,51 @@ class Record(BaseMessageComponent):
return Record(file=url, **_)
raise Exception("not a valid url")
+ async def convert_to_file_path(self) -> str:
+ """将这个语音统一转换为本地文件路径。这个方法避免了手动判断语音数据类型，直接返回语音数据的本地路径（如果是网络 URL, 则会自动进行下载）。
+
+ Returns:
+ str: 语音的本地路径，以绝对路径表示。
+ """
+ if self.file and self.file.startswith("file:///"):
+ file_path = self.file[8:]
+ return file_path
+ elif self.file and self.file.startswith("http"):
+ file_path = await download_image_by_url(self.file)
+ return os.path.abspath(file_path)
+ elif self.file and self.file.startswith("base64://"):
+ bs64_data = self.file.removeprefix("base64://")
+ image_bytes = base64.b64decode(bs64_data)
+ file_path = f"data/temp/{uuid.uuid4()}.jpg"
+ with open(file_path, "wb") as f:
+ f.write(image_bytes)
+ return os.path.abspath(file_path)
+ elif os.path.exists(self.file):
+ file_path = self.file
+ return os.path.abspath(file_path)
+ else:
+ raise Exception(f"not a valid file: {self.file}")
+
+ async def convert_to_base64(self) -> str:
+ """将语音统一转换为 base64 编码。这个方法避免了手动判断语音数据类型，直接返回语音数据的 base64 编码。
+
+ Returns:
+ str: 语音的 base64 编码，不以 base64:// 或者 data:image/jpeg;base64, 开头。
+ """
+ # convert to base64
+ if self.file and self.file.startswith("file:///"):
+ bs64_data = file_to_base64(self.file[8:])
+ elif self.file and self.file.startswith("http"):
+ file_path = await download_image_by_url(self.file)
+ bs64_data = file_to_base64(file_path)
+ elif self.file and self.file.startswith("base64://"):
+ bs64_data = self.file
+ elif os.path.exists(self.file):
+ bs64_data = file_to_base64(self.file)
+ else:
+ raise Exception(f"not a valid file: {self.file}")
+ return bs64_data
+
class Video(BaseMessageComponent):
type: ComponentType = "Video"
@@ -279,10 +326,6 @@ class Image(BaseMessageComponent):
file_unique: T.Optional[str] = "" # 某些平台可能有图片缓存的唯一标识
def __init__(self, file: T.Optional[str], **_):
- # for k in _.keys():
- # if (k == "_type" and _[k] not in ["flash", "show", None]) or \
- # (k == "c" and _[k] not in [2, 3]):
- # logger.warn(f"Protocol: {k}={_[k]} doesn't match values")
super().__init__(file=file, **_)
@staticmethod
@@ -307,6 +350,53 @@ class Image(BaseMessageComponent):
def fromIO(IO):
return Image.fromBytes(IO.read())
+ async def convert_to_file_path(self) -> str:
+ """将这个图片统一转换为本地文件路径。这个方法避免了手动判断图片数据类型，直接返回图片数据的本地路径（如果是网络 URL, 则会自动进行下载）。
+
+ Returns:
+ str: 图片的本地路径，以绝对路径表示。
+ """
+ url = self.url if self.url else self.file
+ if url and url.startswith("file:///"):
+ image_file_path = url[8:]
+ return image_file_path
+ elif url and url.startswith("http"):
+ image_file_path = await download_image_by_url(url)
+ return os.path.abspath(image_file_path)
+ elif url and url.startswith("base64://"):
+ bs64_data = url.removeprefix("base64://")
+ image_bytes = base64.b64decode(bs64_data)
+ image_file_path = f"data/temp/{uuid.uuid4()}.jpg"
+ with open(image_file_path, "wb") as f:
+ f.write(image_bytes)
+ return os.path.abspath(image_file_path)
+ elif os.path.exists(url):
+ image_file_path = url
+ return os.path.abspath(image_file_path)
+ else:
+ raise Exception(f"not a valid file: {url}")
+
+ async def convert_to_base64(self) -> str:
+ """将这个图片统一转换为 base64 编码。这个方法避免了手动判断图片数据类型，直接返回图片数据的 base64 编码。
+
+ Returns:
+ str: 图片的 base64 编码，不以 base64:// 或者 data:image/jpeg;base64, 开头。
+ """
+ # convert to base64
+ url = self.url if self.url else self.file
+ if url and url.startswith("file:///"):
+ bs64_data = file_to_base64(url[8:])
+ elif url and url.startswith("http"):
+ image_file_path = await download_image_by_url(url)
+ bs64_data = file_to_base64(image_file_path)
+ elif url and url.startswith("base64://"):
+ bs64_data = url
+ elif os.path.exists(url):
+ bs64_data = file_to_base64(url)
+ else:
+ raise Exception(f"not a valid file: {url}")
+ return bs64_data
+
class Reply(BaseMessageComponent):
type: ComponentType = "Reply"
diff --git a/astrbot/core/message/message_event_result.py b/astrbot/core/message/message_event_result.py
index 89aff17a8..4cc7fb842 100644
--- a/astrbot/core/message/message_event_result.py
+++ b/astrbot/core/message/message_event_result.py
@@ -77,6 +77,10 @@ class MessageChain:
self.use_t2i_ = use_t2i
return self
+ def get_plain_text(self) -> str:
+ """获取纯文本消息。这个方法将获取 chain 中所有 Plain 组件的文本并拼接成一条消息。空格分隔。"""
+ return " ".join([comp.text for comp in self.chain if isinstance(comp, Plain)])
+
class EventResultType(enum.Enum):
"""用于描述事件处理的结果类型。
@@ -147,9 +151,5 @@ class MessageEventResult(MessageChain):
"""是否为 LLM 结果。"""
return self.result_content_type == ResultContentType.LLM_RESULT
- def get_plain_text(self) -> str:
- """获取纯文本消息。这个方法将获取所有 Plain 组件的文本并拼接成一条消息。空格分隔。"""
- return " ".join([comp.text for comp in self.chain if isinstance(comp, Plain)])
-
CommandResult = MessageEventResult
diff --git a/astrbot/core/pipeline/process_stage/method/llm_request.py b/astrbot/core/pipeline/process_stage/method/llm_request.py
index 2050f37d6..7d7c4516f 100644
--- a/astrbot/core/pipeline/process_stage/method/llm_request.py
+++ b/astrbot/core/pipeline/process_stage/method/llm_request.py
@@ -64,8 +64,8 @@ class LLMRequestSubStage(Stage):
req.func_tool = self.ctx.plugin_manager.context.get_llm_tool_manager()
for comp in event.message_obj.message:
if isinstance(comp, Image):
- image_url = comp.url if comp.url else comp.file
- req.image_urls.append(image_url)
+ image_path = await comp.convert_to_file_path()
+ req.image_urls.append(image_path)
# 获取对话上下文
conversation_id = await self.conv_manager.get_curr_conversation_id(
@@ -250,8 +250,7 @@ class LLMRequestSubStage(Stage):
if llm_response.role == "assistant":
# 文本回复
contexts = req.contexts
- new_record = {"role": "user", "content": req.prompt}
- contexts.append(new_record)
+ contexts.append(await req.assemble_context())
contexts.append(
{"role": "assistant", "content": llm_response.completion_text}
)
diff --git a/astrbot/core/platform/__init__.py b/astrbot/core/platform/__init__.py
index 48ea57b8a..4007b2d90 100644
--- a/astrbot/core/platform/__init__.py
+++ b/astrbot/core/platform/__init__.py
@@ -1,7 +1,7 @@
from .platform import Platform
from .astr_message_event import AstrMessageEvent
from .platform_metadata import PlatformMetadata
-from .astrbot_message import AstrBotMessage, MessageMember, MessageType
+from .astrbot_message import AstrBotMessage, MessageMember, MessageType, Group
__all__ = [
"Platform",
@@ -10,4 +10,5 @@ __all__ = [
"AstrBotMessage",
"MessageMember",
"MessageType",
+ "Group",
]
diff --git a/astrbot/core/platform/astr_message_event.py b/astrbot/core/platform/astr_message_event.py
index fceb63ce7..3e1b14ee6 100644
--- a/astrbot/core/platform/astr_message_event.py
+++ b/astrbot/core/platform/astr_message_event.py
@@ -1,11 +1,9 @@
import abc
import asyncio
from dataclasses import dataclass
-from .astrbot_message import AstrBotMessage
-from .platform_metadata import PlatformMetadata
-from astrbot.core.message.message_event_result import MessageEventResult, MessageChain
-from astrbot.core.platform.message_type import MessageType
-from typing import List, Union
+from typing import List, Union, Optional
+
+from astrbot.core.db.po import Conversation
from astrbot.core.message.components import (
Plain,
Image,
@@ -16,9 +14,12 @@ from astrbot.core.message.components import (
Forward,
Reply,
)
-from astrbot.core.utils.metrics import Metric
+from astrbot.core.message.message_event_result import MessageEventResult, MessageChain
+from astrbot.core.platform.message_type import MessageType
from astrbot.core.provider.entites import ProviderRequest
-from astrbot.core.db.po import Conversation
+from astrbot.core.utils.metrics import Metric
+from .astrbot_message import AstrBotMessage, Group
+from .platform_metadata import PlatformMetadata
@dataclass
@@ -201,15 +202,6 @@ class AstrMessageEvent(abc.ABC):
"""
return self.role == "admin"
- async def send(self, message: MessageChain):
- """
- 发送消息到消息平台。
- """
- asyncio.create_task(
- Metric.upload(msg_event_tick=1, adapter_name=self.platform_meta.name)
- )
- self._has_send_oper = True
-
async def _pre_send(self):
"""调度器会在执行 send() 前调用该方法"""
@@ -371,3 +363,26 @@ class AstrMessageEvent(abc.ABC):
system_prompt=system_prompt,
conversation=conversation,
)
+
+ """平台适配器"""
+
+ async def send(self, message: MessageChain):
+ """发送消息到消息平台。
+
+ Args:
+ message (MessageChain): 消息链，具体使用方式请参考文档。
+ """
+ asyncio.create_task(
+ Metric.upload(msg_event_tick=1, adapter_name=self.platform_meta.name)
+ )
+ self._has_send_oper = True
+
+ async def get_group(self, group_id: str = None, **kwargs) -> Optional[Group]:
+ """获取一个群聊的数据, 如果不填写 group_id: 如果是私聊消息，返回 None。如果是群聊消息，返回当前群聊的数据。
+
+ 适配情况:
+
+ - gewechat
+ - aiocqhttp(OneBotv11)
+ """
+ ...
diff --git a/astrbot/core/platform/astrbot_message.py b/astrbot/core/platform/astrbot_message.py
index ea55eaf4b..e7bd4bd9c 100644
--- a/astrbot/core/platform/astrbot_message.py
+++ b/astrbot/core/platform/astrbot_message.py
@@ -10,6 +10,41 @@ class MessageMember:
user_id: str # 发送者id
nickname: str = None
+ def __str__(self):
+ # 使用 f-string 来构建返回的字符串表示形式
+ return (
+ f"User ID: {self.user_id},"
+ f"Nickname: {self.nickname if self.nickname else 'N/A'}"
+ )
+
+
+@dataclass
+class Group:
+ group_id: str
+ """群号"""
+ group_name: str = None
+ """群名称"""
+ group_avatar: str = None
+ """群头像"""
+ group_owner: str = None
+ """群主 id"""
+ group_admins: List[str] = None
+ """群管理员 id"""
+ members: List[MessageMember] = None
+ """所有群成员"""
+
+ def __str__(self):
+ # 使用 f-string 来构建返回的字符串表示形式
+ return (
+ f"Group ID: {self.group_id}\n"
+ f"Name: {self.group_name if self.group_name else 'N/A'}\n"
+ f"Avatar: {self.group_avatar if self.group_avatar else 'N/A'}\n"
+ f"Owner ID: {self.group_owner if self.group_owner else 'N/A'}\n"
+ f"Admin IDs: {self.group_admins if self.group_admins else 'N/A'}\n"
+ f"Members Len: {len(self.members) if self.members else 0}\n"
+ f"First Member: {self.members[0] if self.members else 'N/A'}\n"
+ )
+
class AstrBotMessage:
"""
diff --git a/astrbot/core/platform/manager.py b/astrbot/core/platform/manager.py
index 9ca3b82d1..22a06b739 100644
--- a/astrbot/core/platform/manager.py
+++ b/astrbot/core/platform/manager.py
@@ -85,14 +85,18 @@ class PlatformManager:
)
return
cls_type = platform_cls_map[platform_config["type"]]
- inst = cls_type(platform_config, self.settings, self.event_queue)
- self._inst_map[platform_config["id"]] = inst
+ inst: Platform = cls_type(platform_config, self.settings, self.event_queue)
+ self._inst_map[platform_config["id"]] = {
+ "inst": inst,
+ "client_id": inst.client_self_id,
+ }
self.platform_insts.append(inst)
asyncio.create_task(
self._task_wrapper(
asyncio.create_task(
- inst.run(), name=platform_config["id"] + "_platform"
+ inst.run(),
+ name=f"platform_{platform_config['type']}_{platform_config['id']}",
)
)
)
@@ -109,38 +113,42 @@ class PlatformManager:
logger.error("-------")
async def reload(self, platform_config: dict):
- # 还未实现完成，不要调用此方法
-
- if platform_config["id"] in self._inst_map:
- # 正在运行
- if getattr(self._inst_map[platform_config["id"]], "terminate", None):
- logger.info(f"正在尝试终止 {platform_config['id']} 平台适配器 ...")
- await self._inst_map[platform_config["id"]].terminate()
- logger.info(f"{platform_config['id']} 平台适配器已终止。")
- del self._inst_map[platform_config["id"]]
- self.platform_insts.remove(self._inst_map[platform_config["id"]])
- else:
- logger.warning(f"可能无法正常终止 {platform_config['id']} 平台适配器。")
-
- # 再启动新的实例
+ await self.terminate_platform(platform_config["id"])
+ if platform_config["enable"]:
await self.load_platform(platform_config)
- else:
- # 先将 _inst_map 中在 platform_config 中不存在的实例删除
- config_ids = [platform["id"] for platform in self.platforms_config]
- for key in list(self._inst_map.keys()):
- if key not in config_ids:
- if getattr(self._inst_map[key], "terminate", None):
- logger.info(f"正在尝试终止 {key} 平台适配器 ...")
- await self._inst_map[key].terminate()
- logger.info(f"{key} 平台适配器已终止。")
- del self._inst_map[key]
- self.platform_insts.remove(self._inst_map[key])
- else:
- logger.warning(f"可能无法正常终止 {key} 平台适配器。")
+ # 和配置文件保持同步
+ config_ids = [provider["id"] for provider in self.platforms_config]
+ for key in list(self._inst_map.keys()):
+ if key not in config_ids:
+ await self.terminate_platform(key)
- # 再启动新的实例
- await self.load_platform(platform_config)
+ async def terminate_platform(self, platform_id: str):
+ if platform_id in self._inst_map:
+ logger.info(f"正在尝试终止 {platform_id} 平台适配器 ...")
+
+ # client_id = self._inst_map.pop(platform_id, None)
+ info = self._inst_map.pop(platform_id, None)
+ client_id = info["client_id"]
+ inst = info["inst"]
+ try:
+ self.platform_insts.remove(
+ next(
+ inst
+ for inst in self.platform_insts
+ if inst.client_self_id == client_id
+ )
+ )
+ except Exception:
+ logger.warning(f"可能未完全移除 {platform_id} 平台适配器")
+
+ if getattr(inst, "terminate", None):
+ await inst.terminate()
+
+ async def terminate(self):
+ for inst in self.platform_insts:
+ if getattr(inst, "terminate", None):
+ await inst.terminate()
def get_insts(self):
return self.platform_insts
diff --git a/astrbot/core/platform/platform.py b/astrbot/core/platform/platform.py
index 8ed0be039..6ed53fe0e 100644
--- a/astrbot/core/platform/platform.py
+++ b/astrbot/core/platform/platform.py
@@ -1,4 +1,5 @@
import abc
+import uuid
from typing import Awaitable, Any
from asyncio import Queue
from .platform_metadata import PlatformMetadata
@@ -13,6 +14,7 @@ class Platform(abc.ABC):
super().__init__()
# 维护了消息平台的事件队列，EventBus 会从这里取出事件并处理。
self._event_queue = event_queue
+ self.client_self_id = uuid.uuid4().hex
@abc.abstractmethod
def run(self) -> Awaitable[Any]:
@@ -25,7 +27,7 @@ class Platform(abc.ABC):
"""
终止一个平台的运行实例。
"""
- pass
+ ...
@abc.abstractmethod
def meta(self) -> PlatformMetadata:
diff --git a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_message_event.py b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_message_event.py
index dbe9a3ce0..c7aede7d1 100644
--- a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_message_event.py
+++ b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_message_event.py
@@ -1,9 +1,9 @@
import asyncio
-
+import typing
from astrbot.api.event import AstrMessageEvent, MessageChain
+from astrbot.api.platform import Group, MessageMember
from astrbot.api.message_components import Plain, Image, Record, At, Node, Nodes
from aiocqhttp import CQHttp
-from astrbot.core.utils.io import file_to_base64, download_image_by_url
class AiocqhttpMessageEvent(AstrMessageEvent):
@@ -24,18 +24,9 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
d["data"]["text"] = segment.text.strip()
elif isinstance(segment, (Image, Record)):
# convert to base64
- if segment.file and segment.file.startswith("file:///"):
- bs64_data = file_to_base64(segment.file[8:])
- image_file_path = segment.file[8:]
- elif segment.file and segment.file.startswith("http"):
- image_file_path = await download_image_by_url(segment.file)
- bs64_data = file_to_base64(image_file_path)
- elif segment.file and segment.file.startswith("base64://"):
- bs64_data = segment.file
- else:
- bs64_data = file_to_base64(segment.file)
+ bs64 = await segment.convert_to_base64()
d["data"] = {
- "file": bs64_data,
+ "file": bs64,
}
elif isinstance(segment, At):
d["data"] = {
@@ -56,8 +47,13 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
if send_one_by_one:
for seg in message.chain:
- if isinstance(seg, Nodes):
- # 带有多个节点的合并转发消息
+ if isinstance(seg, (Node, Nodes)):
+ # 合并转发消息
+
+ if isinstance(seg, Node):
+ nodes = Nodes([seg])
+ seg = nodes
+
payload = seg.toDict()
if self.get_group_id():
payload["group_id"] = self.get_group_id()
@@ -79,3 +75,46 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
await self.bot.send(self.message_obj.raw_message, ret)
await super().send(message)
+
+ async def get_group(self, group_id=None, **kwargs):
+ if isinstance(group_id, str) and group_id.isdigit():
+ group_id = int(group_id)
+ elif self.get_group_id():
+ group_id = int(self.get_group_id())
+ else:
+ return None
+
+ info: dict = await self.bot.call_action(
+ "get_group_info",
+ group_id=group_id,
+ )
+
+ members: typing.List[typing.Dict] = await self.bot.call_action(
+ "get_group_member_list",
+ group_id=group_id,
+ )
+
+ owner_id = None
+ admin_ids = []
+ for member in members:
+ if member["role"] == "owner":
+ owner_id = member["user_id"]
+ if member["role"] == "admin":
+ admin_ids.append(member["user_id"])
+
+ group = Group(
+ group_id=str(group_id),
+ group_name=info.get("group_name"),
+ group_avatar="",
+ group_admins=admin_ids,
+ group_owner=str(owner_id),
+ members=[
+ MessageMember(
+ user_id=member["user_id"],
+ nickname=member.get("nickname") or member.get("card"),
+ )
+ for member in members
+ ],
+ )
+
+ return group
diff --git a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py
index 0d11e3c0b..e41071a56 100644
--- a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py
+++ b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py
@@ -43,8 +43,6 @@ class AiocqhttpAdapter(Platform):
"适用于 OneBot 标准的消息平台适配器，支持反向 WebSockets。",
)
- self.stop = False
-
self.bot = CQHttp(
use_ws_reverse=True, import_name="aiocqhttp", api_timeout_sec=180
)
@@ -303,22 +301,19 @@ class AiocqhttpAdapter(Platform):
for handler in logging.root.handlers[:]:
logging.root.removeHandler(handler)
logging.getLogger("aiocqhttp").setLevel(logging.ERROR)
-
+ self.shutdown_event = asyncio.Event()
return coro
async def terminate(self):
- self.stop = True
- await asyncio.sleep(1)
+ self.shutdown_event.set()
+
+ async def shutdown_trigger_placeholder(self):
+ await self.shutdown_event.wait()
+ logger.info("aiocqhttp 适配器已被优雅地关闭")
def meta(self) -> PlatformMetadata:
return self.metadata
- async def shutdown_trigger_placeholder(self):
- # TODO: use asyncio.Event
- while not self._event_queue.closed and not self.stop: # noqa: ASYNC110
- await asyncio.sleep(1)
- logger.info("aiocqhttp 适配器已关闭。")
-
async def handle_msg(self, message: AstrBotMessage):
message_event = AiocqhttpMessageEvent(
message_str=message.message_str,
diff --git a/astrbot/core/platform/sources/dingtalk/dingtalk_adapter.py b/astrbot/core/platform/sources/dingtalk/dingtalk_adapter.py
index 507b3bb50..95347172b 100644
--- a/astrbot/core/platform/sources/dingtalk/dingtalk_adapter.py
+++ b/astrbot/core/platform/sources/dingtalk/dingtalk_adapter.py
@@ -2,6 +2,7 @@ import asyncio
import uuid
import aiohttp
import dingtalk_stream
+import threading
from astrbot.api.platform import (
Platform,
@@ -196,7 +197,31 @@ class DingtalkPlatformAdapter(Platform):
self._event_queue.put_nowait(event)
async def run(self):
- await self.client_.start()
+ # await self.client_.start()
+ # 钉钉的 SDK 并没有实现真正的异步，start() 里面有堵塞方法。
+ def start_client(loop: asyncio.AbstractEventLoop):
+ try:
+ self._shutdown_event = threading.Event()
+ task = loop.create_task(self.client_.start())
+ self._shutdown_event.wait()
+ if task.done():
+ task.result()
+ except Exception as e:
+ if "Graceful shutdown" in str(e):
+ logger.info("钉钉适配器已被优雅地关闭")
+ return
+ logger.error(f"钉钉机器人启动失败: {e}")
+
+ loop = asyncio.get_event_loop()
+ await loop.run_in_executor(None, start_client, loop)
+
+ async def terminate(self):
+ def monkey_patch_close():
+ raise Exception("Graceful shutdown")
+
+ self.client_.open_connection = monkey_patch_close
+ await self.client_.websocket.close(code=1000, reason="Graceful shutdown")
+ self._shutdown_event.set()
def get_client(self):
return self.client
diff --git a/astrbot/core/platform/sources/gewechat/client.py b/astrbot/core/platform/sources/gewechat/client.py
index f0e64e698..53ee1878e 100644
--- a/astrbot/core/platform/sources/gewechat/client.py
+++ b/astrbot/core/platform/sources/gewechat/client.py
@@ -1,17 +1,19 @@
-import threading
import asyncio
-import aiohttp
-import quart
import base64
import datetime
-import re
import os
+import re
+import threading
+
+import aiohttp
import anyio
-from astrbot.api.platform import AstrBotMessage, MessageMember, MessageType
-from astrbot.api.message_components import Plain, Image, At, Record
+import quart
+
from astrbot.api import logger, sp
-from .downloader import GeweDownloader
+from astrbot.api.message_components import Plain, Image, At, Record
+from astrbot.api.platform import AstrBotMessage, MessageMember, MessageType
from astrbot.core.utils.io import download_image_by_url
+from .downloader import GeweDownloader
class SimpleGewechatClient:
@@ -51,11 +53,11 @@ class SimpleGewechatClient:
self.server = quart.Quart(__name__)
self.server.add_url_rule(
- "/astrbot-gewechat/callback", view_func=self.callback, methods=["POST"]
+ "/astrbot-gewechat/callback", view_func=self._callback, methods=["POST"]
)
self.server.add_url_rule(
"/astrbot-gewechat/file/