ErisPulse 2.1.7rc1__py3-none-any.whl → 2.1.9__py3-none-any.whl

ErisPulse/Core/__init__.py

@@ -19,17 +19,3 @@ __all__ = [
     'util',
     'adapter_server'
 ]
-
-_config = env.getConfig("ErisPulse")
-
-if _config is None:
-    defaultConfig = {
-        "server": {
-            "host": "0.0.0.0",
-            "port": 8000,
-            "ssl_certfile": None,
-            "ssl_keyfile": None
-        }
-    }
-    env.setConfig("ErisPulse", defaultConfig)
-    _config = defaultConfig

ErisPulse/Core/adapter.py

@@ -402,17 +402,14 @@ class AdapterManager:
         if platforms is None:
             platforms = list(self._adapters.keys())
 
-        from .env import env
-        from .logger import logger
         from .server import adapter_server
-
-        from . import _config
-        server_config = _config.get("server", {})
+        from .core_config import get_server_config
+        server_config = get_server_config()
         host = server_config["host"]
         port = server_config["port"]
         ssl_cert = server_config.get("ssl_certfile", None)
         ssl_key = server_config.get("ssl_keyfile", None)
-
+        
         # 启动服务器
         await adapter_server.start(
             host=host,

ErisPulse/Core/core_config.py

@@ -0,0 +1,109 @@
+"""
+ErisPulse 配置中心
+
+集中管理所有配置项，避免循环导入问题
+提供自动补全缺失配置项的功能
+"""
+
+from typing import Dict, Any, Optional
+
+# 默认配置
+DEFAULT_CONFIG = {
+    "server": {
+        "host": "0.0.0.0",
+        "port": 8000,
+        "ssl_certfile": None,
+        "ssl_keyfile": None
+    },
+    "logger": {
+        "level": "INFO",
+        "log_files": [],
+        "memory_limit": 1000
+    }
+}
+
+def _ensure_config_structure(config: Dict[str, Any]) -> Dict[str, Any]:
+    """
+    确保配置结构完整，补全缺失的配置项
+    
+    :param config: 当前配置
+    :return: 补全后的完整配置
+    """
+    merged_config = DEFAULT_CONFIG.copy()
+    
+    # 深度合并配置
+    for section, default_values in DEFAULT_CONFIG.items():
+        if section not in config:
+            config[section] = default_values.copy()
+            continue
+            
+        if not isinstance(config[section], dict):
+            config[section] = default_values.copy()
+            continue
+            
+        for key, default_value in default_values.items():
+            if key not in config[section]:
+                config[section][key] = default_value
+                
+    return config
+
+def get_config() -> Dict[str, Any]:
+    """
+    获取当前配置，自动补全缺失的配置项并保存
+    
+    :return: 完整的配置字典
+    """
+    from .env import env
+    
+    # 获取现有配置
+    current_config = env.getConfig("ErisPulse")
+    
+    # 如果完全没有配置，设置默认配置
+    if current_config is None:
+        env.setConfig("ErisPulse", DEFAULT_CONFIG)
+        return DEFAULT_CONFIG
+    
+    # 检查并补全缺失的配置项
+    complete_config = _ensure_config_structure(current_config)
+    
+    # 如果配置有变化，更新到存储
+    if current_config != complete_config:
+        env.setConfig("ErisPulse", complete_config)
+    
+    return complete_config
+
+def update_config(new_config: Dict[str, Any]) -> bool:
+    """
+    更新配置，自动补全缺失的配置项
+    
+    :param new_config: 新的配置字典
+    :return: 是否更新成功
+    """
+    from .env import env
+    
+    # 获取当前配置并合并新配置
+    current = get_config()
+    merged = {**current, **new_config}
+    
+    # 确保合并后的配置结构完整
+    complete_config = _ensure_config_structure(merged)
+    
+    return env.setConfig("ErisPulse", complete_config)
+
+def get_server_config() -> Dict[str, Any]:
+    """
+    获取服务器配置，确保结构完整
+    
+    :return: 服务器配置字典
+    """
+    config = get_config()
+    return config["server"]
+
+def get_logger_config() -> Dict[str, Any]:
+    """
+    获取日志配置，确保结构完整
+    
+    :return: 日志配置字典
+    """
+    config = get_config()
+    return config["logger"]

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,9 +116,9 @@ 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
             except Exception as e:
                 self._logger.error(f"无法设置日志文件 {p}: {e}")
@@ -141,10 +164,25 @@ 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 .core_config import get_logger_config
+        logger_config = get_logger_config()
+        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.7rc1.dist-info → erispulse-2.1.9.dist-info}/METADATA

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

erispulse-2.1.9.dist-info/RECORD

@@ -0,0 +1,16 @@
+ErisPulse/__init__.py,sha256=T-N56UQyBmpvlqwH2wGi5ptPzaJpbgF5tKkJt0DlkaM,26099
+ErisPulse/__main__.py,sha256=QwHMu8lmWbjS3EyOYV-wea3I0xcGmH_McWNx7JSGwts,24853
+ErisPulse/Core/__init__.py,sha256=tBYPahQ7-w7U6M69xy8DW0_ECa9ja-Q0y_SQqVswYBo,409
+ErisPulse/Core/adapter.py,sha256=Kmm_D8UcrDBJfn9EemAbgh3NB06Aj8u3iVNrBa1htJI,18107
+ErisPulse/Core/core_config.py,sha256=LwsOOIrZqm3-oUR-zkkaw_fmR3f4wMlEhFrc2tgiiRU,2847
+ErisPulse/Core/env.py,sha256=D2BwtSbKggbeAsOzwwVv-kd5UkVmYlDUHtgLzFZqKUI,19841
+ErisPulse/Core/logger.py,sha256=WfoFLHQfhRo4hKx-nOSTWq3maLMv-RexWLATvWQO4mc,8300
+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.9.dist-info/METADATA,sha256=SolTFf_3ALM1br71LporfFLq_2UM_ikHkNqEbqBxV1Q,6258
+erispulse-2.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+erispulse-2.1.9.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
+erispulse-2.1.9.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
+erispulse-2.1.9.dist-info/RECORD,,

erispulse-2.1.7rc1.dist-info/RECORD

@@ -1,15 +0,0 @@
-ErisPulse/__init__.py,sha256=T-N56UQyBmpvlqwH2wGi5ptPzaJpbgF5tKkJt0DlkaM,26099
-ErisPulse/__main__.py,sha256=QwHMu8lmWbjS3EyOYV-wea3I0xcGmH_McWNx7JSGwts,24853
-ErisPulse/Core/__init__.py,sha256=XnQFMn4HMKzxa6KHJEvOpwt0v8jp21vAbw6aG0O8sPs,722
-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/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.7rc1.dist-info/METADATA,sha256=7ITW_Im5RNEPNc6z5Nn5mMKRcfI-8FXV4kPsMYCPmeY,6261
-erispulse-2.1.7rc1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-erispulse-2.1.7rc1.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
-erispulse-2.1.7rc1.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
-erispulse-2.1.7rc1.dist-info/RECORD,,