ErisPulse 2.1.14.dev1__py3-none-any.whl → 2.1.14.dev2__py3-none-any.whl

ErisPulse/Core/__init__.py

@@ -2,16 +2,16 @@ from .adapter import AdapterFather, SendDSL, adapter
 from .env import env
 from .logger import logger
 from .mods import mods
-from .exceptions import exceptions
 from .router import router, adapter_server
 from .config import config
+from . import exceptions
+
 BaseAdapter = AdapterFather
 
 __all__ = [
     'BaseAdapter',
     'AdapterFather',
     'SendDSL',
-    'exceptions',
     'adapter',
     'env',
     'logger',

ErisPulse/Core/adapter.py

@@ -18,7 +18,7 @@ from typing import (
     Union, Awaitable
 )
 from collections import defaultdict
-
+from .logger import logger
 
 class SendDSLBase:
     """
@@ -112,7 +112,6 @@ class BaseAdapter:
             :example:
             >>> await adapter.Send.To("123").Example("Hello")
             """
-            from .logger import logger
             logger.debug(f"适配器 {self._adapter.__class__.__name__} 发送了实例类型的消息: {text}")
             
         
@@ -376,7 +375,7 @@ class AdapterManager:
             for name in set(combinations):
                 setattr(self, name, instance)
         else:
-            self.logger.warning(f"平台名 {platform} 过长，如果您是开发者，请考虑使用更短的名称")
+            logger.warning(f"平台名 {platform} 过长，如果您是开发者，请考虑使用更短的名称")
             setattr(self, platform.lower(), instance)
             setattr(self, platform.upper(), instance)
             setattr(self, platform.capitalize(), instance)
@@ -405,12 +404,12 @@ class AdapterManager:
             if platform not in self._adapters:
                 raise ValueError(f"平台 {platform} 未注册")
         
-        self.logger.info(f"启动适配器 {platforms}")
+        logger.info(f"启动适配器 {platforms}")
 
-        # 启动OneBot服务
         from .router import adapter_server
-        from .config import get_server_config
+        from .erispulse_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)
@@ -447,16 +446,14 @@ class AdapterManager:
         :param adapter: 适配器实例
         :param platform: 平台名称
         """
-        from .. import sdk
 
-        # 加锁防止并发启动
         if not getattr(adapter, "_starting_lock", None):
             adapter._starting_lock = asyncio.Lock()
 
         async with adapter._starting_lock:
             # 再次确认是否已经被启动
             if adapter in self._started_instances:
-                sdk.logger.info(f"适配器 {platform}（实例ID: {id(adapter)}）已被其他协程启动，跳过")
+                logger.info(f"适配器 {platform}（实例ID: {id(adapter)}）已被其他协程启动，跳过")
                 return
 
             retry_count = 0
@@ -470,12 +467,12 @@ class AdapterManager:
                     return
                 except Exception as e:
                     retry_count += 1
-                    sdk.logger.error(f"平台 {platform} 启动失败（第{retry_count}次重试）: {e}")
+                    logger.error(f"平台 {platform} 启动失败（第{retry_count}次重试）: {e}")
 
                     try:
                         await adapter.shutdown()
                     except Exception as stop_err:
-                        sdk.logger.warning(f"停止适配器失败: {stop_err}")
+                        logger.warning(f"停止适配器失败: {stop_err}")
 
                     # 计算等待时间
                     if retry_count <= len(backoff_intervals):
@@ -483,7 +480,7 @@ class AdapterManager:
                     else:
                         wait_time = fixed_delay
 
-                    sdk.logger.info(f"将在 {wait_time // 60} 分钟后再次尝试重启 {platform}")
+                    logger.info(f"将在 {wait_time // 60} 分钟后再次尝试重启 {platform}")
                     await asyncio.sleep(wait_time)
 
     async def shutdown(self) -> None:

ErisPulse/Core/config.py

@@ -72,101 +72,3 @@ class ConfigManager:
             return False
 
 config = ConfigManager()
-
-# 默认配置
-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: 完整的配置字典
-    """
-
-    # 获取现有配置
-    current_config = config.getConfig("ErisPulse")
-    
-    # 如果完全没有配置，设置默认配置
-    if current_config is None:
-        config.setConfig("ErisPulse", DEFAULT_CONFIG)
-        return DEFAULT_CONFIG
-    
-    # 检查并补全缺失的配置项
-    complete_config = _ensure_config_structure(current_config)
-    
-    # 如果配置有变化，更新到存储
-    if current_config != complete_config:
-        config.setConfig("ErisPulse", complete_config)
-    
-    return complete_config
-
-def update_config(new_config: Dict[str, Any]) -> bool:
-    """
-    更新配置，自动补全缺失的配置项
-    
-    :param new_config: 新的配置字典
-    :return: 是否更新成功
-    """
-    # 获取当前配置并合并新配置
-    current = get_config()
-    merged = {**current, **new_config}
-    
-    # 确保合并后的配置结构完整
-    complete_config = _ensure_config_structure(merged)
-    
-    return config.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/erispulse_config.py

@@ -0,0 +1,105 @@
+"""
+ErisPulse 框架配置管理
+
+专门管理 ErisPulse 框架自身的配置项。
+"""
+
+from typing import Dict, Any
+from .config import config
+
+# 默认配置
+DEFAULT_ERISPULSE_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_erispulse_config_structure(config_dict: Dict[str, Any]) -> Dict[str, Any]:
+    """
+    确保 ErisPulse 配置结构完整，补全缺失的配置项
+    
+    :param config_dict: 当前配置
+    :return: 补全后的完整配置
+    """
+    merged_config = DEFAULT_ERISPULSE_CONFIG.copy()
+    
+    # 深度合并配置
+    for section, default_values in DEFAULT_ERISPULSE_CONFIG.items():
+        if section not in config_dict:
+            config_dict[section] = default_values.copy()
+            continue
+            
+        if not isinstance(config_dict[section], dict):
+            config_dict[section] = default_values.copy()
+            continue
+            
+        for key, default_value in default_values.items():
+            if key not in config_dict[section]:
+                config_dict[section][key] = default_value
+                
+    return config_dict
+
+def get_erispulse_config() -> Dict[str, Any]:
+    """
+    获取 ErisPulse 框架配置，自动补全缺失的配置项并保存
+    
+    :return: 完整的 ErisPulse 配置字典
+    """
+    # 获取现有配置
+    current_config = config.getConfig("ErisPulse")
+    
+    # 如果完全没有配置，设置默认配置
+    if current_config is None:
+        config.setConfig("ErisPulse", DEFAULT_ERISPULSE_CONFIG)
+        return DEFAULT_ERISPULSE_CONFIG
+    
+    # 检查并补全缺失的配置项
+    complete_config = _ensure_erispulse_config_structure(current_config)
+    
+    # 如果配置有变化，更新到存储
+    if current_config != complete_config:
+        config.setConfig("ErisPulse", complete_config)
+    
+    return complete_config
+
+def update_erispulse_config(new_config: Dict[str, Any]) -> bool:
+    """
+    更新 ErisPulse 配置，自动补全缺失的配置项
+    
+    :param new_config: 新的配置字典
+    :return: 是否更新成功
+    """
+    # 获取当前配置并合并新配置
+    current = get_erispulse_config()
+    merged = {**current, **new_config}
+    
+    # 确保合并后的配置结构完整
+    complete_config = _ensure_erispulse_config_structure(merged)
+    
+    return config.setConfig("ErisPulse", complete_config)
+
+def get_server_config() -> Dict[str, Any]:
+    """
+    获取服务器配置，确保结构完整
+    
+    :return: 服务器配置字典
+    """
+    erispulse_config = get_erispulse_config()
+    return erispulse_config["server"]
+
+def get_logger_config() -> Dict[str, Any]:
+    """
+    获取日志配置，确保结构完整
+    
+    :return: 日志配置字典
+    """
+    erispulse_config = get_erispulse_config()
+    return erispulse_config["logger"]

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

@@ -174,7 +174,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"])

ErisPulse/__init__.py

@@ -22,18 +22,20 @@ from typing import Dict, List, Tuple, Type, Any
 from pathlib import Path
 
 # BaseModules: SDK核心模块
-from .Core import exceptions
 from .Core import logger
 from .Core import env
 from .Core import mods
 from .Core import adapter, AdapterFather, SendDSL
 from .Core import router, adapter_server
+from .Core import exceptions
+from .Core import config
 
 sdk = sys.modules[__name__]
 
 BaseModules = {
     "logger": logger,
-    "raiserr": exceptions,
+    "config": config,
+    "exceptions": exceptions,
     "env": env,
     "mods": mods,
     "adapter": adapter,
@@ -44,6 +46,12 @@ BaseModules = {
     "BaseAdapter": AdapterFather
 }
 
+import asyncio
+
+asyncio_loop = asyncio.get_event_loop()
+
+exceptions.setup_async_loop(asyncio_loop)
+
 for module, moduleObj in BaseModules.items():
     setattr(sdk, module, moduleObj)
 
@@ -667,23 +675,24 @@ def _prepare_environment() -> bool:
     {!--< internal-use >!--}
     准备运行环境
     
-    1. 初始化项目环境文件
-    2. 加载环境变量配置
+    初始化项目环境文件
 
     :return: bool 环境准备是否成功
     """
     logger.info("[Init] 准备初始化环境...")
     try:
+        from .Core.erispulse_config import get_erispulse_config
+        get_erispulse_config()
+        logger.info("[Init] 配置文件已加载")
+        
         main_init = init_progress()
         if main_init:
             logger.info("[Init] 项目入口已生成, 你可以在 main.py 中编写一些代码")
-        env.load_env_file()
         return True
     except Exception as e:
         logger.error(f"环境准备失败: {e}")
         return False
 
-
 def init() -> bool:
     """
     SDK初始化入口

{erispulse-2.1.14.dev1.dist-info → erispulse-2.1.14.dev2.dist-info}/METADATA

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

erispulse-2.1.14.dev2.dist-info/RECORD

@@ -0,0 +1,16 @@
+ErisPulse/__init__.py,sha256=YoqCrqbR1dxjajBii6D4iebuVUl2bZaZYbpPXEgGBz8,26428
+ErisPulse/__main__.py,sha256=aDYN5_11PdL3tj2ruhNoXwNc9TmAUnBtFujQgnEf_sI,37573
+ErisPulse/Core/__init__.py,sha256=hX2yEt9VSD3JubiofoQdcY4v1lnQUU02dhuVADkMTVo,437
+ErisPulse/Core/adapter.py,sha256=oBJOp6SS8sm8NgIxQwetGsHu24wHNXz7ESQ5yKJSo7Q,18234
+ErisPulse/Core/config.py,sha256=2BRWINOqKtHSCP4KfhuiRpGwR96jWGKV7gjZSi_VQHE,2397
+ErisPulse/Core/env.py,sha256=U45f9WtriVyd3tW1N8to-ZvpzcF9gD8DJzNTC1jY2cM,17665
+ErisPulse/Core/erispulse_config.py,sha256=QDx401hNX9JcSHqCSVK33X6VTubl6HI1znAK3T_J0K0,3034
+ErisPulse/Core/exceptions.py,sha256=zuTREGczwGzbYT4Z6dACqHwgNRpiJeLFR8aCxFdOg7k,3667
+ErisPulse/Core/logger.py,sha256=HY6jkTQpztbc07mewHbMpaFNv_2-fX-87G78UEa3DTo,8306
+ErisPulse/Core/mods.py,sha256=2yIq8t9Ca9CBPRiZU0yr8Lc0XGmmkB7LlH-5FWqXjw4,7023
+ErisPulse/Core/router.py,sha256=66hT8VC2dVNX-dANldoOPDcqQ94hidFkNnvKgAPemGQ,8491
+erispulse-2.1.14.dev2.dist-info/METADATA,sha256=h-m8vZWF0_WsUwiSj83NmYEZz0zEA91-cdR39EkyKpc,6264
+erispulse-2.1.14.dev2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+erispulse-2.1.14.dev2.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
+erispulse-2.1.14.dev2.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
+erispulse-2.1.14.dev2.dist-info/RECORD,,

erispulse-2.1.14.dev1.dist-info/RECORD

@@ -1,15 +0,0 @@
-ErisPulse/__init__.py,sha256=gZ1ctwSS0Bi2XaTPa3WuR1PLEOZ2vu6zNEGSFrBU5b8,26186
-ErisPulse/__main__.py,sha256=aDYN5_11PdL3tj2ruhNoXwNc9TmAUnBtFujQgnEf_sI,37573
-ErisPulse/Core/__init__.py,sha256=rDl-UwJYnkS12rUTCpMqD--WNn4rmdIJalR04FFpsIg,464
-ErisPulse/Core/adapter.py,sha256=_imdrQNoi8dxp5rVsKBx-IAheGLMaq3Nyf1I9A6jHS0,18353
-ErisPulse/Core/config.py,sha256=ZmwGdtHSOE7K5uOGzLYcyl3ZF3sAmeWAntqcdfDzhpM,5027
-ErisPulse/Core/env.py,sha256=U45f9WtriVyd3tW1N8to-ZvpzcF9gD8DJzNTC1jY2cM,17665
-ErisPulse/Core/exceptions.py,sha256=9blt5cPVetV4XfbYo2uQ2vE_LaxT7cZmNOkJv4yGijI,4642
-ErisPulse/Core/logger.py,sha256=cJzNXF-EmdWxwgiHg5Itmkwsva2Jhe9l9X4rXKiXHgc,8296
-ErisPulse/Core/mods.py,sha256=2yIq8t9Ca9CBPRiZU0yr8Lc0XGmmkB7LlH-5FWqXjw4,7023
-ErisPulse/Core/router.py,sha256=66hT8VC2dVNX-dANldoOPDcqQ94hidFkNnvKgAPemGQ,8491
-erispulse-2.1.14.dev1.dist-info/METADATA,sha256=zgR3p8JZra9h7LWf09L0RTRT_2hswige2Kii8bApwi4,6264
-erispulse-2.1.14.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-erispulse-2.1.14.dev1.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
-erispulse-2.1.14.dev1.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
-erispulse-2.1.14.dev1.dist-info/RECORD,,