Files
Oscar Shaw 80b89fd2ea feat: implements command management and improve webui feature structure (#3904)
move mcp management to plugin managemanet page

* feat: 新增命令配置数据库模型

* feat: 实现核心命令管理系统

* feat: 将命令管理集成到 Star 框架

* feat: 新增命令管理后台 API

* feat: 新增命令管理界面页面

* feat: 新增命令管理国际化支持

* test: 新增命令管理相关测试

* refactor(command): 移除指令重命名时的别名功能

* fix(command): 修正指令冲突检测逻辑

* fix(command): 排除已禁用指令的冲突检测

- 只有 `effective_command` 存在且 `enabled` 为 `True` 的指令才会被纳入冲突检测范围。

* feat(command): 优化指令冲突显示与提示

- 【功能】新增指令冲突警告提示,当检测到冲突时显示详细信息及解决方案。
- 【优化】调整指令列表排序逻辑,将冲突指令优先显示并分组。
- 【样式】为冲突指令行添加专属高亮样式,提升视觉识别度。
- 【国际化】更新英文和中文多语言文件,增加指令冲突警告相关的翻译文本。

* chore(command-page): 禁用命令表格部分列的排序功能

* style(command-page): 调整命令页面表格样式和图标大小

* refactor(command): 优化指令页面布局并更新冲突警告

- 【布局优化】重新组织指令管理页面布局,将筛选器移至顶部独立行
- 【信息展示】将搜索栏与总指令数、已禁用指令数合并显示,提升页面空间利用率
- 【视觉更新】更新指令冲突警告样式

* style: UI 细节

* refactor(command): 调整指令管理中的成员权限显示与筛选

  - 更新指令筛选逻辑,当选择“所有人”权限筛选时,将同时包含 `everyone` 和 `member` 权限的指令。

* feat(command-management): 新增指令层级管理与UI展示

- 【后端】
  - `CommandDescriptor` 新增 `parent_group_handler` 和 `sub_commands` 字段,支持指令层级结构定义。
  - `list_commands` 函数重构,实现指令的层级收集与构建,将子指令正确挂载到其父指令组下。
  - 新增 `_collect_all_descriptors` 和 `_find_parent_group_handler` 辅助函数,用于全面收集指令并定位父指令组。
  - `_build_descriptor` 优化指令类型判断逻辑,明确区分普通指令、指令组和子指令。
  - `_descriptor_to_dict` 递归处理子指令,确保 API 返回完整的指令层级数据。
- 【前端】
  - 指令管理页面 (`CommandPage.vue`) 增加指令类型筛选器,并支持指令组的展开/折叠功能。
  - 表格展示优化,为指令组和子指令添加不同的样式和缩进,提升层级结构的视觉可读性。
  - 指令详情对话框新增指令类型、所属指令组和子指令列表的展示。
  - 更新 `CommandItem` 接口,以适配后端提供的层级数据结构。
- 【i18n】
  - 新增指令类型(指令、指令组、子指令)的国际化文本。
  - 更新指令管理相关 UI 文本,包括表格头部、详情对话框字段和筛选器选项。

* style(command): 优化指令组子指令数量显示UI

* refactor(command): 修改指令列表排序逻辑

* style(command-page): 优化命令列表UI

* feat(command): 添加系统插件指令过滤与冲突处理

* refactor(command): 更新指令数展示逻辑

* style(command): 更新空状态描述

* feat(extension): 添加插件指令冲突检测与提示

- 在插件安装或启用后,自动检测并提示指令冲突。
- 当检测到指令冲突时,显示警告对话框,告知用户冲突数量及可能的影响。

* refactor(command): 移除指令表格内部加载指示器

* style(extension): 文案修改

* refactor(command): 模块化指令管理面板前端代码

* refactor(commandPanel): 重命名指令模块目录为 commandPanel

* style(commandPanel): 微调指令面板UI

* fix(command): 确保新命令配置的事务提交

* fix(sidebar): 补全新增侧边栏项后的侧边栏位追加逻辑

* refactor(commands): 重构/help指令以动态显示实际命令并补充部分命令描述

* style(builtin_commands): 补充命令描述

* refactor(commandPanel): 移除未使用的 filterState 常量

* perf(dashboard): 删除多余的CommandPage.vue文件(已被模块化引用)

* perf(command): 优化命令冲突计数逻辑

* perf(command): 优化指令管理辅助函数和配置绑定逻辑

* perf(db): 优化重构command相关数据库操作

* refactor(sidebar): 提取侧边栏项目解析逻辑到工具函数复用

* refactor: move mcp and command page to extension page

* refactor: remove unused imports in component panel

* fix: update terminology for handler management in extension localization

---------

Co-authored-by: Soulter <905617992@qq.com>
2025-12-16 20:24:57 +08:00

267 lines
10 KiB
Python

import datetime
import json
import os
import uuid
import zoneinfo
from apscheduler.schedulers.asyncio import AsyncIOScheduler
from apscheduler.triggers.cron import CronTrigger
from astrbot.api import llm_tool, logger, star
from astrbot.api.event import AstrMessageEvent, MessageEventResult, filter
from astrbot.core.utils.astrbot_path import get_astrbot_data_path
class Main(star.Star):
"""使用 LLM 待办提醒。只需对 LLM 说想要提醒的事情和时间即可。比如:`之后每天这个时候都提醒我做多邻国`"""
def __init__(self, context: star.Context) -> None:
self.context = context
self.timezone = self.context.get_config().get("timezone")
if not self.timezone:
self.timezone = None
try:
self.timezone = zoneinfo.ZoneInfo(self.timezone) if self.timezone else None
except Exception as e:
logger.error(f"时区设置错误: {e}, 使用本地时区")
self.timezone = None
self.scheduler = AsyncIOScheduler(timezone=self.timezone)
# set and load config
reminder_file = os.path.join(get_astrbot_data_path(), "astrbot-reminder.json")
if not os.path.exists(reminder_file):
with open(reminder_file, "w", encoding="utf-8") as f:
f.write("{}")
with open(reminder_file, encoding="utf-8") as f:
self.reminder_data = json.load(f)
self._init_scheduler()
self.scheduler.start()
def _init_scheduler(self):
"""Initialize the scheduler."""
for group in self.reminder_data:
for reminder in self.reminder_data[group]:
if "id" not in reminder:
id_ = str(uuid.uuid4())
reminder["id"] = id_
else:
id_ = reminder["id"]
if "datetime" in reminder:
if self.check_is_outdated(reminder):
continue
self.scheduler.add_job(
self._reminder_callback,
id=id_,
trigger="date",
args=[group, reminder],
run_date=datetime.datetime.strptime(
reminder["datetime"],
"%Y-%m-%d %H:%M",
),
misfire_grace_time=60,
)
elif "cron" in reminder:
trigger = CronTrigger(**self._parse_cron_expr(reminder["cron"]))
self.scheduler.add_job(
self._reminder_callback,
trigger=trigger,
id=id_,
args=[group, reminder],
misfire_grace_time=60,
)
def check_is_outdated(self, reminder: dict):
"""Check if the reminder is outdated."""
if "datetime" in reminder:
reminder_time = datetime.datetime.strptime(
reminder["datetime"],
"%Y-%m-%d %H:%M",
).replace(tzinfo=self.timezone)
return reminder_time < datetime.datetime.now(self.timezone)
return False
async def _save_data(self):
"""Save the reminder data."""
reminder_file = os.path.join(get_astrbot_data_path(), "astrbot-reminder.json")
with open(reminder_file, "w", encoding="utf-8") as f:
json.dump(self.reminder_data, f, ensure_ascii=False)
def _parse_cron_expr(self, cron_expr: str):
fields = cron_expr.split(" ")
return {
"minute": fields[0],
"hour": fields[1],
"day": fields[2],
"month": fields[3],
"day_of_week": fields[4],
}
@llm_tool("reminder")
async def reminder_tool(
self,
event: AstrMessageEvent,
text: str | None = None,
datetime_str: str | None = None,
cron_expression: str | None = None,
human_readable_cron: str | None = None,
):
"""Call this function when user is asking for setting a reminder.
Args:
text(string): Must Required. The content of the reminder.
datetime_str(string): Required when user's reminder is a single reminder. The datetime string of the reminder, Must format with %Y-%m-%d %H:%M
cron_expression(string): Required when user's reminder is a repeated reminder. The cron expression of the reminder. Monday is 0 and Sunday is 6.
human_readable_cron(string): Optional. The human readable cron expression of the reminder.
"""
if event.get_platform_name() == "qq_official":
yield event.plain_result("reminder 暂不支持 QQ 官方机器人。")
return
if event.unified_msg_origin not in self.reminder_data:
self.reminder_data[event.unified_msg_origin] = []
if not cron_expression and not datetime_str:
raise ValueError(
"The cron_expression and datetime_str cannot be both None.",
)
reminder_time = ""
if not text:
text = "未命名待办事项"
if cron_expression:
d = {
"text": text,
"cron": cron_expression,
"cron_h": human_readable_cron,
"id": str(uuid.uuid4()),
}
self.reminder_data[event.unified_msg_origin].append(d)
trigger = CronTrigger(**self._parse_cron_expr(cron_expression))
self.scheduler.add_job(
self._reminder_callback,
trigger,
id=d["id"],
misfire_grace_time=60,
args=[event.unified_msg_origin, d],
)
if human_readable_cron:
reminder_time = f"{human_readable_cron}(Cron: {cron_expression})"
else:
if datetime_str is None:
raise ValueError("datetime_str cannot be None.")
d = {"text": text, "datetime": datetime_str, "id": str(uuid.uuid4())}
self.reminder_data[event.unified_msg_origin].append(d)
datetime_scheduled = datetime.datetime.strptime(
datetime_str,
"%Y-%m-%d %H:%M",
)
self.scheduler.add_job(
self._reminder_callback,
"date",
id=d["id"],
args=[event.unified_msg_origin, d],
run_date=datetime_scheduled,
misfire_grace_time=60,
)
reminder_time = datetime_str
await self._save_data()
yield event.plain_result(
"成功设置待办事项。\n内容: "
+ text
+ "\n时间: "
+ reminder_time
+ "\n\n使用 /reminder ls 查看所有待办事项。\n使用 /tool off reminder 关闭此功能。",
)
@filter.command_group("reminder")
def reminder(self):
"""待办提醒"""
async def get_upcoming_reminders(self, unified_msg_origin: str):
"""Get upcoming reminders."""
reminders = self.reminder_data.get(unified_msg_origin, [])
if not reminders:
return []
now = datetime.datetime.now(self.timezone)
upcoming_reminders = [
reminder
for reminder in reminders
if "datetime" not in reminder
or datetime.datetime.strptime(
reminder["datetime"],
"%Y-%m-%d %H:%M",
).replace(tzinfo=self.timezone)
>= now
]
return upcoming_reminders
@reminder.command("ls")
async def reminder_ls(self, event: AstrMessageEvent):
"""List upcoming reminders."""
reminders = await self.get_upcoming_reminders(event.unified_msg_origin)
if not reminders:
yield event.plain_result("没有正在进行的待办事项。")
else:
parts = ["正在进行的待办事项:\n"]
for i, reminder in enumerate(reminders):
time_ = reminder.get("datetime", "")
if not time_:
cron_expr = reminder.get("cron", "")
time_ = reminder.get("cron_h", "") + f"(Cron: {cron_expr})"
parts.append(f"{i + 1}. {reminder['text']} - {time_}\n")
parts.append("\n使用 /reminder rm <id> 删除待办事项。\n")
reminder_str = "".join(parts)
yield event.plain_result(reminder_str)
@reminder.command("rm")
async def reminder_rm(self, event: AstrMessageEvent, index: int):
"""Remove a reminder by index."""
reminders = await self.get_upcoming_reminders(event.unified_msg_origin)
if not reminders:
yield event.plain_result("没有待办事项。")
elif index < 1 or index > len(reminders):
yield event.plain_result("索引越界。")
else:
reminder = reminders.pop(index - 1)
job_id = reminder.get("id")
# self.reminder_data[event.unified_msg_origin] = reminder
users_reminders = self.reminder_data.get(event.unified_msg_origin, [])
for i, r in enumerate(users_reminders):
if r.get("id") == job_id:
users_reminders.pop(i)
try:
self.scheduler.remove_job(job_id)
except Exception as e:
logger.error(f"Remove job error: {e}")
yield event.plain_result(
f"成功移除对应的待办事项。删除定时任务失败: {e!s} 可能需要重启 AstrBot 以取消该提醒任务。",
)
await self._save_data()
yield event.plain_result("成功删除待办事项:\n" + reminder["text"])
async def _reminder_callback(self, unified_msg_origin: str, d: dict):
"""The callback function of the reminder."""
logger.info(f"Reminder Activated: {d['text']}, created by {unified_msg_origin}")
await self.context.send_message(
unified_msg_origin,
MessageEventResult().message(
"待办提醒: \n\n"
+ d["text"]
+ "\n时间: "
+ d.get("datetime", "")
+ d.get("cron_h", ""),
),
)
async def terminate(self):
self.scheduler.shutdown()
await self._save_data()
logger.info("Reminder plugin terminated.")