fix：移动config位置，修复颜文字bug

src/config/config.py

@@ -44,7 +44,7 @@ else:
 
 def update_config():
     # 获取根目录路径
-    root_dir = Path(__file__).parent.parent.parent.parent
+    root_dir = Path(__file__).parent.parent.parent
     template_dir = root_dir / "template"
     config_dir = root_dir / "config"
     old_config_dir = config_dir / "old"
@@ -305,7 +305,7 @@ class BotConfig:
     def get_config_dir() -> str:
         """获取配置文件目录"""
         current_dir = os.path.dirname(os.path.abspath(__file__))
-        root_dir = os.path.abspath(os.path.join(current_dir, "..", "..", ".."))
+        root_dir = os.path.abspath(os.path.join(current_dir, "..", ".."))
         config_dir = os.path.join(root_dir, "config")
         if not os.path.exists(config_dir):
             os.makedirs(config_dir)

src/do_tool/tool_can_use/change_mood.py

@@ -1,5 +1,5 @@
 from src.do_tool.tool_can_use.base_tool import BaseTool
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 from src.common.logger import get_module_logger
 from src.plugins.moods.moods import MoodManager
 from src.plugins.chat_module.think_flow_chat.think_flow_generator import ResponseGenerator

src/do_tool/tool_use.py

@@ -1,5 +1,5 @@
 from src.plugins.models.utils_model import LLMRequest
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 from src.plugins.chat.chat_stream import ChatStream
 from src.common.database import db
 import time
@@ -7,6 +7,8 @@ import json
 from src.common.logger import get_module_logger, TOOL_USE_STYLE_CONFIG, LogConfig
 from src.do_tool.tool_can_use import get_all_tool_definitions, get_tool_instance
 from src.heart_flow.sub_heartflow import SubHeartflow
+import traceback
+from src.plugins.chat.utils import get_recent_group_detailed_plain_text
 
 tool_use_config = LogConfig(
     # 使用消息发送专用样式
@@ -195,6 +197,7 @@ class ToolUser:
 
         except Exception as e:
             logger.error(f"工具调用过程中出错: {str(e)}")
+            logger.error(f"工具调用过程中出错: {traceback.format_exc()}")
             return {
                 "used_tools": False,
                 "error": str(e),

src/gui/logger_gui.py

@@ -1,378 +0,0 @@
-# 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")
-
-
-# class LogViewerApp(ctk.CTk):
-#     """日志查看器应用的主类，继承自customtkinter的CTk类"""
-
-#     def __init__(self):
-#         """初始化日志查看器应用的界面和状态"""
-#         super().__init__()
-#         self.title("日志查看器")
-#         self.geometry("1200x800")
-
-#         # 标记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.column_visibility = {"show_time": True, "show_level": True, "show_module": True}
-
-#         # 选中的日志等级和模块
-#         self.selected_levels = set()
-#         self.selected_modules = set()
-
-#         # 创建界面组件并启动日志队列处理
-#         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)
-
-#         # 控制面板
-#         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.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)
-
-#         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.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()
-
-#         # 筛选面板
-#         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.module_filter_entry = ctk.CTkEntry(filter_frame, placeholder_text="输入模块过滤词")
-#         self.module_filter_entry.pack(pady=5)
-#         self.module_filter_entry.bind("<KeyRelease>", 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.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()
-
-#     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")
-
-#         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()
-
-#         # 重建排序后的复选框
-#         for module in self.sorted_modules:
-#             self.add_checkbox(self.module_scroll, module, "module")
-
-#     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()
-
-#         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_ == "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 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 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 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)
-
-#         # 仅在GUI仍在运行时继续处理队列
-#         if self.is_running:
-#             self.after(100, self.process_log_queue)
-
-#     def process_log_line(self, line):
-#         """解析单行日志并更新日志数据和筛选器"""
-#         match = re.match(
-#             r"""^
-#             (?:(?P<time>\d{2}:\d{2}(?::\d{2})?)\s*\|\s*)?
-#             (?P<level>\w+)\s*\|\s*
-#             (?P<module>.*?)
-#             \s*[-|]\s*
-#             (?P<message>.*)
-#             $""",
-#             line.strip(),
-#             re.VERBOSE,
-#         )
-
-#         if match:
-#             groups = match.groupdict()
-#             time = groups.get("time", "")
-#             level = groups.get("level", "OTHER")
-#             module = groups.get("module", "UNKNOWN").strip()
-#             message = groups.get("message", "").strip()
-#             raw_line = line
-#         else:
-#             time, level, module, message = "", "OTHER", "UNKNOWN", line
-#             raw_line = line
-
-#         self.update_filters(level, module)
-#         log_entry = {"raw": raw_line, "time": time, "level": level, "module": module, "message": message}
-#         self.log_data.append(log_entry)
-
-#         if self.check_filter(log_entry):
-#             self.display_log(log_entry)
-
-#     def get_module_key(self, module_name):
-#         """获取模块名称的标准化键"""
-#         cleaned = module_name.strip()
-#         return re.sub(r":\d+$", "", cleaned)
-
-#     def display_log(self, entry):
-#         """在日志文本框中显示日志条目"""
-#         parts = []
-#         tags = []
-
-#         if self.column_visibility["show_time"] and entry["time"]:
-#             parts.append(f"{entry['time']} ")
-#             tags.append("time")
-
-#         if self.column_visibility["show_level"]:
-#             level_tag = entry["level"] if entry["level"] in self.color_config else "default"
-#             parts.append(f"{entry['level']:<8} ")
-#             tags.append(level_tag)
-
-#         if self.column_visibility["show_module"]:
-#             parts.append(f"{entry['module']} ")
-#             tags.append("module")
-
-#         parts.append(f"- {entry['message']}\n")
-#         tags.append("default")
-
-#         self.log_text.configure(state="normal")
-#         for part, tag in zip(parts, tags):
-#             self.log_text.insert("end", part, tag)
-#         self.log_text.see("end")
-#         self.log_text.configure(state="disabled")
-
-#     def refresh_logs(self):
-#         """刷新日志显示，根据筛选条件重新显示日志"""
-#         self.column_visibility = {
-#             "show_time": self.time_check.get(),
-#             "show_level": self.level_check.get(),
-#             "show_module": self.module_check.get(),
-#         }
-
-#         self.log_text.configure(state="normal")
-#         self.log_text.delete("1.0", "end")
-
-#         filtered_logs = [entry for entry in self.log_data if self.check_filter(entry)]
-
-#         for entry in filtered_logs:
-#             parts = []
-#             tags = []
-
-#             if self.column_visibility["show_time"] and entry["time"]:
-#                 parts.append(f"{entry['time']} ")
-#                 tags.append("time")
-
-#             if self.column_visibility["show_level"]:
-#                 level_tag = entry["level"] if entry["level"] in self.color_config else "default"
-#                 parts.append(f"{entry['level']:<8} ")
-#                 tags.append(level_tag)
-
-#             if self.column_visibility["show_module"]:
-#                 parts.append(f"{entry['module']} ")
-#                 tags.append("module")
-
-#             parts.append(f"- {entry['message']}\n")
-#             tags.append("default")
-
-#             for part, tag in zip(parts, tags):
-#                 self.log_text.insert("end", part, tag)
-
-#         self.log_text.see("end")
-#         self.log_text.configure(state="disabled")
-
-#     def clear_logs(self):
-#         """清空日志文本框中的内容"""
-#         self.log_text.configure(state="normal")
-#         self.log_text.delete("1.0", "end")
-#         self.log_text.configure(state="disabled")
-
-#     def _on_closing(self):
-#         """处理窗口关闭事件，安全清理资源"""
-#         # 标记GUI已关闭
-#         self.is_running = False
-
-#         # 停止日志进程
-#         self.stop_process()
-
-#         # 安全清理tkinter变量
-#         for attr_name in list(self.__dict__.keys()):
-#             if isinstance(getattr(self, attr_name), (ctk.Variable, ctk.StringVar, ctk.IntVar, ctk.DoubleVar, ctk.BooleanVar)):
-#                 try:
-#                     var = getattr(self, attr_name)
-#                     var.set(None)
-#                 except Exception:
-#                     pass
-#                 setattr(self, attr_name, None)
-
-#         self.quit()
-#         sys.exit(0)
-
-
-# if __name__ == "__main__":
-#     # 启动日志查看器应用
-#     app = LogViewerApp()
-#     app.mainloop()

src/gui/reasoning_gui.py

@@ -1,342 +0,0 @@
-# import os
-# import queue
-# import sys
-# import threading
-# import time
-# from datetime import datetime
-# from typing import Dict, List
-# from typing import Optional
-
-# sys.path.insert(0, sys.path[0] + "/../")
-# sys.path.insert(0, sys.path[0] + "/../")
-# from src.common.logger import get_module_logger
-
-# import customtkinter as ctk
-# from dotenv import load_dotenv
-
-# logger = get_module_logger("gui")
-
-# # 获取当前文件的目录
-# current_dir = os.path.dirname(os.path.abspath(__file__))
-# # 获取项目根目录
-# root_dir = os.path.abspath(os.path.join(current_dir, "..", ".."))
-# sys.path.insert(0, root_dir)
-# from src.common.database import db  # noqa: E402
-
-# # 加载环境变量
-# if os.path.exists(os.path.join(root_dir, ".env.dev")):
-#     load_dotenv(os.path.join(root_dir, ".env.dev"))
-#     logger.info("成功加载开发环境配置")
-# elif os.path.exists(os.path.join(root_dir, ".env")):
-#     load_dotenv(os.path.join(root_dir, ".env"))
-#     logger.info("成功加载生产环境配置")
-# else:
-#     logger.error("未找到环境配置文件")
-#     sys.exit(1)
-
-
-# class ReasoningGUI:
-#     def __init__(self):
-#         # 记录启动时间戳，转换为Unix时间戳
-#         self.start_timestamp = datetime.now().timestamp()
-#         logger.info(f"程序启动时间戳: {self.start_timestamp}")
-
-#         # 设置主题
-#         ctk.set_appearance_mode("dark")
-#         ctk.set_default_color_theme("blue")
-
-#         # 创建主窗口
-#         self.root = ctk.CTk()
-#         self.root.title("麦麦推理")
-#         self.root.geometry("800x600")
-#         self.root.protocol("WM_DELETE_WINDOW", self._on_closing)
-
-#         # 存储群组数据
-#         self.group_data: Dict[str, List[dict]] = {}
-
-#         # 创建更新队列
-#         self.update_queue = queue.Queue()
-
-#         # 创建主框架
-#         self.frame = ctk.CTkFrame(self.root)
-#         self.frame.pack(pady=20, padx=20, fill="both", expand=True)
-
-#         # 添加标题
-#         self.title = ctk.CTkLabel(self.frame, text="麦麦的脑内所想", font=("Arial", 24))
-#         self.title.pack(pady=10, padx=10)
-
-#         # 创建左右分栏
-#         self.paned = ctk.CTkFrame(self.frame)
-#         self.paned.pack(fill="both", expand=True, padx=10, pady=10)
-
-#         # 左侧群组列表
-#         self.left_frame = ctk.CTkFrame(self.paned, width=200)
-#         self.left_frame.pack(side="left", fill="y", padx=5, pady=5)
-
-#         self.group_label = ctk.CTkLabel(self.left_frame, text="群组列表", font=("Arial", 16))
-#         self.group_label.pack(pady=5)
-
-#         # 创建可滚动框架来容纳群组按钮
-#         self.group_scroll_frame = ctk.CTkScrollableFrame(self.left_frame, width=180, height=400)
-#         self.group_scroll_frame.pack(pady=5, padx=5, fill="both", expand=True)
-
-#         # 存储群组按钮的字典
-#         self.group_buttons: Dict[str, ctk.CTkButton] = {}
-#         # 当前选中的群组ID
-#         self.selected_group_id: Optional[str] = None
-
-#         # 右侧内容显示
-#         self.right_frame = ctk.CTkFrame(self.paned)
-#         self.right_frame.pack(side="right", fill="both", expand=True, padx=5, pady=5)
-
-#         self.content_label = ctk.CTkLabel(self.right_frame, text="推理内容", font=("Arial", 16))
-#         self.content_label.pack(pady=5)
-
-#         # 创建富文本显示框
-#         self.content_text = ctk.CTkTextbox(self.right_frame, width=500, height=400)
-#         self.content_text.pack(pady=5, padx=5, fill="both", expand=True)
-
-#         # 配置文本标签 - 只使用颜色
-#         self.content_text.tag_config("timestamp", foreground="#888888")  # 时间戳使用灰色
-#         self.content_text.tag_config("user", foreground="#4CAF50")  # 用户名使用绿色
-#         self.content_text.tag_config("message", foreground="#2196F3")  # 消息使用蓝色
-#         self.content_text.tag_config("model", foreground="#9C27B0")  # 模型名称使用紫色
-#         self.content_text.tag_config("prompt", foreground="#FF9800")  # prompt内容使用橙色
-#         self.content_text.tag_config("reasoning", foreground="#FF9800")  # 推理过程使用橙色
-#         self.content_text.tag_config("response", foreground="#E91E63")  # 回复使用粉色
-#         self.content_text.tag_config("separator", foreground="#666666")  # 分隔符使用深灰色
-
-#         # 底部控制栏
-#         self.control_frame = ctk.CTkFrame(self.frame)
-#         self.control_frame.pack(fill="x", padx=10, pady=5)
-
-#         self.clear_button = ctk.CTkButton(self.control_frame, text="清除显示", command=self.clear_display, width=120)
-#         self.clear_button.pack(side="left", padx=5)
-
-#         # 添加标志，标记GUI是否已关闭
-#         self.is_running = True
-
-#         # 启动自动更新线程
-#         self.update_thread = threading.Thread(target=self._auto_update, daemon=True)
-#         self.update_thread.start()
-
-#         # 启动GUI更新检查
-#         self.root.after(100, self._process_queue)
-
-#     def _on_closing(self):
-#         """处理窗口关闭事件"""
-#         # 标记GUI已关闭，防止后台线程继续访问tkinter对象
-#         self.is_running = False
-
-#         # 安全清理所有可能的tkinter变量
-#         for attr_name in list(self.__dict__.keys()):
-#             if isinstance(getattr(self, attr_name), (ctk.Variable, ctk.StringVar, ctk.IntVar, ctk.DoubleVar, ctk.BooleanVar)):
-#                 # 删除变量前安全地将其设置为None
-#                 try:
-#                     var = getattr(self, attr_name)
-#                     var.set(None)
-#                 except Exception:
-#                     pass
-#                 setattr(self, attr_name, None)
-
-#         # 退出
-#         self.root.quit()
-#         sys.exit(0)
-
-#     def _process_queue(self):
-#         """处理更新队列中的任务"""
-#         try:
-#             while True:
-#                 task = self.update_queue.get_nowait()
-#                 if task["type"] == "update_group_list":
-#                     self._update_group_list_gui()
-#                 elif task["type"] == "update_display":
-#                     self._update_display_gui(task["group_id"])
-#         except queue.Empty:
-#             pass
-#         finally:
-#             # 继续检查队列，但仅在GUI仍在运行时
-#             if self.is_running:
-#                 self.root.after(100, self._process_queue)
-
-#     def _update_group_list_gui(self):
-#         """在主线程中更新群组列表"""
-#         # 清除现有按钮
-#         for button in self.group_buttons.values():
-#             button.destroy()
-#         self.group_buttons.clear()
-
-#         # 创建新的群组按钮
-#         for group_id in self.group_data.keys():
-#             button = ctk.CTkButton(
-#                 self.group_scroll_frame,
-#                 text=f"群号: {group_id}",
-#                 width=160,
-#                 height=30,
-#                 corner_radius=8,
-#                 command=lambda gid=group_id: self._on_group_select(gid),
-#             )
-#             button.pack(pady=2, padx=5)
-#             self.group_buttons[group_id] = button
-
-#         # 如果有选中的群组，保持其高亮状态
-#         if self.selected_group_id and self.selected_group_id in self.group_buttons:
-#             self._highlight_selected_group(self.selected_group_id)
-
-#     def _on_group_select(self, group_id: str):
-#         """处理群组选择事件"""
-#         self._highlight_selected_group(group_id)
-#         self._update_display_gui(group_id)
-
-#     def _highlight_selected_group(self, group_id: str):
-#         """高亮显示选中的群组按钮"""
-#         # 重置所有按钮的颜色
-#         for gid, button in self.group_buttons.items():
-#             if gid == group_id:
-#                 # 设置选中按钮的颜色
-#                 button.configure(fg_color="#1E88E5", hover_color="#1976D2")
-#             else:
-#                 # 恢复其他按钮的默认颜色
-#                 button.configure(fg_color="#2B2B2B", hover_color="#404040")
-
-#         self.selected_group_id = group_id
-
-#     def _update_display_gui(self, group_id: str):
-#         """在主线程中更新显示内容"""
-#         if group_id in self.group_data:
-#             self.content_text.delete("1.0", "end")
-#             for item in self.group_data[group_id]:
-#                 # 时间戳
-#                 time_str = item["time"].strftime("%Y-%m-%d %H:%M:%S")
-#                 self.content_text.insert("end", f"[{time_str}]\n", "timestamp")
-
-#                 # 用户信息
-#                 self.content_text.insert("end", "用户: ", "timestamp")
-#                 self.content_text.insert("end", f"{item.get('user', '未知')}\n", "user")
-
-#                 # 消息内容
-#                 self.content_text.insert("end", "消息: ", "timestamp")
-#                 self.content_text.insert("end", f"{item.get('message', '')}\n", "message")
-
-#                 # 模型信息
-#                 self.content_text.insert("end", "模型: ", "timestamp")
-#                 self.content_text.insert("end", f"{item.get('model', '')}\n", "model")
-
-#                 # Prompt内容
-#                 self.content_text.insert("end", "Prompt内容:\n", "timestamp")
-#                 prompt_text = item.get("prompt", "")
-#                 if prompt_text and prompt_text.lower() != "none":
-#                     lines = prompt_text.split("\n")
-#                     for line in lines:
-#                         if line.strip():
-#                             self.content_text.insert("end", "    " + line + "\n", "prompt")
-#                 else:
-#                     self.content_text.insert("end", "    无Prompt内容\n", "prompt")
-
-#                 # 推理过程
-#                 self.content_text.insert("end", "推理过程:\n", "timestamp")
-#                 reasoning_text = item.get("reasoning", "")
-#                 if reasoning_text and reasoning_text.lower() != "none":
-#                     lines = reasoning_text.split("\n")
-#                     for line in lines:
-#                         if line.strip():
-#                             self.content_text.insert("end", "    " + line + "\n", "reasoning")
-#                 else:
-#                     self.content_text.insert("end", "    无推理过程\n", "reasoning")
-
-#                 # 回复内容
-#                 self.content_text.insert("end", "回复: ", "timestamp")
-#                 self.content_text.insert("end", f"{item.get('response', '')}\n", "response")
-
-#                 # 分隔符
-#                 self.content_text.insert("end", f"\n{'=' * 50}\n\n", "separator")
-
-#             # 滚动到顶部
-#             self.content_text.see("1.0")
-
-#     def _auto_update(self):
-#         """自动更新函数"""
-#         while True:
-#             if not self.is_running:
-#                 break  # 如果GUI已关闭，停止线程
-
-#             try:
-#                 # 从数据库获取最新数据，只获取启动时间之后的记录
-#                 query = {"time": {"$gt": self.start_timestamp}}
-#                 logger.debug(f"查询条件: {query}")
-
-#                 # 先获取一条记录检查时间格式
-#                 sample = db.reasoning_logs.find_one()
-#                 if sample:
-#                     logger.debug(f"样本记录时间格式: {type(sample['time'])} 值: {sample['time']}")
-
-#                 cursor = db.reasoning_logs.find(query).sort("time", -1)
-#                 new_data = {}
-#                 total_count = 0
-
-#                 for item in cursor:
-#                     # 调试输出
-#                     if total_count == 0:
-#                         logger.debug(f"记录时间: {item['time']}, 类型: {type(item['time'])}")
-
-#                     total_count += 1
-#                     group_id = str(item.get("group_id", "unknown"))
-#                     if group_id not in new_data:
-#                         new_data[group_id] = []
-
-#                     # 转换时间戳为datetime对象
-#                     if isinstance(item["time"], (int, float)):
-#                         time_obj = datetime.fromtimestamp(item["time"])
-#                     elif isinstance(item["time"], datetime):
-#                         time_obj = item["time"]
-#                     else:
-#                         logger.warning(f"未知的时间格式: {type(item['time'])}")
-#                         time_obj = datetime.now()  # 使用当前时间作为后备
-
-#                     new_data[group_id].append(
-#                         {
-#                             "time": time_obj,
-#                             "user": item.get("user", "未知"),
-#                             "message": item.get("message", ""),
-#                             "model": item.get("model", "未知"),
-#                             "reasoning": item.get("reasoning", ""),
-#                             "response": item.get("response", ""),
-#                             "prompt": item.get("prompt", ""),  # 添加prompt字段
-#                         }
-#                     )
-
-#                 logger.info(f"从数据库加载了 {total_count} 条记录，分布在 {len(new_data)} 个群组中")
-
-#                 # 更新数据
-#                 if new_data != self.group_data:
-#                     self.group_data = new_data
-#                     logger.info("数据已更新，正在刷新显示...")
-#                     # 将更新任务添加到队列
-#                     self.update_queue.put({"type": "update_group_list"})
-#                     if self.group_data:
-#                         # 如果没有选中的群组，选择最新的群组
-#                         if not self.selected_group_id or self.selected_group_id not in self.group_data:
-#                             self.selected_group_id = next(iter(self.group_data))
-#                         self.update_queue.put({"type": "update_display", "group_id": self.selected_group_id})
-#             except Exception:
-#                 logger.exception("自动更新出错")
-
-#             # 每5秒更新一次
-#             time.sleep(5)
-
-#     def clear_display(self):
-#         """清除显示内容"""
-#         self.content_text.delete("1.0", "end")
-
-#     def run(self):
-#         """运行GUI"""
-#         self.root.mainloop()
-
-
-# def main():
-#     app = ReasoningGUI()
-#     app.run()
-
-
-# if __name__ == "__main__":
-#     main()

src/heart_flow/heartflow.py

@@ -2,7 +2,7 @@ from .sub_heartflow import SubHeartflow
 from .observation import ChattingObservation
 from src.plugins.moods.moods import MoodManager
 from src.plugins.models.utils_model import LLMRequest
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 from src.plugins.schedule.schedule_generator import bot_schedule
 from src.plugins.utils.prompt_builder import Prompt, global_prompt_manager
 import asyncio

src/heart_flow/observation.py

@@ -2,7 +2,7 @@
 # 外部世界可以是某个聊天 不同平台的聊天 也可以是任意媒体
 from datetime import datetime
 from src.plugins.models.utils_model import LLMRequest
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 from src.common.database import db
 from src.common.logger import get_module_logger
 import traceback

src/heart_flow/sub_heartflow.py

@@ -2,7 +2,7 @@ from .observation import Observation, ChattingObservation
 import asyncio
 from src.plugins.moods.moods import MoodManager
 from src.plugins.models.utils_model import LLMRequest
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 import time
 from src.plugins.chat.message import UserInfo
 from src.plugins.chat.utils import parse_text_timestamps
@@ -44,7 +44,7 @@ def init_prompt():
     prompt += "现在你接下去继续思考，产生新的想法，不要分点输出，输出连贯的内心独白"
     prompt += "思考时可以想想如何对群聊内容进行回复。回复的要求是：平淡一些，简短一些，说中文，尽量不要说你说过的话。如果你要回复，最好只回复一个人的一个话题\n"
     prompt += "请注意不要输出多余内容(包括前后缀，冒号和引号，括号， 表情，等)，不要带有括号和动作描写"
-    prompt += "记得结合上述的消息，生成内心想法，文字不要浮夸，注意你就是{bot_name}，{bot_name}指的就是你。"
+    prompt += "记得结合上述的消息，生成内心想法，文字不要浮夸，注意{bot_name}指的就是你。"
     Prompt(prompt, "sub_heartflow_prompt_before")
     prompt = ""
     # prompt += f"你现在正在做的事情是：{schedule_info}\n"

src/main.py

@@ -11,7 +11,7 @@ from .heart_flow.heartflow import heartflow
 from .plugins.memory_system.Hippocampus import HippocampusManager
 from .plugins.chat.messagesender import message_manager
 from .plugins.storage.storage import MessageStorage
-from .plugins.config.config import global_config
+from .config.config import global_config
 from .plugins.chat.bot import chat_bot
 from .common.logger import get_module_logger
 from .plugins.remote import heartbeat_thread  # noqa: F401

src/plugins/PFC/action_planner.py

@@ -1,7 +1,7 @@
 from typing import Tuple
 from src.common.logger import get_module_logger
 from ..models.utils_model import LLMRequest
-from ..config.config import global_config
+from ...config.config import global_config
 from .chat_observer import ChatObserver
 from .pfc_utils import get_items_from_json
 from src.individuality.individuality import Individuality

src/plugins/PFC/chat_observer.py

@@ -4,7 +4,7 @@ import traceback
 from typing import Optional, Dict, Any, List
 from src.common.logger import get_module_logger
 from ..message.message_base import UserInfo
-from ..config.config import global_config
+from ...config.config import global_config
 from .chat_states import NotificationManager, create_new_message_notification, create_cold_chat_notification
 from .message_storage import MongoDBMessageStorage
 

src/plugins/PFC/pfc.py

@@ -9,7 +9,7 @@ from ..chat.chat_stream import ChatStream
 from ..message.message_base import UserInfo, Seg
 from ..chat.message import Message
 from ..models.utils_model import LLMRequest
-from ..config.config import global_config
+from ...config.config import global_config
 from src.plugins.chat.message import MessageSending
 from ..message.api import global_api
 from ..storage.storage import MessageStorage

src/plugins/PFC/pfc_KnowledgeFetcher.py

@@ -2,7 +2,7 @@ from typing import List, Tuple
 from src.common.logger import get_module_logger
 from src.plugins.memory_system.Hippocampus import HippocampusManager
 from ..models.utils_model import LLMRequest
-from ..config.config import global_config
+from ...config.config import global_config
 from ..chat.message import Message
 
 logger = get_module_logger("knowledge_fetcher")

src/plugins/PFC/reply_checker.py

@@ -3,7 +3,7 @@ import datetime
 from typing import Tuple
 from src.common.logger import get_module_logger
 from ..models.utils_model import LLMRequest
-from ..config.config import global_config
+from ...config.config import global_config
 from .chat_observer import ChatObserver
 from ..message.message_base import UserInfo
 

src/plugins/PFC/reply_generator.py

@@ -1,7 +1,7 @@
 from typing import Tuple
 from src.common.logger import get_module_logger
 from ..models.utils_model import LLMRequest
-from ..config.config import global_config
+from ...config.config import global_config
 from .chat_observer import ChatObserver
 from .reply_checker import ReplyChecker
 from src.individuality.individuality import Individuality

src/plugins/PFC/waiter.py

@@ -2,7 +2,7 @@ from src.common.logger import get_module_logger
 from .chat_observer import ChatObserver
 from .conversation_info import ConversationInfo
 from src.individuality.individuality import Individuality
-from ..config.config import global_config
+from ...config.config import global_config
 import time
 import asyncio
 

src/plugins/chat/bot.py

@@ -1,5 +1,5 @@
 from ..moods.moods import MoodManager  # 导入情绪管理器
-from ..config.config import global_config
+from ...config.config import global_config
 from .message import MessageRecv
 from ..PFC.pfc_manager import PFCManager
 from .chat_stream import chat_manager

src/plugins/chat/emoji_manager.py

@@ -10,7 +10,7 @@ from PIL import Image
 import io
 
 from ...common.database import db
-from ..config.config import global_config
+from ...config.config import global_config
 from ..chat.utils import get_embedding
 from ..chat.utils_image import ImageManager, image_path_to_base64
 from ..models.utils_model import LLMRequest

src/plugins/chat/message_buffer.py

@@ -9,7 +9,7 @@ from typing import Dict
 from collections import OrderedDict
 import random
 import time
-from ..config.config import global_config
+from ...config.config import global_config
 
 logger = get_module_logger("message_buffer")
 

src/plugins/chat/messagesender.py

@@ -8,7 +8,7 @@ from ..message.api import global_api
 from .message import MessageSending, MessageThinking, MessageSet
 
 from ..storage.storage import MessageStorage
-from ..config.config import global_config
+from ...config.config import global_config
 from .utils import truncate_message, calculate_typing_time, count_messages_between
 
 from src.common.logger import LogConfig, SENDER_STYLE_CONFIG

src/plugins/chat/utils.py

@@ -10,7 +10,7 @@ from src.common.logger import get_module_logger
 
 from ..models.utils_model import LLMRequest
 from ..utils.typo_generator import ChineseTypoGenerator
-from ..config.config import global_config
+from ...config.config import global_config
 from .message import MessageRecv, Message
 from ..message.message_base import UserInfo
 from .chat_stream import ChatStream
@@ -520,8 +520,7 @@ def protect_kaomoji(sentence):
         r"]"
         r")"
         r"|"
-        r"([▼▽・ᴥω･﹏^><≧≦￣｀´∀ヮДд︿﹀へ｡ﾟ╥╯╰︶︹•⁄]{2,15"
+        r"([▼▽・ᴥω･﹏^><≧≦￣｀´∀ヮДд︿﹀へ｡ﾟ╥╯╰︶︹•⁄]{2,15})"
-        r"}"
     )
 
     kaomoji_matches = kaomoji_pattern.findall(sentence)
@@ -718,12 +717,30 @@ def parse_text_timestamps(text: str, mode: str = "normal") -> str:
     # normal模式: 直接转换所有时间戳
     if mode == "normal":
         result_text = text
+        
+        # 将时间戳转换为可读格式并记录相同格式的时间戳
+        timestamp_readable_map = {}
+        readable_time_used = set()
+        
         for match in matches:
             timestamp = float(match.group(1))
             readable_time = translate_timestamp_to_human_readable(timestamp, "normal")
-            # 由于替换会改变文本长度，需要使用正则替换而非直接替换
+            timestamp_readable_map[match.group(0)] = (timestamp, readable_time)
-            pattern_instance = re.escape(match.group(0))
+        
-            result_text = re.sub(pattern_instance, readable_time, result_text, count=1)
+        # 按时间戳排序
+        sorted_timestamps = sorted(timestamp_readable_map.items(), key=lambda x: x[1][0])
+        
+        # 执行替换，相同格式的只保留最早的
+        for ts_str, (_, readable) in sorted_timestamps:
+            pattern_instance = re.escape(ts_str)
+            if readable in readable_time_used:
+                # 如果这个可读时间已经使用过，替换为空字符串
+                result_text = re.sub(pattern_instance, "", result_text, count=1)
+            else:
+                # 否则替换为可读时间并记录
+                result_text = re.sub(pattern_instance, readable, result_text, count=1)
+                readable_time_used.add(readable)
+        
         return result_text
     else:
         # lite模式: 按5秒间隔划分并选择性转换
@@ -782,15 +799,30 @@ def parse_text_timestamps(text: str, mode: str = "normal") -> str:
                 pattern_instance = re.escape(match.group(0))
                 result_text = re.sub(pattern_instance, "", result_text, count=1)
 
-        # 按照时间戳原始顺序排序，避免替换时位置错误
+        # 按照时间戳升序排序
-        to_convert.sort(key=lambda x: x[1].start())
+        to_convert.sort(key=lambda x: x[0])
+        
+        # 将时间戳转换为可读时间并记录哪些可读时间已经使用过
+        converted_timestamps = []
+        readable_time_used = set()
         
-        # 执行替换
-        # 由于替换会改变文本长度，从后向前替换
-        to_convert.reverse()
         for ts, match in to_convert:
             readable_time = translate_timestamp_to_human_readable(ts, "relative")
+            converted_timestamps.append((ts, match, readable_time))
+        
+        # 按照时间戳原始顺序排序，避免替换时位置错误
+        converted_timestamps.sort(key=lambda x: x[1].start())
+        
+        # 从后向前替换，避免位置改变
+        converted_timestamps.reverse()
+        for ts, match, readable_time in converted_timestamps:
             pattern_instance = re.escape(match.group(0))
+            if readable_time in readable_time_used:
+                # 如果相同格式的时间已存在，替换为空字符串
+                result_text = re.sub(pattern_instance, "", result_text, count=1)
+            else:
+                # 否则替换为可读时间并记录
                 result_text = re.sub(pattern_instance, readable_time, result_text, count=1)
+                readable_time_used.add(readable_time)
 
         return result_text

src/plugins/chat/utils_image.py

@@ -8,7 +8,7 @@ import io
 
 
 from ...common.database import db
-from ..config.config import global_config
+from ...config.config import global_config
 from ..models.utils_model import LLMRequest
 
 from src.common.logger import get_module_logger

src/plugins/chat_module/only_process/only_message_process.py

@@ -1,7 +1,7 @@
 from src.common.logger import get_module_logger
 from src.plugins.chat.message import MessageRecv
 from src.plugins.storage.storage import MessageStorage
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 from datetime import datetime
 
 logger = get_module_logger("pfc_message_processor")

src/plugins/chat_module/reasoning_chat/reasoning_chat.py

@@ -4,7 +4,7 @@ from random import random
 from typing import List
 from ...memory_system.Hippocampus import HippocampusManager
 from ...moods.moods import MoodManager
-from ...config.config import global_config
+from ....config.config import global_config
 from ...chat.emoji_manager import emoji_manager
 from .reasoning_generator import ResponseGenerator
 from ...chat.message import MessageSending, MessageRecv, MessageThinking, MessageSet

src/plugins/chat_module/reasoning_chat/reasoning_generator.py

@@ -2,7 +2,7 @@ from typing import List, Optional, Tuple, Union
 import random
 
 from ...models.utils_model import LLMRequest
-from ...config.config import global_config
+from ....config.config import global_config
 from ...chat.message import MessageThinking
 from .reasoning_prompt_builder import prompt_builder
 from ...chat.utils import process_llm_response

src/plugins/chat_module/reasoning_chat/reasoning_prompt_builder.py

@@ -9,7 +9,7 @@ from ...moods.moods import MoodManager
 from ....individuality.individuality import Individuality
 from ...memory_system.Hippocampus import HippocampusManager
 from ...schedule.schedule_generator import bot_schedule
-from ...config.config import global_config
+from ....config.config import global_config
 from ...person_info.relationship_manager import relationship_manager
 from src.common.logger import get_module_logger
 from src.plugins.utils.prompt_builder import Prompt, global_prompt_manager

src/plugins/chat_module/think_flow_chat/think_flow_chat.py

@@ -4,7 +4,7 @@ import traceback
 from typing import List
 from ...memory_system.Hippocampus import HippocampusManager
 from ...moods.moods import MoodManager
-from ...config.config import global_config
+from ....config.config import global_config
 from ...chat.emoji_manager import emoji_manager
 from .think_flow_generator import ResponseGenerator
 from ...chat.message import MessageSending, MessageRecv, MessageThinking, MessageSet

src/plugins/chat_module/think_flow_chat/think_flow_generator.py

@@ -3,7 +3,7 @@ import random
 
 
 from ...models.utils_model import LLMRequest
-from ...config.config import global_config
+from ....config.config import global_config
 from ...chat.message import MessageRecv
 from .think_flow_prompt_builder import prompt_builder
 from ...chat.utils import process_llm_response

src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py

@@ -1,7 +1,7 @@
 import random
 from typing import Optional
 
-from ...config.config import global_config
+from ....config.config import global_config
 from ...chat.utils import get_recent_group_detailed_plain_text
 from ...chat.chat_stream import chat_manager
 from src.common.logger import get_module_logger

src/plugins/config/config_env.py

@@ -1,59 +0,0 @@
-import os
-from pathlib import Path
-from dotenv import load_dotenv
-
-
-class EnvConfig:
-    _instance = None
-
-    def __new__(cls):
-        if cls._instance is None:
-            cls._instance = super(EnvConfig, cls).__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-
-    def __init__(self):
-        if self._initialized:
-            return
-
-        self._initialized = True
-        self.ROOT_DIR = Path(__file__).parent.parent.parent.parent
-        self.load_env()
-
-    def load_env(self):
-        env_file = self.ROOT_DIR / ".env"
-        if env_file.exists():
-            load_dotenv(env_file)
-
-            # 根据ENVIRONMENT变量加载对应的环境文件
-            env_type = os.getenv("ENVIRONMENT", "prod")
-            if env_type == "dev":
-                env_file = self.ROOT_DIR / ".env.dev"
-            elif env_type == "prod":
-                env_file = self.ROOT_DIR / ".env"
-
-            if env_file.exists():
-                load_dotenv(env_file, override=True)
-
-    def get(self, key, default=None):
-        return os.getenv(key, default)
-
-    def get_all(self):
-        return dict(os.environ)
-
-    def __getattr__(self, name):
-        return self.get(name)
-
-
-# 创建全局实例
-env_config = EnvConfig()
-
-
-# 导出环境变量
-def get_env(key, default=None):
-    return os.getenv(key, default)
-
-
-# 导出所有环境变量
-def get_all_env():
-    return dict(os.environ)

src/plugins/memory_system/debug_memory.py

@@ -7,7 +7,7 @@ import os
 # 添加项目根目录到系统路径
 sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))))
 from src.plugins.memory_system.Hippocampus import HippocampusManager
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 
 
 async def test_memory_system():

src/plugins/models/utils_model.py

@@ -11,7 +11,7 @@ from PIL import Image
 import io
 import os
 from ...common.database import db
-from ..config.config import global_config
+from ...config.config import global_config
 
 logger = get_module_logger("model_utils")
 

src/plugins/moods/moods.py

@@ -3,7 +3,7 @@ import threading
 import time
 from dataclasses import dataclass
 
-from ..config.config import global_config
+from ...config.config import global_config
 from src.common.logger import get_module_logger, LogConfig, MOOD_STYLE_CONFIG
 from ..person_info.relationship_manager import relationship_manager
 from src.individuality.individuality import Individuality

src/plugins/person_info/person_info.py

@@ -7,7 +7,7 @@ import datetime
 import asyncio
 import numpy as np
 from src.plugins.models.utils_model import LLMRequest
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 from src.individuality.individuality import Individuality
 
 import matplotlib

src/plugins/remote/remote.py

@@ -6,7 +6,7 @@ import os
 import json
 import threading
 from src.common.logger import get_module_logger
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 
 logger = get_module_logger("remote")
 

src/plugins/respon_info_catcher/info_catcher.py

@@ -1,4 +1,4 @@
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 from src.plugins.chat.message import MessageRecv, MessageSending, Message
 from src.common.database import db
 import time

src/plugins/schedule/schedule_generator.py

@@ -12,7 +12,7 @@ sys.path.append(root_path)
 from src.common.database import db  # noqa: E402
 from src.common.logger import get_module_logger, SCHEDULE_STYLE_CONFIG, LogConfig  # noqa: E402
 from src.plugins.models.utils_model import LLMRequest  # noqa: E402
-from src.plugins.config.config import global_config  # noqa: E402
+from src.config.config import global_config  # noqa: E402
 
 TIME_ZONE = tz.gettz(global_config.TIME_ZONE)  # 设置时区
 

src/plugins/topic_identify/topic_identifier.py

@@ -2,7 +2,7 @@ from typing import List, Optional
 
 
 from ..models.utils_model import LLMRequest
-from ..config.config import global_config
+from ...config.config import global_config
 from src.common.logger import get_module_logger, LogConfig, TOPIC_STYLE_CONFIG
 
 # 定义日志配置

src/plugins/willing/mode_llmcheck.py

@@ -13,7 +13,7 @@ llmcheck 模式：
 import time
 from loguru import logger
 from ..models.utils_model import LLM_request
-from ..config.config import global_config
+from ...config.config import global_config
 from ..chat.chat_stream import ChatStream
 from ..chat.utils import get_recent_group_detailed_plain_text
 from .willing_manager import BaseWillingManager

src/plugins/willing/willing_manager.py

@@ -1,6 +1,6 @@
 from src.common.logger import LogConfig, WILLING_STYLE_CONFIG, LoguruLogger, get_module_logger
 from dataclasses import dataclass
-from ..config.config import global_config, BotConfig
+from ...config.config import global_config, BotConfig
 from ..chat.chat_stream import ChatStream, GroupInfo
 from ..chat.message import MessageRecv
 from ..person_info.person_info import person_info_manager, PersonInfoManager