Merge branch 'dev' into plugin

src/chat/focus_chat/hfc_utils.py

@@ -3,22 +3,21 @@ import json
 
 from typing import Optional, Dict, Any
 
+from src.config.config import global_config
+from src.common.message_repository import count_messages
+from src.common.logger import get_logger
 from src.chat.message_receive.message import MessageRecv, BaseMessageInfo
 from src.chat.message_receive.chat_stream import ChatStream
 from src.chat.message_receive.message import UserInfo
-from src.common.logger import get_logger
 
 logger = get_logger(__name__)
 
-log_dir = "log/log_cycle_debug/"
-
 
 class CycleDetail:
     """循环信息记录类"""
 
     def __init__(self, cycle_id: int):
         self.cycle_id = cycle_id
-        self.prefix = ""
         self.thinking_id = ""
         self.start_time = time.time()
         self.end_time: Optional[float] = None
@@ -80,85 +79,34 @@ class CycleDetail:
             "loop_action_info": convert_to_serializable(self.loop_action_info),
         }
 
-    def complete_cycle(self):
-        """完成循环，记录结束时间"""
-        self.end_time = time.time()
-
-        # 处理 prefix，只保留中英文字符和基本标点
-        if not self.prefix:
-            self.prefix = "group"
-        else:
-            # 只保留中文、英文字母、数字和基本标点
-            allowed_chars = set("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_")
-            self.prefix = (
-                "".join(char for char in self.prefix if "\u4e00" <= char <= "\u9fff" or char in allowed_chars)
-                or "group"
-            )
-
-    def set_thinking_id(self, thinking_id: str):
-        """设置思考消息ID"""
-        self.thinking_id = thinking_id
-
     def set_loop_info(self, loop_info: Dict[str, Any]):
         """设置循环信息"""
         self.loop_plan_info = loop_info["loop_plan_info"]
         self.loop_action_info = loop_info["loop_action_info"]
 
 
-async def create_empty_anchor_message(
-    platform: str, group_info: dict, chat_stream: ChatStream
-) -> Optional[MessageRecv]:
+def get_recent_message_stats(minutes: int = 30, chat_id: str = None) -> dict:
     """
-    重构观察到的最后一条消息作为回复的锚点，
-    如果重构失败或观察为空，则创建一个占位符。
+    Args:
+        minutes (int): 检索的分钟数，默认30分钟
+        chat_id (str, optional): 指定的chat_id，仅统计该chat下的消息。为None时统计全部。
+    Returns:
+        dict: {"bot_reply_count": int, "total_message_count": int}
     """
 
-    placeholder_id = f"mid_pf_{int(time.time() * 1000)}"
-    placeholder_user = UserInfo(user_id="system_trigger", user_nickname="System Trigger", platform=platform)
-    placeholder_msg_info = BaseMessageInfo(
-        message_id=placeholder_id,
-        platform=platform,
-        group_info=group_info,  # type: ignore
-        user_info=placeholder_user,
-        time=time.time(),
-    )
-    placeholder_msg_dict = {
-        "message_info": placeholder_msg_info.to_dict(),
-        "processed_plain_text": "[System Trigger Context]",
-        "raw_message": "",
-        "time": placeholder_msg_info.time,
-    }
-    anchor_message = MessageRecv(placeholder_msg_dict)
-    anchor_message.update_chat_stream(chat_stream)
+    now = time.time()
+    start_time = now - minutes * 60
+    bot_id = global_config.bot.qq_account
 
-    return anchor_message
+    filter_base = {"time": {"$gte": start_time}}
+    if chat_id is not None:
+        filter_base["chat_id"] = chat_id
 
+    # 总消息数
+    total_message_count = count_messages(filter_base)
+    # bot自身回复数
+    bot_filter = filter_base.copy()
+    bot_filter["user_id"] = bot_id
+    bot_reply_count = count_messages(bot_filter)
 
-def parse_thinking_id_to_timestamp(thinking_id: str) -> float:
-    """
-    将形如 'tid<timestamp>' 的 thinking_id 解析回 float 时间戳
-    例如: 'tid1718251234.56' -> 1718251234.56
-    """
-    if not thinking_id.startswith("tid"):
-        raise ValueError("thinking_id 格式不正确")
-    ts_str = thinking_id[3:]
-    return float(ts_str)
-
-
-def get_keywords_from_json(json_str: str) -> list[str]:
-    # 提取JSON内容
-    start = json_str.find("{")
-    end = json_str.rfind("}") + 1
-    if start == -1 or end == 0:
-        logger.error("未找到有效的JSON内容")
-        return []
-
-    json_content = json_str[start:end]
-
-    # 解析JSON
-    try:
-        json_data = json.loads(json_content)
-        return json_data.get("keywords", [])
-    except json.JSONDecodeError as e:
-        logger.error(f"JSON解析失败: {e}")
-        return []
+    return {"bot_reply_count": bot_reply_count, "total_message_count": total_message_count}