ErisPulse 2.1.13rc3__py3-none-any.whl → 2.1.14a1__py3-none-any.whl

ErisPulse/Core/{server.py → router.py}

@@ -1,6 +1,8 @@
+# router.py (新文件名)
 """
-ErisPulse Adapter Server
-提供统一的适配器服务入口，支持HTTP和WebSocket路由
+ErisPulse 路由系统
+
+提供统一的HTTP和WebSocket路由管理，支持多适配器路由注册和生命周期管理。
 
 {!--< tips >!--}
 1. 适配器只需注册路由，无需自行管理服务器
@@ -19,9 +21,9 @@ from hypercorn.config import Config
 from hypercorn.asyncio import serve
 
 
-class AdapterServer:
+class RouterManager:
     """
-    适配器服务器管理器
+    路由管理器
     
     {!--< tips >!--}
     核心功能：
@@ -33,18 +35,18 @@ class AdapterServer:
 
     def __init__(self):
         """
-        初始化适配器服务器
+        初始化路由管理器
         
         {!--< tips >!--}
         会自动创建FastAPI实例并设置核心路由
         {!--< /tips >!--}
         """
         self.app = FastAPI(
-            title="ErisPulse Adapter Server",
-            description="统一适配器服务入口点",
+            title="ErisPulse Router",
+            description="统一路由管理入口点",
             version="1.0.0"
         )
-        self._webhook_routes: Dict[str, Dict[str, Callable]] = defaultdict(dict)
+        self._http_routes: Dict[str, Dict[str, Callable]] = defaultdict(dict)
         self._websocket_routes: Dict[str, Dict[str, Tuple[Callable, Optional[Callable]]]] = defaultdict(dict)
         self.base_url = ""
         self._server_task: Optional[asyncio.Task] = None
@@ -66,7 +68,7 @@ class AdapterServer:
             :return: 
                 Dict[str, str]: 包含服务状态的字典
             """
-            return {"status": "ok", "service": "ErisPulse Adapter Server"}
+            return {"status": "ok", "service": "ErisPulse Router"}
             
         @self.app.get("/routes")
         async def list_routes() -> Dict[str, Any]:
@@ -74,36 +76,23 @@ class AdapterServer:
             列出所有已注册路由
             
             :return: 
-                Dict[str, Any]: 包含所有路由信息的字典，格式为:
-                {
-                    "http_routes": [
-                        {
-                            "path": "/adapter1/route1",
-                            "adapter": "adapter1",
-                            "methods": ["POST"]
-                        },
-                        ...
-                    ],
-                    "websocket_routes": [
-                        {
-                            "path": "/adapter1/ws",
-                            "adapter": "adapter1",
-                            "requires_auth": true
-                        },
-                        ...
-                    ],
-                    "base_url": self.base_url
-                }
+                Dict[str, Any]: 包含所有路由信息的字典
             """
             http_routes = []
-            for adapter, routes in self._webhook_routes.items():
+            for adapter, routes in self._http_routes.items():
                 for path, handler in routes.items():
-                    route = self.app.router.routes[-1]  # 获取最后添加的路由
-                    if isinstance(route, APIRoute) and route.path == path:
+                    # 查找对应的路由对象
+                    route_obj = None
+                    for route in self.app.router.routes:
+                        if isinstance(route, APIRoute) and route.path == path:
+                            route_obj = route
+                            break
+                    
+                    if route_obj:
                         http_routes.append({
                             "path": path,
                             "adapter": adapter,
-                            "methods": route.methods
+                            "methods": list(route_obj.methods)
                         })
             
             websocket_routes = []
@@ -121,9 +110,9 @@ class AdapterServer:
                 "base_url": self.base_url
             }
 
-    def register_webhook(
+    def register_http_route(
         self, 
-        adapter_name: str,
+        module_name: str,
         path: str,
         handler: Callable,
         methods: List[str] = ["POST"]
@@ -131,35 +120,37 @@ class AdapterServer:
         """
         注册HTTP路由
         
-        :param adapter_name: str 适配器名称
-        :param path: str 路由路径(如"/message")
+        :param module_name: str 模块名称
+        :param path: str 路由路径
         :param handler: Callable 处理函数
         :param methods: List[str] HTTP方法列表(默认["POST"])
         
         :raises ValueError: 当路径已注册时抛出
-        
-        {!--< tips >!--}
-        路径会自动添加适配器前缀，如：/adapter_name/path
-        {!--< /tips >!--}
         """
-        full_path = f"/{adapter_name}{path}"
+        full_path = f"/{module_name}{path}"
         
-        if full_path in self._webhook_routes[adapter_name]:
+        if full_path in self._http_routes[module_name]:
             raise ValueError(f"路径 {full_path} 已注册")
             
         route = APIRoute(
             path=full_path,
             endpoint=handler,
             methods=methods,
-            name=f"{adapter_name}{path}"
+            name=f"{module_name}_{path.replace('/', '_')}"
         )
         self.app.router.routes.append(route)
-        self._webhook_routes[adapter_name][full_path] = handler
+        self._http_routes[module_name][full_path] = handler
         logger.info(f"注册HTTP路由: {self.base_url}{full_path} 方法: {methods}")
 
+    def register_webhook(self, *args, **kwargs) -> None:
+        """
+        兼容性方法：注册HTTP路由（适配器旧接口）
+        """
+        return self.register_http_route(*args, **kwargs)
+
     def register_websocket(
         self,
-        adapter_name: str,
+        module_name: str,
         path: str,
         handler: Callable[[WebSocket], Awaitable[Any]],
         auth_handler: Optional[Callable[[WebSocket], Awaitable[bool]]] = None,
@@ -167,29 +158,21 @@ class AdapterServer:
         """
         注册WebSocket路由
         
-        :param adapter_name: str 适配器名称
-        :param path: str WebSocket路径(如"/ws")
+        :param module_name: str 模块名称
+        :param path: str WebSocket路径
         :param handler: Callable[[WebSocket], Awaitable[Any]] 主处理函数
         :param auth_handler: Optional[Callable[[WebSocket], Awaitable[bool]]] 认证函数
         
         :raises ValueError: 当路径已注册时抛出
-        
-        {!--< tips >!--}
-        认证函数应返回布尔值，False将拒绝连接
-        {!--< /tips >!--}
         """
-        full_path = f"/{adapter_name}{path}"
+        full_path = f"/{module_name}{path}"
         
-        if full_path in self._websocket_routes[adapter_name]:
+        if full_path in self._websocket_routes[module_name]:
             raise ValueError(f"WebSocket路径 {full_path} 已注册")
             
         async def websocket_endpoint(websocket: WebSocket) -> None:
             """
             WebSocket端点包装器
-            
-            {!--< internal-use >!--}
-            处理连接生命周期和错误处理
-            {!--< /internal-use >!--}
             """
             await websocket.accept()
             
@@ -209,17 +192,16 @@ class AdapterServer:
         self.app.add_api_websocket_route(
             path=full_path,
             endpoint=websocket_endpoint,
-            name=f"{adapter_name}{path}"
+            name=f"{module_name}_{path.replace('/', '_')}"
         )
-        self._websocket_routes[adapter_name][full_path] = (handler, auth_handler)
+        self._websocket_routes[module_name][full_path] = (handler, auth_handler)
         logger.info(f"注册WebSocket: {self.base_url}{full_path} {'(需认证)' if auth_handler else ''}")
 
     def get_app(self) -> FastAPI:
         """
         获取FastAPI应用实例
         
-        :return: 
-            FastAPI: FastAPI应用实例
+        :return: FastAPI应用实例
         """
         return self.app
 
@@ -231,7 +213,7 @@ class AdapterServer:
         ssl_keyfile: Optional[str] = None
     ) -> None:
         """
-        启动适配器服务器
+        启动路由服务器
         
         :param host: str 监听地址(默认"0.0.0.0")
         :param port: int 监听端口(默认8000)
@@ -252,25 +234,24 @@ class AdapterServer:
             config.keyfile = ssl_keyfile
         
         self.base_url = f"http{'s' if ssl_certfile else ''}://{host}:{port}"
-        logger.info(f"启动服务器 {self.base_url}")
+        logger.info(f"启动路由服务器 {self.base_url}")
         
         self._server_task = asyncio.create_task(serve(self.app, config))
 
     async def stop(self) -> None:
         """
         停止服务器
-        
-        {!--< tips >!--}
-        会等待所有连接正常关闭
-        {!--< /tips >!--}
         """
         if self._server_task:
             self._server_task.cancel()
             try:
                 await self._server_task
             except asyncio.CancelledError:
-                logger.info("服务器已停止")
+                logger.info("路由服务器已停止")
             self._server_task = None
 
+# 主要实例
+router = RouterManager()
 
-adapter_server = AdapterServer()
+# 兼容性实例
+adapter_server = router

ErisPulse/__init__.py

@@ -10,6 +10,9 @@ ErisPulse SDK 主模块
 {!--< /tips >!--}
 """
 
+__version__ = "2.1.14dev1"
+__author__  = "ErisPulse"
+
 import os
 import sys
 import importlib
@@ -19,28 +22,36 @@ from typing import Dict, List, Tuple, Type, Any
 from pathlib import Path
 
 # BaseModules: SDK核心模块
-from .Core import util
-from .Core import raiserr
 from .Core import logger
 from .Core import env
 from .Core import mods
 from .Core import adapter, AdapterFather, SendDSL
-from .Core import adapter_server
+from .Core import router, adapter_server
+from .Core import exceptions
+from .Core import config
 
 sdk = sys.modules[__name__]
 
 BaseModules = {
-    "util": util,
     "logger": logger,
-    "raiserr": raiserr,
+    "config": config,
+    "exceptions": exceptions,
     "env": env,
     "mods": mods,
     "adapter": adapter,
+    "router": router,
+    "adapter_server": adapter_server,
     "SendDSL": SendDSL,
     "AdapterFather": AdapterFather,
     "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)
 
@@ -664,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/__main__.py

@@ -19,7 +19,6 @@ import json
 import asyncio
 from urllib.parse import urlparse
 from typing import List, Dict, Tuple, Optional, Callable, Any
-from importlib.metadata import version, PackageNotFoundError
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
 
@@ -188,26 +187,38 @@ class PackageManager:
         
         try:
             # 查找模块和适配器
-            for dist in importlib.metadata.distributions():
-                if "ErisPulse-" in dist.metadata["Name"]:
-                    entry_points = dist.entry_points
-                    for ep in entry_points:
-                        if ep.group == "erispulse.module":
-                            packages["modules"][ep.name] = {
-                                "package": dist.metadata["Name"],
-                                "version": dist.version,
-                                "summary": dist.metadata["Summary"],
-                                "enabled": self._is_module_enabled(ep.name)
-                            }
-                        elif ep.group == "erispulse.adapter":
-                            packages["adapters"][ep.name] = {
-                                "package": dist.metadata["Name"],
-                                "version": dist.version,
-                                "summary": dist.metadata["Summary"]
-                            }
+            entry_points = importlib.metadata.entry_points()
+            
+            # 处理模块
+            if hasattr(entry_points, 'select'):
+                module_entries = entry_points.select(group='erispulse.module')
+            else:
+                module_entries = entry_points.get('erispulse.module', [])
+            
+            for entry in module_entries:
+                dist = entry.dist
+                packages["modules"][entry.name] = {
+                    "package": dist.metadata["Name"],
+                    "version": dist.version,
+                    "summary": dist.metadata["Summary"],
+                    "enabled": self._is_module_enabled(entry.name)
+                }
+            
+            # 处理适配器
+            if hasattr(entry_points, 'select'):
+                adapter_entries = entry_points.select(group='erispulse.adapter')
+            else:
+                adapter_entries = entry_points.get('erispulse.adapter', [])
+            
+            for entry in adapter_entries:
+                dist = entry.dist
+                packages["adapters"][entry.name] = {
+                    "package": dist.metadata["Name"],
+                    "version": dist.version,
+                    "summary": dist.metadata["Summary"]
+                }
             
             # 查找CLI扩展
-            entry_points = importlib.metadata.entry_points()
             if hasattr(entry_points, 'select'):
                 cli_entries = entry_points.select(group='erispulse.cli')
             else:
@@ -222,9 +233,9 @@ class PackageManager:
                 }
                 
         except Exception as e:
-            console.print(f"[error]获取已安装包信息失败: {e}[/]")
+            print(f"[error] 获取已安装包信息失败: {e}")
             import traceback
-            console.print(traceback.format_exc())
+            print(traceback.format_exc())
         
         return packages
     

{erispulse-2.1.13rc3.dist-info → erispulse-2.1.14a1.dist-info}/METADATA

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

erispulse-2.1.14a1.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=8hdbF6x3JpsQbbeEjvbSej134q5oV0wafagpWq3Nbeg,11223
+ErisPulse/Core/mods.py,sha256=2yIq8t9Ca9CBPRiZU0yr8Lc0XGmmkB7LlH-5FWqXjw4,7023
+ErisPulse/Core/router.py,sha256=66hT8VC2dVNX-dANldoOPDcqQ94hidFkNnvKgAPemGQ,8491
+erispulse-2.1.14a1.dist-info/METADATA,sha256=qm46_dLloUuS0n5tMXxL2YTSdyleOTjxzT1TQyj1VQ4,6261
+erispulse-2.1.14a1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+erispulse-2.1.14a1.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
+erispulse-2.1.14a1.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
+erispulse-2.1.14a1.dist-info/RECORD,,

ErisPulse/Core/raiserr.py

@@ -1,181 +0,0 @@
-"""
-ErisPulse 错误管理系统
-
-提供全局异常捕获功能。不再推荐使用自定义错误注册功能。
-
-{!--< tips >!--}
-1. 请使用Python原生异常抛出方法
-2. 系统会自动捕获并格式化所有未处理异常
-3. 注册功能已标记为弃用，将在未来版本移除
-{!--< /tips >!--}
-"""
-
-import sys
-import traceback
-import asyncio
-from typing import Dict, Any, Optional, Type, Callable, List, Set, Tuple, Union
-
-class Error:
-    """
-    错误管理器
-    
-    {!--< deprecated >!--} 请使用Python原生异常抛出方法 | 2025-07-18
-    
-    {!--< tips >!--}
-    1. 注册功能将在未来版本移除
-    2. 请直接使用raise Exception("message")方式抛出异常
-    {!--< /tips >!--}
-    """
-    
-    def __init__(self):
-        self._types = {}
-
-    def register(self, name: str, doc: str = "", base: Type[Exception] = Exception) -> Type[Exception]:
-        """
-        注册新的错误类型
-        
-        {!--< deprecated >!--} 请使用Python原生异常抛出方法 | 2025-07-18
-        
-        :param name: 错误类型名称
-        :param doc: 错误描述文档
-        :param base: 基础异常类
-        :return: 注册的错误类
-        """
-        if name not in self._types:
-            err_cls = type(name, (base,), {"__doc__": doc})
-            self._types[name] = err_cls
-        return self._types[name]
-
-    def __getattr__(self, name: str) -> Callable[..., None]:
-        """
-        动态获取错误抛出函数
-        
-        {!--< deprecated >!--} 请使用Python原生异常抛出方法 | 2025-07-18
-        
-        :param name: 错误类型名称
-        :return: 错误抛出函数
-        
-        :raises AttributeError: 当错误类型未注册时抛出
-        """
-        def raiser(msg: str, exit: bool = False) -> None:
-            """
-            错误抛出函数
-            
-            :param msg: 错误消息
-            :param exit: 是否退出程序
-            """
-            from .logger import logger
-            err_cls = self._types.get(name) or self.register(name)
-            exc = err_cls(msg)
-
-            red = '\033[91m'
-            reset = '\033[0m'
-
-            logger.error(f"{red}{name}: {msg} | {err_cls.__doc__}{reset}")
-            logger.error(f"{red}{ ''.join(traceback.format_stack()) }{reset}")
-
-            if exit:
-                raise exc
-        return raiser
-
-    def info(self, name: Optional[str] = None) -> Dict[str, Any]:
-        """
-        获取错误信息
-        
-        {!--< deprecated >!--} 此功能将在未来版本移除 | 2025-07-18
-        
-        :param name: 错误类型名称(可选)
-        :return: 错误信息字典
-        """
-        result = {}
-        for err_name, err_cls in self._types.items():
-            result[err_name] = {
-                "type": err_name,
-                "doc": getattr(err_cls, "__doc__", ""),
-                "class": err_cls,
-            }
-        if name is None:
-            return result
-        err_cls = self._types.get(name)
-        if not err_cls:
-            return {
-                "type": None,
-                "doc": None,
-                "class": None,
-            }
-        return {
-            "type": name,
-            "doc": getattr(err_cls, "__doc__", ""),
-            "class": err_cls,
-        }
-
-
-raiserr = Error()
-
-def global_exception_handler(exc_type: Type[Exception], exc_value: Exception, exc_traceback: Any) -> None:
-    """
-    全局异常处理器
-    
-    :param exc_type: 异常类型
-    :param exc_value: 异常值
-    :param exc_traceback: 追踪信息
-    """
-    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)
-    
-    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}")
-    
-    full_error = f"""
-{error_title}
-{RED}Traceback:{RESET}
-{colored_traceback}"""
-    
-    sys.stderr.write(full_error)
-
-def async_exception_handler(loop: asyncio.AbstractEventLoop, context: Dict[str, Any]) -> None:
-    """
-    异步异常处理器
-    
-    :param loop: 事件循环
-    :param context: 上下文字典
-    """
-    RED = '\033[91m'
-    YELLOW = '\033[93m'
-    BLUE = '\033[94m'
-    RESET = '\033[0m'
-    
-    exception = context.get('exception')
-    if 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}")
-        
-        error_msg = f"""{RED}{type(exception).__name__}{RESET}: {YELLOW}{exception}{RESET}
-{RED}Traceback:{RESET}
-{colored_tb}"""
-        sys.stderr.write(error_msg)
-    else:
-        msg = context.get('message', 'Unknown async error')
-        sys.stderr.write(f"{RED}Async Error{RESET}: {YELLOW}{msg}{RESET}")
-
-sys.excepthook = global_exception_handler
-asyncio.get_event_loop().set_exception_handler(async_exception_handler)