ErisPulse 2.1.7.post1__py3-none-any.whl → 2.1.8__py3-none-any.whl

ErisPulse/Core/__init__.py

@@ -29,7 +29,29 @@ if _config is None:
             "port": 8000,
             "ssl_certfile": None,
             "ssl_keyfile": None
+        },
+        "logger": {
+            "level": "INFO",
+            "log_files": [],
+            "memory_limit": 1000
         }
     }
     env.setConfig("ErisPulse", defaultConfig)
-    _config = defaultConfig
+    _config = defaultConfig
+
+if _config.get("server") is None:
+    _config["server"] = {
+        "host": "0.0.0.0",
+        "port": 8000,
+        "ssl_certfile": None,
+        "ssl_keyfile": None
+    }
+    env.setConfig("ErisPulse", _config)
+    
+if _config.get("logger") is None:
+    _config["logger"] = {
+        "level": "INFO",
+        "log_files": [],
+        "memory_limit": 1000
+    }
+    env.setConfig("ErisPulse", _config)

ErisPulse/Core/logger.py

@@ -14,6 +14,8 @@ import logging
 import inspect
 import datetime
 from typing import List, Dict, Any, Optional, Union, Type, Set, Tuple, FrozenSet
+from rich.logging import RichHandler
+from rich.console import Console
 
 class Logger:
     """
@@ -28,15 +30,36 @@ class Logger:
     {!--< /tips >!--}
     """
     def __init__(self):
+        self._max_logs = 1000
         self._logs = {}
         self._module_levels = {}
         self._logger = logging.getLogger("ErisPulse")
         self._logger.setLevel(logging.DEBUG)
         self._file_handler = None
         if not self._logger.handlers:
-            console_handler = logging.StreamHandler()
-            console_handler.setFormatter(logging.Formatter("%(message)s"))
+            console_handler = RichHandler(
+                console=Console(),
+                show_time=False,
+                show_level=True,
+                show_path=False,
+                markup=True
+            )
             self._logger.addHandler(console_handler)
+        self._setup_config()
+            
+    def set_memory_limit(self, limit: int) -> bool:
+        """
+        设置日志内存存储上限
+        
+        :param limit: 日志存储上限
+        :return: bool 设置是否成功
+        """
+        if limit > 0:
+            self._max_logs = limit
+            return True
+        else:
+            self._logger.warning("日志存储上限必须大于0。")
+            return False
 
     def set_level(self, level: str) -> bool:
         """
@@ -63,8 +86,8 @@ class Logger:
         :param level: 日志级别(DEBUG/INFO/WARNING/ERROR/CRITICAL)
         :return: bool 设置是否成功
         """
-        from .env import env
-        if not env.get_module_status(module_name):
+        from .mods import mods
+        if not mods.get_module_status(module_name):
             self._logger.warning(f"模块 {module_name} 未启用，无法设置日志等级。")
             return False
         level = level.upper()
@@ -93,7 +116,8 @@ class Logger:
         for p in path:
             try:
                 file_handler = logging.FileHandler(p, encoding='utf-8')
-                file_handler.setFormatter(logging.Formatter("%(message)s"))
+                # 使用自定义格式化器去除rich markup标签
+                file_handler.setFormatter(logging.Formatter("[%(name)s] %(message)s"))
                 self._logger.addHandler(file_handler)
                 self._logger.info(f"日志输出已设置到文件: {p}")
                 return True
@@ -141,10 +165,27 @@ class Logger:
     def _save_in_memory(self, ModuleName, msg):
         if ModuleName not in self._logs:
             self._logs[ModuleName] = []
+        
+        # 检查日志数量是否超过限制
+        if len(self._logs[ModuleName]) >= self._max_logs:
+            self._logs[ModuleName].pop(0)
+            
         timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         msg = f"{timestamp} - {msg}"
         self._logs[ModuleName].append(msg)
 
+    def _setup_config(self):
+        from .env import env
+        _config = env.getConfig("ErisPulse")
+        if "logger" in _config:
+            logger_config = _config["logger"]
+            if "level" in logger_config:
+                self.set_level(logger_config["level"])
+            if "log_files" in logger_config and logger_config["log_files"]:
+                self.set_output_file(logger_config["log_files"])
+            if "memory_limit" in logger_config:
+                self.set_memory_limit(logger_config["memory_limit"])
+
     def _get_effective_level(self, module_name):
         return self._module_levels.get(module_name, self._logger.level)
 

{erispulse-2.1.7.post1.dist-info → erispulse-2.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.1.7.post1
+Version: 2.1.8
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>, runoneall <runoobsteve@gmail.com>
 License: MIT License

{erispulse-2.1.7.post1.dist-info → erispulse-2.1.8.dist-info}/RECORD

@@ -1,15 +1,15 @@
 ErisPulse/__init__.py,sha256=T-N56UQyBmpvlqwH2wGi5ptPzaJpbgF5tKkJt0DlkaM,26099
 ErisPulse/__main__.py,sha256=QwHMu8lmWbjS3EyOYV-wea3I0xcGmH_McWNx7JSGwts,24853
-ErisPulse/Core/__init__.py,sha256=XnQFMn4HMKzxa6KHJEvOpwt0v8jp21vAbw6aG0O8sPs,722
+ErisPulse/Core/__init__.py,sha256=xmz9RzIbM6umY-3FNFMLC5Pht7yBCH70XJG4Ehv0veU,1249
 ErisPulse/Core/adapter.py,sha256=lw5T336EsNtjUgSPdevcOZReZNkA8oYvvTRCHk_fo_o,18149
 ErisPulse/Core/env.py,sha256=D2BwtSbKggbeAsOzwwVv-kd5UkVmYlDUHtgLzFZqKUI,19841
-ErisPulse/Core/logger.py,sha256=VYhWKPXn88ib7S_OKCr_MibdnMH8k5sHkwLtNDZP3QM,7034
+ErisPulse/Core/logger.py,sha256=4ZEdX2CB9L6WQH-GNKN-p_qpiZnwJr_w9Q9P0zF8U44,8451
 ErisPulse/Core/mods.py,sha256=2yIq8t9Ca9CBPRiZU0yr8Lc0XGmmkB7LlH-5FWqXjw4,7023
 ErisPulse/Core/raiserr.py,sha256=vlyaaiOIYkyqm9dAqSW9E54JBzX-9roHDp5_r6I0yUU,5591
 ErisPulse/Core/server.py,sha256=FkDTeLuHD5IBnWVxvYU8pHb6yCt8GzyvC1bpOiJ7G7I,9217
 ErisPulse/Core/util.py,sha256=7rdMmn6sBFqYd4znxBCcJjuv2eyTExdeKyZopgds868,3796
-erispulse-2.1.7.post1.dist-info/METADATA,sha256=hGo9d1vO8_GNViOyuE_ZaKEX9MvfVrIN6vNqKQwgQX8,6264
-erispulse-2.1.7.post1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-erispulse-2.1.7.post1.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
-erispulse-2.1.7.post1.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
-erispulse-2.1.7.post1.dist-info/RECORD,,
+erispulse-2.1.8.dist-info/METADATA,sha256=g9cby76kIhcKukKJv508YJ0TOCqNv6doqQgmzwJkyfE,6258
+erispulse-2.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+erispulse-2.1.8.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
+erispulse-2.1.8.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
+erispulse-2.1.8.dist-info/RECORD,,