diff --git a/.gitignore b/.gitignore index 34c7b1e28..c2fb389ec 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,15 @@ mongodb/ NapCat.Framework.Windows.Once/ log/ logs/ +run_ad.bat +MaiBot-Napcat-Adapter-main +MaiBot-Napcat-Adapter /test /src/test nonebot-maibot-adapter/ *.zip run.bat +run_none.bat run.py message_queue_content.txt message_queue_content.bat @@ -230,4 +234,6 @@ logs .vscode -/config/* \ No newline at end of file +/config/* +run_none.bat +config/old/bot_config_20250405_212257.toml diff --git a/changelogs/changelog_dev.md b/changelogs/changelog_dev.md index acfb7e03f..663ad9629 100644 --- a/changelogs/changelog_dev.md +++ b/changelogs/changelog_dev.md @@ -1,4 +1,12 @@ 这里放置了测试版本的细节更新 + +## [test-0.6.1-snapshot-1] - 2025-4-5 +- 修复pfc回复出错bug +- 修复表情包打字时间，不会卡表情包 +- 改进了知识库的提取 +- 提供了新的数据库连接方式 +- 修复了ban_user无效的问题 + ## [test-0.6.0-snapshot-9] - 2025-4-4 - 可以识别gif表情包 diff --git a/flake.nix b/flake.nix index 404f7555c..23b82bb77 100644 --- a/flake.nix +++ b/flake.nix @@ -18,10 +18,11 @@ devShells.default = pkgs.mkShell { name = "python-venv"; venvDir = "./.venv"; - buildInputs = [ - pythonPackages.python - pythonPackages.venvShellHook - pythonPackages.numpy + buildInputs = with pythonPackages; [ + python + venvShellHook + scipy + numpy ]; postVenvCreation = '' @@ -35,4 +36,4 @@ ''; }; }); -} \ No newline at end of file +} diff --git a/scripts/run.sh b/scripts/run.sh index c1fe4973f..342a23feb 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -4,7 +4,7 @@ # 适用于Arch/Ubuntu 24.10/Debian 12/CentOS 9 # 请小心使用任何一键脚本！ -INSTALLER_VERSION="0.0.1-refactor" +INSTALLER_VERSION="0.0.2-refactor" LANG=C.UTF-8 # 如无法访问GitHub请修改此处镜像地址 @@ -62,7 +62,7 @@ show_menu() { "4" "启动Nonebot adapter" \ "5" "停止Nonebot adapter" \ "6" "重启Nonebot adapter" \ - "7" "更新MaiCore及其依赖" \ + "7" "拉取最新MaiCore仓库" \ "8" "切换分支" \ "9" "退出" 3>&1 1>&2 2>&3) @@ -111,6 +111,8 @@ show_menu() { # 更新依赖 update_dependencies() { + whiptail --title "⚠" --msgbox "更新后请阅读教程" 10 60 + systemctl stop ${SERVICE_NAME} cd "${INSTALL_DIR}/MaiBot" || { whiptail --msgbox "🚫 无法进入安装目录！" 10 60 return 1 @@ -126,8 +128,7 @@ update_dependencies() { return 1 fi deactivate - systemctl restart ${SERVICE_NAME} - whiptail --msgbox "✅ 依赖已更新并重启服务！" 10 60 + whiptail --msgbox "✅ 已停止服务并拉取最新仓库提交" 10 60 } # 切换分支 @@ -157,7 +158,7 @@ switch_branch() { whiptail --msgbox "🚫 代码拉取失败！" 10 60 return 1 fi - + systemctl stop ${SERVICE_NAME} source "${INSTALL_DIR}/venv/bin/activate" pip install -r requirements.txt deactivate @@ -165,8 +166,7 @@ switch_branch() { sed -i "s/^BRANCH=.*/BRANCH=${new_branch}/" /etc/maicore_install.conf BRANCH="${new_branch}" check_eula - systemctl restart ${SERVICE_NAME} - whiptail --msgbox "✅ 已切换到分支 ${new_branch} 并重启服务！" 10 60 + whiptail --msgbox "✅ 已停止服务并切换到分支 ${new_branch} ！" 10 60 } check_eula() { @@ -228,6 +228,8 @@ run_installation() { fi fi + whiptail --title "ℹ️ 提示" --msgbox "如果您没有特殊需求，请优先使用docker方式部署。" 10 60 + # 协议确认 if ! (whiptail --title "ℹ️ [1/6] 使用协议" --yes-button "我同意" --no-button "我拒绝" --yesno "使用MaiCore及此脚本前请先阅读EULA协议及隐私协议\nhttps://github.com/MaiM-with-u/MaiBot/blob/refactor/EULA.md\nhttps://github.com/MaiM-with-u/MaiBot/blob/refactor/PRIVACY.md\n\n您是否同意上述协议？" 12 70); then exit 1 @@ -370,12 +372,13 @@ run_installation() { # 选择分支 choose_branch() { BRANCH=$(whiptail --title "🔀 选择分支" --radiolist "请选择要安装的分支：" 15 60 4 \ - "main" "稳定最新版（推荐）" ON \ - "classical" "经典版" OFF \ + "main" "稳定版本（推荐）" ON \ + "dev" "开发版（不知道什么意思就别选）" OFF \ + "classical" "经典版（0.6.0以前的版本）" OFF \ "custom" "自定义分支" OFF 3>&1 1>&2 2>&3) RETVAL=$? if [ $RETVAL -ne 0 ]; then - whiptail --msgbox "操作取消！" 10 60 + whiptail --msgbox "🚫 操作取消！" 10 60 exit 1 fi @@ -383,7 +386,7 @@ run_installation() { BRANCH=$(whiptail --title "🔀 自定义分支" --inputbox "请输入自定义分支名称：" 10 60 "refactor" 3>&1 1>&2 2>&3) RETVAL=$? if [ $RETVAL -ne 0 ]; then - whiptail --msgbox "输入取消！" 10 60 + whiptail --msgbox "🚫 输入取消！" 10 60 exit 1 fi if [[ -z "$BRANCH" ]]; then diff --git a/src/common/database.py b/src/common/database.py index a3e5b4e3b..ee0ead0bd 100644 --- a/src/common/database.py +++ b/src/common/database.py @@ -15,9 +15,16 @@ def __create_database_instance(): password = os.getenv("MONGODB_PASSWORD") auth_source = os.getenv("MONGODB_AUTH_SOURCE") - if uri and uri.startswith("mongodb://"): - # 优先使用URI连接 - return MongoClient(uri) + if uri: + # 支持标准mongodb://和mongodb+srv://连接字符串 + if uri.startswith(("mongodb://", "mongodb+srv://")): + return MongoClient(uri) + else: + raise ValueError( + "Invalid MongoDB URI format. URI must start with 'mongodb://' or 'mongodb+srv://'. " + "For MongoDB Atlas, use 'mongodb+srv://' format. " + "See: https://www.mongodb.com/docs/manual/reference/connection-string/" + ) if username and password: # 如果有用户名和密码，使用认证连接 diff --git a/src/gui/logger_gui.py b/src/gui/logger_gui.py index f2dd698cd..9488446c4 100644 --- a/src/gui/logger_gui.py +++ b/src/gui/logger_gui.py @@ -1,347 +1,378 @@ -import customtkinter as ctk -import subprocess -import threading -import queue -import re -import os -import signal -from collections import deque +# import customtkinter as ctk +# import subprocess +# import threading +# import queue +# import re +# import os +# import signal +# from collections import deque +# import sys -# 设置应用的外观模式和默认颜色主题 -ctk.set_appearance_mode("dark") -ctk.set_default_color_theme("blue") +# # 设置应用的外观模式和默认颜色主题 +# ctk.set_appearance_mode("dark") +# ctk.set_default_color_theme("blue") -class LogViewerApp(ctk.CTk): - """日志查看器应用的主类，继承自customtkinter的CTk类""" +# class LogViewerApp(ctk.CTk): +# """日志查看器应用的主类，继承自customtkinter的CTk类""" - def __init__(self): - """初始化日志查看器应用的界面和状态""" - super().__init__() - self.title("日志查看器") - self.geometry("1200x800") +# def __init__(self): +# """初始化日志查看器应用的界面和状态""" +# super().__init__() +# self.title("日志查看器") +# self.geometry("1200x800") - # 初始化进程、日志队列、日志数据等变量 - self.process = None - self.log_queue = queue.Queue() - self.log_data = deque(maxlen=10000) # 使用固定长度队列 - self.available_levels = set() - self.available_modules = set() - self.sorted_modules = [] - self.module_checkboxes = {} # 存储模块复选框的字典 +# # 标记GUI是否运行中 +# self.is_running = True + +# # 程序关闭时的清理操作 +# self.protocol("WM_DELETE_WINDOW", self._on_closing) + +# # 初始化进程、日志队列、日志数据等变量 +# self.process = None +# self.log_queue = queue.Queue() +# self.log_data = deque(maxlen=10000) # 使用固定长度队列 +# self.available_levels = set() +# self.available_modules = set() +# self.sorted_modules = [] +# self.module_checkboxes = {} # 存储模块复选框的字典 - # 日志颜色配置 - self.color_config = { - "time": "#888888", - "DEBUG": "#2196F3", - "INFO": "#4CAF50", - "WARNING": "#FF9800", - "ERROR": "#F44336", - "module": "#D4D0AB", - "default": "#FFFFFF", - } +# # 日志颜色配置 +# self.color_config = { +# "time": "#888888", +# "DEBUG": "#2196F3", +# "INFO": "#4CAF50", +# "WARNING": "#FF9800", +# "ERROR": "#F44336", +# "module": "#D4D0AB", +# "default": "#FFFFFF", +# } - # 列可见性配置 - self.column_visibility = {"show_time": True, "show_level": True, "show_module": True} +# # 列可见性配置 +# self.column_visibility = {"show_time": True, "show_level": True, "show_module": True} - # 选中的日志等级和模块 - self.selected_levels = set() - self.selected_modules = set() +# # 选中的日志等级和模块 +# self.selected_levels = set() +# self.selected_modules = set() - # 创建界面组件并启动日志队列处理 - self.create_widgets() - self.after(100, self.process_log_queue) +# # 创建界面组件并启动日志队列处理 +# self.create_widgets() +# self.after(100, self.process_log_queue) - def create_widgets(self): - """创建应用界面的各个组件""" - self.grid_columnconfigure(0, weight=1) - self.grid_rowconfigure(1, weight=1) +# def create_widgets(self): +# """创建应用界面的各个组件""" +# self.grid_columnconfigure(0, weight=1) +# self.grid_rowconfigure(1, weight=1) - # 控制面板 - control_frame = ctk.CTkFrame(self) - control_frame.grid(row=0, column=0, sticky="ew", padx=10, pady=5) +# # 控制面板 +# control_frame = ctk.CTkFrame(self) +# control_frame.grid(row=0, column=0, sticky="ew", padx=10, pady=5) - self.start_btn = ctk.CTkButton(control_frame, text="启动", command=self.start_process) - self.start_btn.pack(side="left", padx=5) +# self.start_btn = ctk.CTkButton(control_frame, text="启动", command=self.start_process) +# self.start_btn.pack(side="left", padx=5) - self.stop_btn = ctk.CTkButton(control_frame, text="停止", command=self.stop_process, state="disabled") - self.stop_btn.pack(side="left", padx=5) +# self.stop_btn = ctk.CTkButton(control_frame, text="停止", command=self.stop_process, state="disabled") +# self.stop_btn.pack(side="left", padx=5) - self.clear_btn = ctk.CTkButton(control_frame, text="清屏", command=self.clear_logs) - self.clear_btn.pack(side="left", padx=5) +# self.clear_btn = ctk.CTkButton(control_frame, text="清屏", command=self.clear_logs) +# self.clear_btn.pack(side="left", padx=5) - column_filter_frame = ctk.CTkFrame(control_frame) - column_filter_frame.pack(side="left", padx=20) +# column_filter_frame = ctk.CTkFrame(control_frame) +# column_filter_frame.pack(side="left", padx=20) - self.time_check = ctk.CTkCheckBox(column_filter_frame, text="显示时间", command=self.refresh_logs) - self.time_check.pack(side="left", padx=5) - self.time_check.select() +# self.time_check = ctk.CTkCheckBox(column_filter_frame, text="显示时间", command=self.refresh_logs) +# self.time_check.pack(side="left", padx=5) +# self.time_check.select() - self.level_check = ctk.CTkCheckBox(column_filter_frame, text="显示等级", command=self.refresh_logs) - self.level_check.pack(side="left", padx=5) - self.level_check.select() +# self.level_check = ctk.CTkCheckBox(column_filter_frame, text="显示等级", command=self.refresh_logs) +# self.level_check.pack(side="left", padx=5) +# self.level_check.select() - self.module_check = ctk.CTkCheckBox(column_filter_frame, text="显示模块", command=self.refresh_logs) - self.module_check.pack(side="left", padx=5) - self.module_check.select() +# self.module_check = ctk.CTkCheckBox(column_filter_frame, text="显示模块", command=self.refresh_logs) +# self.module_check.pack(side="left", padx=5) +# self.module_check.select() - # 筛选面板 - filter_frame = ctk.CTkFrame(self) - filter_frame.grid(row=0, column=1, rowspan=2, sticky="ns", padx=5) +# # 筛选面板 +# filter_frame = ctk.CTkFrame(self) +# filter_frame.grid(row=0, column=1, rowspan=2, sticky="ns", padx=5) - ctk.CTkLabel(filter_frame, text="日志等级筛选").pack(pady=5) - self.level_scroll = ctk.CTkScrollableFrame(filter_frame, width=150, height=200) - self.level_scroll.pack(fill="both", expand=True, padx=5) +# ctk.CTkLabel(filter_frame, text="日志等级筛选").pack(pady=5) +# self.level_scroll = ctk.CTkScrollableFrame(filter_frame, width=150, height=200) +# self.level_scroll.pack(fill="both", expand=True, padx=5) - ctk.CTkLabel(filter_frame, text="模块筛选").pack(pady=5) - self.module_filter_entry = ctk.CTkEntry(filter_frame, placeholder_text="输入模块过滤词") - self.module_filter_entry.pack(pady=5) - self.module_filter_entry.bind("", self.update_module_filter) +# ctk.CTkLabel(filter_frame, text="模块筛选").pack(pady=5) +# self.module_filter_entry = ctk.CTkEntry(filter_frame, placeholder_text="输入模块过滤词") +# self.module_filter_entry.pack(pady=5) +# self.module_filter_entry.bind("", self.update_module_filter) - self.module_scroll = ctk.CTkScrollableFrame(filter_frame, width=300, height=200) - self.module_scroll.pack(fill="both", expand=True, padx=5) +# self.module_scroll = ctk.CTkScrollableFrame(filter_frame, width=300, height=200) +# self.module_scroll.pack(fill="both", expand=True, padx=5) - self.log_text = ctk.CTkTextbox(self, wrap="word") - self.log_text.grid(row=1, column=0, sticky="nsew", padx=10, pady=5) +# self.log_text = ctk.CTkTextbox(self, wrap="word") +# self.log_text.grid(row=1, column=0, sticky="nsew", padx=10, pady=5) - self.init_text_tags() +# self.init_text_tags() - def update_module_filter(self, event): - """根据模块过滤词更新模块复选框的显示""" - filter_text = self.module_filter_entry.get().strip().lower() - for module, checkbox in self.module_checkboxes.items(): - if filter_text in module.lower(): - checkbox.pack(anchor="w", padx=5, pady=2) - else: - checkbox.pack_forget() +# def update_module_filter(self, event): +# """根据模块过滤词更新模块复选框的显示""" +# filter_text = self.module_filter_entry.get().strip().lower() +# for module, checkbox in self.module_checkboxes.items(): +# if filter_text in module.lower(): +# checkbox.pack(anchor="w", padx=5, pady=2) +# else: +# checkbox.pack_forget() - def update_filters(self, level, module): - """更新日志等级和模块的筛选器""" - if level not in self.available_levels: - self.available_levels.add(level) - self.add_checkbox(self.level_scroll, level, "level") +# def update_filters(self, level, module): +# """更新日志等级和模块的筛选器""" +# if level not in self.available_levels: +# self.available_levels.add(level) +# self.add_checkbox(self.level_scroll, level, "level") - module_key = self.get_module_key(module) - if module_key not in self.available_modules: - self.available_modules.add(module_key) - self.sorted_modules = sorted(self.available_modules, key=lambda x: x.lower()) - self.rebuild_module_checkboxes() +# module_key = self.get_module_key(module) +# if module_key not in self.available_modules: +# self.available_modules.add(module_key) +# self.sorted_modules = sorted(self.available_modules, key=lambda x: x.lower()) +# self.rebuild_module_checkboxes() - def rebuild_module_checkboxes(self): - """重新构建模块复选框""" - # 清空现有复选框 - for widget in self.module_scroll.winfo_children(): - widget.destroy() - self.module_checkboxes.clear() +# def rebuild_module_checkboxes(self): +# """重新构建模块复选框""" +# # 清空现有复选框 +# for widget in self.module_scroll.winfo_children(): +# widget.destroy() +# self.module_checkboxes.clear() - # 重建排序后的复选框 - for module in self.sorted_modules: - self.add_checkbox(self.module_scroll, module, "module") +# # 重建排序后的复选框 +# for module in self.sorted_modules: +# self.add_checkbox(self.module_scroll, module, "module") - def add_checkbox(self, parent, text, type_): - """在指定父组件中添加复选框""" +# def add_checkbox(self, parent, text, type_): +# """在指定父组件中添加复选框""" - def update_filter(): - current = cb.get() - if type_ == "level": - (self.selected_levels.add if current else self.selected_levels.discard)(text) - else: - (self.selected_modules.add if current else self.selected_modules.discard)(text) - self.refresh_logs() +# def update_filter(): +# current = cb.get() +# if type_ == "level": +# (self.selected_levels.add if current else self.selected_levels.discard)(text) +# else: +# (self.selected_modules.add if current else self.selected_modules.discard)(text) +# self.refresh_logs() - cb = ctk.CTkCheckBox(parent, text=text, command=update_filter) - cb.select() # 初始选中 +# cb = ctk.CTkCheckBox(parent, text=text, command=update_filter) +# cb.select() # 初始选中 - # 手动同步初始状态到集合（关键修复） - if type_ == "level": - self.selected_levels.add(text) - else: - self.selected_modules.add(text) +# # 手动同步初始状态到集合（关键修复） +# if type_ == "level": +# self.selected_levels.add(text) +# else: +# self.selected_modules.add(text) - if type_ == "module": - self.module_checkboxes[text] = cb - cb.pack(anchor="w", padx=5, pady=2) - return cb +# if type_ == "module": +# self.module_checkboxes[text] = cb +# cb.pack(anchor="w", padx=5, pady=2) +# return cb - def check_filter(self, entry): - """检查日志条目是否符合当前筛选条件""" - level_ok = not self.selected_levels or entry["level"] in self.selected_levels - module_key = self.get_module_key(entry["module"]) - module_ok = not self.selected_modules or module_key in self.selected_modules - return level_ok and module_ok +# def check_filter(self, entry): +# """检查日志条目是否符合当前筛选条件""" +# level_ok = not self.selected_levels or entry["level"] in self.selected_levels +# module_key = self.get_module_key(entry["module"]) +# module_ok = not self.selected_modules or module_key in self.selected_modules +# return level_ok and module_ok - def init_text_tags(self): - """初始化日志文本的颜色标签""" - for tag, color in self.color_config.items(): - self.log_text.tag_config(tag, foreground=color) - self.log_text.tag_config("default", foreground=self.color_config["default"]) +# def init_text_tags(self): +# """初始化日志文本的颜色标签""" +# for tag, color in self.color_config.items(): +# self.log_text.tag_config(tag, foreground=color) +# self.log_text.tag_config("default", foreground=self.color_config["default"]) - def start_process(self): - """启动日志进程并开始读取输出""" - self.process = subprocess.Popen( - ["nb", "run"], - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - text=True, - bufsize=1, - encoding="utf-8", - errors="ignore", - ) - self.start_btn.configure(state="disabled") - self.stop_btn.configure(state="normal") - threading.Thread(target=self.read_output, daemon=True).start() +# def start_process(self): +# """启动日志进程并开始读取输出""" +# self.process = subprocess.Popen( +# ["nb", "run"], +# stdout=subprocess.PIPE, +# stderr=subprocess.STDOUT, +# text=True, +# bufsize=1, +# encoding="utf-8", +# errors="ignore", +# ) +# self.start_btn.configure(state="disabled") +# self.stop_btn.configure(state="normal") +# threading.Thread(target=self.read_output, daemon=True).start() - def stop_process(self): - """停止日志进程并清理相关资源""" - if self.process: - try: - if hasattr(self.process, "pid"): - if os.name == "nt": - subprocess.run( - ["taskkill", "/F", "/T", "/PID", str(self.process.pid)], check=True, capture_output=True - ) - else: - os.killpg(os.getpgid(self.process.pid), signal.SIGTERM) - except (subprocess.CalledProcessError, ProcessLookupError, OSError) as e: - print(f"终止进程失败: {e}") - finally: - self.process = None - self.log_queue.queue.clear() - self.start_btn.configure(state="normal") - self.stop_btn.configure(state="disabled") - self.refresh_logs() +# def stop_process(self): +# """停止日志进程并清理相关资源""" +# if self.process: +# try: +# if hasattr(self.process, "pid"): +# if os.name == "nt": +# subprocess.run( +# ["taskkill", "/F", "/T", "/PID", str(self.process.pid)], check=True, capture_output=True +# ) +# else: +# os.killpg(os.getpgid(self.process.pid), signal.SIGTERM) +# except (subprocess.CalledProcessError, ProcessLookupError, OSError) as e: +# print(f"终止进程失败: {e}") +# finally: +# self.process = None +# self.log_queue.queue.clear() +# self.start_btn.configure(state="normal") +# self.stop_btn.configure(state="disabled") +# self.refresh_logs() - def read_output(self): - """读取日志进程的输出并放入队列""" - try: - while self.process and self.process.poll() is None: - line = self.process.stdout.readline() - if line: - self.log_queue.put(line) - else: - break # 避免空循环 - self.process.stdout.close() # 确保关闭文件描述符 - except ValueError: # 处理可能的I/O操作异常 - pass +# def read_output(self): +# """读取日志进程的输出并放入队列""" +# try: +# while self.process and self.process.poll() is None and self.is_running: +# line = self.process.stdout.readline() +# if line: +# self.log_queue.put(line) +# else: +# break # 避免空循环 +# self.process.stdout.close() # 确保关闭文件描述符 +# except ValueError: # 处理可能的I/O操作异常 +# pass - def process_log_queue(self): - """处理日志队列中的日志条目""" - while not self.log_queue.empty(): - line = self.log_queue.get() - self.process_log_line(line) - self.after(100, self.process_log_queue) +# def process_log_queue(self): +# """处理日志队列中的日志条目""" +# while not self.log_queue.empty(): +# line = self.log_queue.get() +# self.process_log_line(line) + +# # 仅在GUI仍在运行时继续处理队列 +# if self.is_running: +# self.after(100, self.process_log_queue) - def process_log_line(self, line): - """解析单行日志并更新日志数据和筛选器""" - match = re.match( - r"""^ - (?:(?P