ErisPulse 2.1.14.dev1__py3-none-any.whl → 2.1.15.dev3__py3-none-any.whl

ErisPulse/Core/exceptions.py

@@ -1,4 +1,3 @@
-# exceptions.py (新文件名)
 """
 ErisPulse 全局异常处理系统
 
@@ -8,71 +7,44 @@ ErisPulse 全局异常处理系统
 import sys
 import traceback
 import asyncio
+import os
 from typing import Dict, Any, Type
-from .logger import logger
 
 class ExceptionHandler:
-    """异常处理器类"""
-    
     @staticmethod
     def format_exception(exc_type: Type[Exception], exc_value: Exception, exc_traceback: Any) -> str:
         """
-        格式化异常信息
-        
         :param exc_type: 异常类型
         :param exc_value: 异常值
         :param exc_traceback: 追踪信息
         :return: 格式化后的异常信息
         """
-        RED = '\033[91m'
-        YELLOW = '\033[93m'
-        BLUE = '\033[94m'
-        RESET = '\033[0m'
-        
-        error_title = f"{RED}{exc_type.__name__}{RESET}: {YELLOW}{exc_value}{RESET}"
-        traceback_lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
+        tb_list = traceback.extract_tb(exc_traceback)
+        if tb_list:
+            last_frame = tb_list[-1]
+            filename = os.path.basename(last_frame.filename)
+            line_number = last_frame.lineno
+            function_name = last_frame.name
+            return f"ERROR: {filename}:{function_name}:{line_number}: {exc_type.__name__}: {exc_value}"
+        else:
+            return f"ERROR: {exc_type.__name__}: {exc_value}"
         
-        colored_traceback = []
-        for line in traceback_lines:
-            if "File " in line and ", line " in line:
-                parts = line.split(', line ')
-                colored_line = f"{BLUE}{parts[0]}{RESET}, line {parts[1]}"
-                colored_traceback.append(colored_line)
-            else:
-                colored_traceback.append(f"{RED}{line}{RESET}")
-        
-        return f"""
-{error_title}
-{RED}Traceback:{RESET}
-{''.join(colored_traceback)}"""
-
     @staticmethod
     def format_async_exception(exception: Exception) -> str:
         """
-        格式化异步异常信息
-        
         :param exception: 异常对象
         :return: 格式化后的异常信息
         """
-        RED = '\033[91m'
-        YELLOW = '\033[93m'
-        BLUE = '\033[94m'
-        RESET = '\033[0m'
+        if exception.__traceback__:
+            tb_list = traceback.extract_tb(exception.__traceback__)
+            if tb_list:
+                last_frame = tb_list[-1]
+                filename = os.path.basename(last_frame.filename)
+                line_number = last_frame.lineno
+                function_name = last_frame.name
+                return f"ERROR: {filename}:{function_name}:{line_number}: {type(exception).__name__}: {exception}"
         
-        tb = ''.join(traceback.format_exception(type(exception), exception, exception.__traceback__))
-        
-        colored_tb = []
-        for line in tb.split('\n'):
-            if "File " in line and ", line " in line:
-                parts = line.split(', line ')
-                colored_line = f"{BLUE}{parts[0]}{RESET}, line {parts[1]}"
-                colored_tb.append(colored_line)
-            else:
-                colored_tb.append(f"{RED}{line}{RESET}")
-        
-        return f"""{RED}{type(exception).__name__}{RESET}: {YELLOW}{exception}{RESET}
-{RED}Traceback:{RESET}
-{''.join(colored_tb)}"""
+        return f"ERROR: {type(exception).__name__}: {exception}"
 
 def global_exception_handler(exc_type: Type[Exception], exc_value: Exception, exc_traceback: Any) -> None:
     """
@@ -83,13 +55,13 @@ def global_exception_handler(exc_type: Type[Exception], exc_value: Exception, ex
     :param exc_traceback: 追踪信息
     """
     try:
-        formatted_error = ExceptionHandler.format_exception(exc_type, exc_value, exc_traceback)
-        sys.stderr.write(formatted_error)
-        # 同时记录到日志系统
-        logger.error(f"未捕获异常: {exc_type.__name__}: {exc_value}")
-    except Exception:
-        # 防止异常处理过程中出现异常
-        sys.stderr.write(f"Uncaught exception: {exc_type.__name__}: {exc_value}\n")
+        from ErisPulse import logger
+        err_logger = logger.error
+    except ImportError:
+        err_logger = sys.stderr.write
+
+    formatted_error = ExceptionHandler.format_exception(exc_type, exc_value, exc_traceback)
+    err_logger(formatted_error)
 
 def async_exception_handler(loop: asyncio.AbstractEventLoop, context: Dict[str, Any]) -> None:
     """
@@ -98,39 +70,39 @@ def async_exception_handler(loop: asyncio.AbstractEventLoop, context: Dict[str,
     :param loop: 事件循环
     :param context: 上下文字典
     """
-    RED = '\033[91m'
-    YELLOW = '\033[93m'
-    RESET = '\033[0m'
+    try:
+        from ErisPulse import logger
+        err_logger = logger.error
+    except ImportError:
+        err_logger = sys.stderr.write
     
     exception = context.get('exception')
     if exception:
         try:
             formatted_error = ExceptionHandler.format_async_exception(exception)
-            sys.stderr.write(formatted_error)
-            # 同时记录到日志系统
-            logger.error(f"异步异常: {type(exception).__name__}: {exception}")
+            err_logger(formatted_error + '\n')
         except Exception:
-            sys.stderr.write(f"{RED}Async Error{RESET}: {YELLOW}{exception}{RESET}\n")
+            err_logger(f"ERROR: 捕捉器发生错误，原始异常信息：\n\n{exception}\n\n" + traceback.format_exc())
     else:
-        msg = context.get('message', 'Unknown async error')
-        sys.stderr.write(f"{RED}Async Error{RESET}: {YELLOW}{msg}{RESET}\n")
-        logger.error(f"异步错误: {msg}")
-
-# 注册全局异常处理器
-sys.excepthook = global_exception_handler
-try:
-    asyncio.get_event_loop().set_exception_handler(async_exception_handler)
-except RuntimeError:
-    # 如果还没有事件循环，则在创建时设置
-    pass
+        msg = context.get('message', '未知异步错误')
+        err_logger(f"ERROR: 未处理的异步错误: {msg}\n")
 
-# 提供一个函数用于在创建新事件循环时设置异常处理器
-def setup_async_exception_handler(loop: asyncio.AbstractEventLoop = None) -> None:
+def setup_async_loop(loop: asyncio.AbstractEventLoop = None) -> None:
     """
-    设置异步异常处理器
+    为指定的事件循环设置异常处理器
     
-    :param loop: 事件循环，如果为None则使用当前事件循环
+    :param loop: 事件循环实例，如果为None则使用当前事件循环
     """
     if loop is None:
-        loop = asyncio.get_event_loop()
-    loop.set_exception_handler(async_exception_handler)
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            loop = asyncio.get_event_loop()
+    
+    loop.set_exception_handler(async_exception_handler)
+
+sys.excepthook = global_exception_handler
+try:
+    asyncio.get_event_loop().set_exception_handler(async_exception_handler)
+except RuntimeError:
+    pass

ErisPulse/Core/logger.py

@@ -56,6 +56,10 @@ class Logger:
         """
         if limit > 0:
             self._max_logs = limit
+            # 更新所有已存在的日志列表大小
+            for module_name in self._logs:
+                while len(self._logs[module_name]) > self._max_logs:
+                    self._logs[module_name].pop(0)
             return True
         else:
             self._logger.warning("日志存储上限必须大于0。")
@@ -174,7 +178,7 @@ class Logger:
         self._logs[ModuleName].append(msg)
 
     def _setup_config(self):
-        from .config import get_logger_config
+        from .erispulse_config import get_logger_config
         logger_config = get_logger_config()
         if "level" in logger_config:
             self.set_level(logger_config["level"])
@@ -198,6 +202,20 @@ class Logger:
             module_name = "ErisPulse"
         return module_name
 
+    def get_child(self, child_name: str = None):
+        """
+        获取子日志记录器
+        
+        :param child_name: 子模块名称(可选)
+        :return: LoggerChild 子日志记录器实例
+        """
+        caller_module = self._get_caller()
+        if child_name:
+            full_module_name = f"{caller_module}.{child_name}"
+        else:
+            full_module_name = caller_module
+        return LoggerChild(self, full_module_name)
+
     def debug(self, msg, *args, **kwargs):
         caller_module = self._get_caller()
         if self._get_effective_level(caller_module) <= logging.DEBUG:
@@ -229,4 +247,63 @@ class Logger:
             self._logger.critical(f"[{caller_module}] {msg}", *args, **kwargs)
             raise Exception(msg)
 
-logger = Logger()
+
+class LoggerChild:
+    """
+    子日志记录器
+    
+    用于创建具有特定名称的子日志记录器，仅改变模块名称，其他功能全部委托给父日志记录器
+    """
+    
+    def __init__(self, parent_logger: Logger, name: str):
+        """
+        初始化子日志记录器
+        
+        :param parent_logger: 父日志记录器实例
+        :param name: 子日志记录器名称
+        """
+        self._parent = parent_logger
+        self._name = name
+        
+    def debug(self, msg, *args, **kwargs):
+        if self._parent._get_effective_level(self._name.split('.')[0]) <= logging.DEBUG:
+            self._parent._save_in_memory(self._name, msg)
+            self._parent._logger.debug(f"[{self._name}] {msg}", *args, **kwargs)
+
+    def info(self, msg, *args, **kwargs):
+        if self._parent._get_effective_level(self._name.split('.')[0]) <= logging.INFO:
+            self._parent._save_in_memory(self._name, msg)
+            self._parent._logger.info(f"[{self._name}] {msg}", *args, **kwargs)
+
+    def warning(self, msg, *args, **kwargs):
+        if self._parent._get_effective_level(self._name.split('.')[0]) <= logging.WARNING:
+            self._parent._save_in_memory(self._name, msg)
+            self._parent._logger.warning(f"[{self._name}] {msg}", *args, **kwargs)
+
+    def error(self, msg, *args, **kwargs):
+        if self._parent._get_effective_level(self._name.split('.')[0]) <= logging.ERROR:
+            self._parent._save_in_memory(self._name, msg)
+            self._parent._logger.error(f"[{self._name}] {msg}", *args, **kwargs)
+
+    def critical(self, msg, *args, **kwargs):
+        if self._parent._get_effective_level(self._name.split('.')[0]) <= logging.CRITICAL:
+            self._parent._save_in_memory(self._name, msg)
+            self._parent._logger.critical(f"[{self._name}] {msg}", *args, **kwargs)
+            raise Exception(msg)
+
+    def get_child(self, child_name: str):
+        """
+        获取子日志记录器的子记录器
+        
+        :param child_name: 子模块名称
+        :return: LoggerChild 子日志记录器实例
+        """
+        full_child_name = f"{self._name}.{child_name}"
+        return LoggerChild(self._parent, full_child_name)
+
+
+logger = Logger()
+
+__all__ = [
+    "logger"
+]

ErisPulse/Core/mods.py

@@ -30,8 +30,8 @@ class ModuleManager:
     DEFAULT_STATUS_PREFIX = "erispulse.data.modules.status:"
 
     def __init__(self):
-        from .env import env
-        self.env = env
+        from .storage import storage
+        self.storage = storage
         self._ensure_prefixes()
 
     def _ensure_prefixes(self) -> None:
@@ -39,10 +39,10 @@ class ModuleManager:
         {!--< internal-use >!--}
         确保模块前缀配置存在
         """
-        if not self.env.get("erispulse.system.module_prefix"):
-            self.env.set("erispulse.system.module_prefix", self.DEFAULT_MODULE_PREFIX)
-        if not self.env.get("erispulse.system.status_prefix"):
-            self.env.set("erispulse.system.status_prefix", self.DEFAULT_STATUS_PREFIX)
+        if not self.storage.get("erispulse.system.module_prefix"):
+            self.storage.set("erispulse.system.module_prefix", self.DEFAULT_MODULE_PREFIX)
+        if not self.storage.get("erispulse.system.status_prefix"):
+            self.storage.set("erispulse.system.status_prefix", self.DEFAULT_STATUS_PREFIX)
 
     @property
     def module_prefix(self) -> str:
@@ -51,7 +51,7 @@ class ModuleManager:
         
         :return: 模块数据前缀字符串
         """
-        return self.env.get("erispulse.system.module_prefix")
+        return self.storage.get("erispulse.system.module_prefix")
 
     @property
     def status_prefix(self) -> str:
@@ -60,7 +60,7 @@ class ModuleManager:
         
         :return: 模块状态前缀字符串
         """
-        return self.env.get("erispulse.system.status_prefix")
+        return self.storage.get("erispulse.system.status_prefix")
 
     def set_module_status(self, module_name: str, status: bool) -> None:
         """
@@ -76,7 +76,7 @@ class ModuleManager:
         >>> mods.set_module_status("MyModule", False)
         """
         from .logger import logger
-        self.env.set(f"{self.status_prefix}{module_name}", bool(status))
+        self.storage.set(f"{self.status_prefix}{module_name}", bool(status))
         logger.debug(f"模块 {module_name} 状态已设置为 {status}")
 
     def get_module_status(self, module_name: str) -> bool:
@@ -90,7 +90,7 @@ class ModuleManager:
         >>> if mods.get_module_status("MyModule"):
         >>>     print("模块已启用")
         """
-        status = self.env.get(f"{self.status_prefix}{module_name}", True)
+        status = self.storage.get(f"{self.status_prefix}{module_name}", True)
         if isinstance(status, str):
             return status.lower() not in ('false', '0', 'no', 'off')
         return bool(status)
@@ -108,7 +108,7 @@ class ModuleManager:
         >>>     "description": "我的模块",
         >>> })
         """
-        self.env.set(f"{self.module_prefix}{module_name}", module_info)
+        self.storage.set(f"{self.module_prefix}{module_name}", module_info)
 
     def get_module(self, module_name: str) -> Optional[Dict[str, Any]]:
         """
@@ -122,7 +122,7 @@ class ModuleManager:
         >>> if module_info:
         >>>     print(f"模块版本: {module_info.get('version')}")
         """
-        return self.env.get(f"{self.module_prefix}{module_name}")
+        return self.storage.get(f"{self.module_prefix}{module_name}")
 
     def set_all_modules(self, modules_info: Dict[str, Dict[str, Any]]) -> None:
         """
@@ -151,7 +151,7 @@ class ModuleManager:
         >>>     print(f"{name}: {info.get('status')}")
         """
         modules_info = {}
-        all_keys = self.env.get_all_keys()
+        all_keys = self.storage.get_all_keys()
         prefix_len = len(self.module_prefix)
 
         for key in all_keys:
@@ -185,9 +185,9 @@ class ModuleManager:
         module_key = f"{self.module_prefix}{module_name}"
         status_key = f"{self.status_prefix}{module_name}"
 
-        if self.env.get(module_key) is not None:
-            self.env.delete(module_key)
-            self.env.delete(status_key)
+        if self.storage.get(module_key) is not None:
+            self.storage.delete(module_key)
+            self.storage.delete(status_key)
             return True
         return False
 
@@ -208,12 +208,16 @@ class ModuleManager:
         if module_prefix:
             if not module_prefix.endswith(':'):
                 module_prefix += ':'
-            self.env.set("erispulse.system.module_prefix", module_prefix)
+            self.storage.set("erispulse.system.module_prefix", module_prefix)
 
         if status_prefix:
             if not status_prefix.endswith(':'):
                 status_prefix += ':'
-            self.env.set("erispulse.system.status_prefix", status_prefix)
+            self.storage.set("erispulse.system.status_prefix", status_prefix)
 
 
 mods = ModuleManager()
+
+__all__ = [
+    "mods",
+]

ErisPulse/Core/router.py

@@ -254,4 +254,9 @@ class RouterManager:
 router = RouterManager()
 
 # 兼容性实例
-adapter_server = router
+adapter_server = router
+
+__all__ = [
+    "router",
+    "adapter_server"
+]