Merge remote-tracking branch 'origin/v3' into v3

# Conflicts:
#	app/api/endpoints/agent.py
#	app/api/endpoints/anthropic.py
#	app/api/endpoints/openai.py
#	app/chain/__init__.py
#	app/chain/message.py
#	app/chain/site.py
#	app/chain/subscribe.py
#	app/chain/transfer.py
#	app/modules/discord/__init__.py
#	app/modules/qqbot/__init__.py
#	app/modules/slack/__init__.py
#	app/modules/telegram/__init__.py
#	app/modules/wechat/__init__.py
#	app/runtime/extensions/module_manager.py
#	app/runtime/extensions/service_registry.py
#	tests/test_agent_interaction.py
#	tests/test_slash_command_interactions.py
#	tests/test_web_agent_stream.py
This commit is contained in:
jxxghp
2026-08-16 19:44:43 +08:00
232 changed files with 21375 additions and 6683 deletions
+12 -39
View File
@@ -15,7 +15,7 @@ from app.application.messaging.agent import (
resolve_config_principal_ids,
)
from app.runtime.log import logger
from app.modules import _ModuleBase, _MessageBase
from app.modules._base import _MessageChannelModuleBase
from app.modules.qqbot.qqbot import QQBot
from app.schemas import IncomingMessage, NotificationChannel, Message
from app.schemas.types import ModuleType
@@ -30,9 +30,12 @@ register_channel_admin_resolver(
)
class QQBotModule(_ModuleBase, _MessageBase[QQBot]):
class QQBotModule(_MessageChannelModuleBase[QQBot]):
"""QQ Bot 通知模块"""
# 管理员配置键,与渠道 resolver 保持一致
_admin_config_key = "QQBOT_ADMINS"
_IMAGE_SUFFIXES = (
".png",
".jpg",
@@ -78,6 +81,13 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]):
def get_priority() -> int:
return 10
def _commands_enabled(self, config: Optional[dict]) -> bool:
"""
QQ 机器人客户端未提供命令注册/删除 API,跳过命令注册,
避免基类默认钩子调用不存在的 client.register_commands。
"""
return False
def stop(self) -> None:
"""停止模块"""
for client in self.get_instances().values():
@@ -86,46 +96,9 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]):
except Exception as err:
logger.error(f"停止QQ Bot模块实例失败:{err}")
def test(self) -> Optional[Tuple[bool, str]]:
if not self.get_instances():
return None
for name, client in self.get_instances().items():
if not client.get_state():
return False, f"QQ Bot {name} 未就绪"
return True, ""
def init_setting(self) -> Tuple[str, Union[str, bool]]:
pass
@staticmethod
def _get_admins(config: Optional[dict]) -> List[str]:
"""
解析 QQ 管理员配置,兼容逗号分隔和首尾空白。
"""
return [
admin.strip()
for admin in str((config or {}).get("QQBOT_ADMINS") or "").split(",")
if admin.strip()
]
@classmethod
def _should_reject_admin_command(
cls,
config: Optional[dict],
*user_ids: Optional[Union[str, int]],
) -> bool:
"""
判断 QQ 斜杠命令是否应因非管理员身份被拒绝。
"""
admins = cls._get_admins(config)
if not admins:
return False
return not matches_channel_admin(
NotificationChannel.QQ,
config,
*user_ids,
)
@staticmethod
def _send_admin_denied(
client: Optional[QQBot], userid: Optional[Union[str, int]]
+22
View File
@@ -0,0 +1,22 @@
schema_version = 1
id = "QQBotModule"
kind = "host_module"
entrypoint = "app.modules.qqbot:QQBotModule"
depends_on = []
[metadata]
name = "QQ"
type = "notification"
subtype = "QQ"
priority = 10
[activation]
policy = "when_configured"
watch = ["Notifications"]
[activation.selector]
kind = "system_config_item"
key = "Notifications"
match_field = "type"
match_value = "qqbot"
enabled_field = "enabled"