Merge pull request #4 from Raven95676/dev

撤回部分更改

Author: Raven95676

README.md

@@ -13,9 +13,8 @@ AstrBot 的 lorebook 插件，支持自定义触发器、变量、逻辑、占
 
 建议在使用前先阅读[YAML 入门教程](https://www.runoob.com/w3cnote/yaml-intro.html)
 
-## 近期更改（0.1.1 - 0.1.2）
+## 近期更改（0.1.1 - 0.1.4）
 
-- 优化处理器和解析器性能
 - 实现作用域继承与变量值占位符解析
 - 添加非逻辑
 - 按会话、人格隔离lorebook

core/handlers/logic_handler.py

@@ -1,5 +1,3 @@
-from functools import lru_cache
-
 # 定义支持的比较运算符及其对应的函数
 OPERATORS = [
     ("==", lambda x, y: x == y),  # 等于
@@ -77,7 +75,6 @@ def handle_logic_oper(self, function: str, args: list[str]) -> str:
             case _:
                 return "未知逻辑操作"
 
-    @lru_cache(maxsize=128)
     def _eval_cond(self, condition: str) -> bool:
         """处理条件表达式
 
@@ -135,7 +132,6 @@ def _eval_cond(self, condition: str) -> bool:
         # 如果没有匹配到任何运算符，将非空条件视为真
         return bool(condition)
 
-    @lru_cache(maxsize=256)
     def _try_numeric_conversion(self, value: str) -> int | float | str:
         """尝试将值转换为数值类型
 

core/handlers/random_handler.py

@@ -1,6 +1,5 @@
 import random
 import re
-from functools import lru_cache
 
 from astrbot.api import logger
 
@@ -57,7 +56,6 @@ def handle_random_oper(self, args: list[str]) -> str:
                 except Exception as e:
                     return f"参数无效: {e}"
 
-    @lru_cache(maxsize=128)
     def _is_num(self, s: str) -> bool:
         """检查字符串是否可以转换为整数（包括负数）
 

core/handlers/time_handler.py

@@ -1,8 +1,7 @@
 from datetime import datetime
-from functools import lru_cache
 from typing import Any
 
-from dateutil import relativedelta  # type: ignore
+from dateutil import relativedelta
 
 # 定义不同时间格式的格式化字符串
 TIME_FORMATS = {
@@ -145,38 +144,6 @@ def _adjust_time(self, delta_input: Any, positive: bool = True) -> str:
             case _:
                 return "时间增量输入类型无效"
 
-    @lru_cache(maxsize=64)
-    def _format_time_difference(self, seconds: float, is_past: bool) -> str:
-        """格式化时间差异为人性化字符串
-
-        Args:
-            seconds: 时间差异（秒）
-            is_past: 是否是过去时间
-
-        Returns:
-            人性化的时间差异描述
-        """
-        suffix = "前" if is_past else "后"
-        seconds = abs(seconds)
-
-        if seconds < 60:
-            return "刚刚"
-        elif seconds < 3600:  # 1小时内
-            minutes = int(seconds / 60)
-            return f"{minutes}分钟{suffix}"
-        elif seconds < 86400:  # 24小时内
-            hours = int(seconds / 3600)
-            return f"{hours}小时{suffix}"
-        elif seconds < 2592000:  # 约30天内
-            days = int(seconds / 86400)
-            return f"{days}天{suffix}"
-        elif seconds < 31536000:  # 1年内
-            months = int(seconds / 2592000)
-            return f"{months}个月{suffix}"
-        else:
-            years = int(seconds / 31536000)
-            return f"{years}年{suffix}"
-
     def _get_idle_duration(self, times: dict[str, datetime]) -> str:
         """计算并返回人性化的空闲时间字符串
 
@@ -192,6 +159,29 @@ def _get_idle_duration(self, times: dict[str, datetime]) -> str:
 
         # 确定是过去还是未来
         is_past = idle_seconds > 0
+        suffix = "前" if is_past else "后"
+
+        idle_seconds = abs(idle_seconds)
 
-        # 使用可缓存的辅助方法来格式化时间差异
-        return self._format_time_difference(idle_seconds, is_past)
+        if is_past:
+            delta = relativedelta.relativedelta(times["before"], times["after"])
+        else:
+            delta = relativedelta.relativedelta(times["after"], times["before"])
+
+        if idle_seconds < 60:
+            return "刚刚"
+        elif idle_seconds < 3600:  # 1小时内
+            minutes = delta.minutes
+            return f"{minutes}分钟{suffix}"
+        elif idle_seconds < 86400:  # 24小时内
+            hours = delta.hours
+            return f"{hours}小时{suffix}"
+        elif idle_seconds < 2592000:  # 约30天内
+            days = delta.days
+            return f"{days}天{suffix}"
+        elif idle_seconds < 31536000:  # 1年内
+            months = delta.months + delta.years * 12
+            return f"{months}个月{suffix}"
+        else:
+            years = delta.years
+            return f"{years}年{suffix}"

core/parser.py

@@ -3,7 +3,6 @@
 import re
 from collections import deque
 from datetime import datetime
-from functools import lru_cache
 from typing import Any
 
 from kwmatcher import AhoMatcher
@@ -204,7 +203,6 @@ def replace_match(match, phase):
 
         return text
 
-    @lru_cache(maxsize=128)
     def _split_args(self, args_str: str) -> list[str]:
         """切分参数字符串，支持引号保护。
 

main.py

@@ -15,7 +15,7 @@
 from .core.parser import LoreParser  # type: ignore
 
 
-@register("astrbot_plugin_lorebook_lite", "Raven95676", "lorebook插件", "0.1.3")
+@register("astrbot_plugin_lorebook_lite", "Raven95676", "lorebook插件", "0.1.4")
 class LorePlugin(Star):
     """Lorebook插件，用于根据预设规则处理聊天内容并修改LLM请求"""
 

metadata.yaml

@@ -1,6 +1,6 @@
 name: astrbot-plugin-lorebook-lite
 desc: Astrbot 轻量世界书插件
 help: 无
-version: v0.1.3
+version: v0.1.4
 author: Raven95676
 repo: https://github.com/Raven95676/astrbot_plugin_lorebook_lite