ErisPulse 1.0.15__tar.gz → 1.0.16__tar.gz

{erispulse-1.0.15 → erispulse-1.0.16}/ErisPulse/__init__.py

@@ -8,11 +8,8 @@ from .db import env
 from .mods import mods
 from .adapter import adapter, adapterbase
 
-# 注册 ErrorHook 并预注册常用错误类型
-raiserr.register("MissingDependencyError", doc="缺少依赖错误")
-raiserr.register("InvalidDependencyError", doc="依赖无效错误")
-raiserr.register("CycleDependencyError"  , doc="依赖循环错误")
-raiserr.register("ModuleLoadError"       , doc="模块加载错误")
+# 这里不能删，确保windows下的shell能正确显示颜色
+os.system('')
 
 sdk = types.SimpleNamespace()
 setattr(sdk, "env", env)
@@ -25,6 +22,14 @@ setattr(sdk, "BaseAdapter", adapterbase)
 
 env.load_env_file()
 
+# 注册 ErrorHook 并预注册常用错误类型
+raiserr.register("CaughtExternalError"      , doc="捕获的非SDK抛出的异常")
+raiserr.register("InitError"               , doc="SDK初始化错误")
+raiserr.register("MissingDependencyError"   , doc="缺少依赖错误")
+raiserr.register("InvalidDependencyError"   , doc="依赖无效错误")
+raiserr.register("CycleDependencyError"     , doc="依赖循环错误")
+raiserr.register("ModuleLoadError"          , doc="模块加载错误")
+
 def init():
     try:
         sdkModulePath = os.path.join(os.path.dirname(__file__), "modules")
@@ -156,7 +161,6 @@ def init():
                     logger.error(f"注册适配器失败: {e}")
 
     except Exception as e:
-        logger.error(f"初始化失败: {e}")
-        raise e
+        raiserr.InitError(f"sdk初始化失败: {e}", exit=True)
 
-sdk.init = init
+sdk.init = init

erispulse-1.0.16/ErisPulse/adapter.py

@@ -0,0 +1,143 @@
+import functools
+import asyncio
+from typing import Callable, Any, Dict, List, Type, Optional
+from collections import defaultdict
+
+
+# DSL 基类，用于实现 Send.To(...).Func(...) 风格
+class SendDSL:
+    def __init__(self, adapter: 'BaseAdapter', target_type: Optional[str] = None, target_id: Optional[str] = None):
+        self._adapter = adapter
+        self._target_type = target_type
+        self._target_id = target_id
+
+    def To(self, target_type: str, target_id: str) -> 'SendDSL':
+        return self.__class__(self._adapter, target_type, target_id)
+
+    def __getattr__(self, name: str):
+        def wrapper(*args, **kwargs):
+            return asyncio.create_task(
+                self._adapter._real_send(
+                    target_type=self._target_type,
+                    target_id=self._target_id,
+                    action=name,
+                    data={
+                        "args": args,
+                        "kwargs": kwargs
+                    }
+                )
+            )
+        return wrapper
+
+
+class BaseAdapter:
+    def __init__(self, sdk):
+        self.sdk = sdk
+        self._handlers = defaultdict(list)
+        self._middlewares = []
+
+        # 检测是否有 Send 子类定义
+        if not hasattr(self.__class__, 'Send') or not issubclass(self.__class__.Send, SendDSL):
+            raise TypeError(f"{self.__class__.__name__} 必须定义 Send 嵌套类并继承 SendDSL")
+
+        # 绑定当前适配器的 Send 实例
+        self.Send = self.__class__.Send(self)
+
+    def on(self, event_type: str):
+        def decorator(func: Callable):
+            @functools.wraps(func)
+            async def wrapper(*args, **kwargs):
+                return await func(*args, **kwargs)
+            self._handlers[event_type].append(wrapper)
+            return wrapper
+        return decorator
+
+    def middleware(self, func: Callable):
+        self._middlewares.append(func)
+        return func
+
+    async def call_api(self, endpoint: str, **params):
+        raise NotImplementedError
+
+    async def start(self):
+        raise NotImplementedError
+
+    async def shutdown(self):
+        raise NotImplementedError
+
+    async def emit(self, event_type: str, data: Any):
+        for middleware in self._middlewares:
+            data = await middleware(data)
+
+        for handler in self._handlers.get(event_type, []):
+            await handler(data)
+
+    async def send(self, target_type: str, target_id: str, message: Any, **kwargs):
+        method_name = kwargs.pop("method", "Text")
+        method = getattr(self.Send.To(target_type, target_id), method_name, None)
+        if not method:
+            raise AttributeError(f"未找到 {method_name} 方法，请确保已在 Send 类中定义")
+        return await method(text=message, **kwargs)
+
+
+class AdapterManager:
+    def __init__(self):
+        self._adapters: Dict[str, BaseAdapter] = {}
+
+    def register(self, platform: str, adapter_class: Type[BaseAdapter]) -> bool:
+        if not issubclass(adapter_class, BaseAdapter):
+            raise TypeError("适配器必须继承自BaseAdapter")
+        from . import sdk
+        self._adapters[platform] = adapter_class(sdk)
+        return True
+
+    async def startup(self, platforms: List[str] = None):
+        if platforms is None:
+            platforms = self._adapters.keys()
+
+        for platform in platforms:
+            if platform not in self._adapters:
+                raise ValueError(f"平台 {platform} 未注册")
+            adapter = self._adapters[platform]
+            asyncio.create_task(self._run_adapter(adapter, platform))
+
+    async def _run_adapter(self, adapter: BaseAdapter, platform: str):
+        from . import sdk
+        retry_count = 0
+        max_retry = 3
+        while retry_count < max_retry:
+            try:
+                await adapter.start()
+                break
+            except Exception as e:
+                retry_count += 1
+                sdk.logger.error(f"平台 {platform} 启动失败（第{retry_count}次重试）: {e}")
+                try:
+                    await adapter.stop()
+                except Exception as stop_err:
+                    sdk.logger.warning(f"停止适配器失败: {stop_err}")
+
+                if retry_count >= max_retry:
+                    sdk.logger.critical(f"平台 {platform} 达到最大重试次数，放弃重启")
+                    sdk.raiserr.AdapterStartFailedError(f"平台 {platform} 适配器无法重写启动: {e}")
+
+    async def shutdown(self):
+        for adapter in self._adapters.values():
+            await adapter.shutdown()
+
+    def get(self, platform: str) -> BaseAdapter:
+        return self._adapters.get(platform)
+
+    def __getattr__(self, platform: str) -> BaseAdapter:
+        if platform not in self._adapters:
+            raise AttributeError(f"平台 {platform} 的适配器未注册")
+        return self._adapters[platform]
+
+    @property
+    def platforms(self) -> list:
+        return list(self._adapters.keys())
+
+
+adapter = AdapterManager()
+adapter.SendDSL = SendDSL
+adapterbase = BaseAdapter()

{erispulse-1.0.15 → erispulse-1.0.16}/ErisPulse/db.py

@@ -48,7 +48,8 @@ class EnvManager:
                 self._init_db()
                 return self.get(key, default)
             else:
-                raise
+                from . import sdk
+                sdk.logger.error(f"数据库操作错误: {e}")
 
     def get_all_keys(self) -> list:
         with sqlite3.connect(self.db_path) as conn:
@@ -92,6 +93,7 @@ class EnvManager:
         try:
             return self.get(key)
         except KeyError:
-            raise AttributeError(f"配置项 {key} 不存在")
+            from . import sdk
+            sdk.logger.error(f"配置项 {key} 不存在")
 
 env = EnvManager()

erispulse-1.0.16/ErisPulse/raiserr.py

@@ -0,0 +1,74 @@
+import sys
+import traceback
+import asyncio
+
+class Error:
+    def __init__(self):
+        self._types = {}
+
+    def register(self, name, doc="", base=Exception):
+        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):
+        def raiser(msg, exit=False):
+            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: str = None):
+        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 None
+        return {
+            "type": name,
+            "doc": getattr(err_cls, "__doc__", ""),
+            "class": err_cls,
+        }
+
+raiserr = Error()
+
+# 全局异常处理器
+def global_exception_handler(exc_type, exc_value, exc_traceback):
+    from .logger import logger
+    error_message = ''.join(traceback.format_exception(exc_type, exc_value, exc_traceback))
+    logger.error(f"未处理的异常被捕获:\n{error_message}")
+    raiserr.CaughtExternalError(
+        f"检测到外部异常，请优先使用 sdk.raiserr 抛出错误。\n原始异常: {exc_type.__name__}: {exc_value}\nTraceback:\n{error_message}"
+    )
+sys.excepthook = global_exception_handler
+
+def async_exception_handler(loop, context):
+    from .logger import logger
+    exception = context.get('exception')
+    message = context.get('message', 'Async error')
+    if exception:
+        tb = ''.join(traceback.format_exception(type(exception), exception, exception.__traceback__))
+        logger.error(f"异步任务异常: {message}\n{tb}")
+        raiserr.CaughtExternalError(
+            f"检测到异步任务异常，请优先使用 sdk.raiserr 抛出错误。\n原始异常: {type(exception).__name__}: {exception}\nTraceback:\n{tb}"
+        )
+    else:
+        logger.warning(f"异步任务警告: {message}")
+asyncio.get_event_loop().set_exception_handler(async_exception_handler)

{erispulse-1.0.15 → erispulse-1.0.16}/ErisPulse/util.py

@@ -1,6 +1,7 @@
 import time
 import asyncio
 import functools
+import traceback
 from concurrent.futures import ThreadPoolExecutor
 from collections import defaultdict, deque
 
@@ -23,7 +24,8 @@ def topological_sort(elements, dependencies, error):
             if in_degree[neighbor] == 0:
                 queue.append(neighbor)
     if len(sorted_list) != len(elements):
-        raise error(f"Cycle detected in the dependencies: {elements} -> {dependencies}")
+        from . import sdk
+        sdk.logger.error(f"Topological sort failed: {sorted_list} vs {elements}")
     return sorted_list
 
 def ExecAsync(async_func, *args, **kwargs):
@@ -44,7 +46,14 @@ def run_in_executor(func):
     @functools.wraps(func)
     async def wrapper(*args, **kwargs):
         loop = asyncio.get_event_loop()
-        return await loop.run_in_executor(None, lambda: func(*args, **kwargs))
+        try:
+            return await loop.run_in_executor(None, lambda: func(*args, **kwargs))
+        except Exception as e:
+            from . import sdk
+            sdk.logger.error(f"线程内发生未处理异常:\n{''.join(traceback.format_exc())}")
+            sdk.raiserr.CaughtExternalError(
+                f"检测到线程内异常，请优先使用 sdk.raiserr 抛出错误。\n原始异常: {type(e).__name__}: {e}"
+            )
     return wrapper
 
 def retry(max_attempts=3, delay=1):

{erispulse-1.0.15 → erispulse-1.0.16}/ErisPulse.egg-info/PKG-INFO

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

{erispulse-1.0.15 → erispulse-1.0.16}/PKG-INFO

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

{erispulse-1.0.15 → erispulse-1.0.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ErisPulse"
-version = "1.0.15"
+version = "1.0.16"
 authors = [
     { name = "艾莉丝·格雷拉特(WSu2059)", email = "wsu2059@qq.com" },
     { name = "runoneall", email = "runoobsteve@gmail.com" }

erispulse-1.0.15/ErisPulse/adapter.py

@@ -1,81 +0,0 @@
-import functools
-import asyncio
-from typing import Callable, Any, Dict, List, Type
-from collections import defaultdict
-
-class BaseAdapter:
-    def __init__(self):
-        self._handlers = defaultdict(list)
-        self._middlewares = []
-
-    def on(self, event_type: str):
-        def decorator(func: Callable):
-            @functools.wraps(func)
-            async def wrapper(*args, **kwargs):
-                return await func(*args, **kwargs)
-            self._handlers[event_type].append(wrapper)
-            return wrapper
-        return decorator
-
-    def middleware(self, func: Callable):
-        self._middlewares.append(func)
-        return func
-
-    async def send(self, target: Any, message: Any, **kwargs):
-        raise NotImplementedError
-
-    async def call_api(self, endpoint: str, **params):
-        raise NotImplementedError
-
-    async def emit(self, event_type: str, data: Any):
-        for middleware in self._middlewares:
-            data = await middleware(data)
-
-        for handler in self._handlers.get(event_type, []):
-            await handler(data)
-
-class AdapterManager:
-    def __init__(self):
-        self._adapters: Dict[str, BaseAdapter] = {}
-
-    def register(self, platform: str, adapter_class: Type[BaseAdapter]) -> bool:
-        if not issubclass(adapter_class, BaseAdapter):
-            raise TypeError("适配器必须继承自BaseAdapter")
-        from . import sdk
-        self._adapters[platform] = adapter_class(sdk)
-        return True
-
-    async def startup(self, platforms: List[str] = None):
-        if platforms is None:
-            platforms = self._adapters.keys()
-
-        for platform in platforms:
-            if platform not in self._adapters:
-                raise ValueError(f"平台 {platform} 未注册")
-            adapter = self._adapters[platform]
-            asyncio.create_task(self._run_adapter(adapter, platform))
-
-    async def _run_adapter(self, adapter: BaseAdapter, platform: str):
-        try:
-            await adapter.start()
-        except Exception as e:
-            self.logger.error(f"平台 {platform} 停止时遇到了错误： {e}")
-
-    async def shutdown(self):
-        for adapter in self._adapters.values():
-            await adapter.shutdown()
-
-    def get(self, platform: str) -> BaseAdapter:
-        return self._adapters.get(platform)
-
-    def __getattr__(self, platform: str) -> BaseAdapter:
-        if platform not in self._adapters:
-            raise AttributeError(f"平台 {platform} 的适配器未注册")
-        return self._adapters[platform]
-
-    @property
-    def platforms(self) -> list:
-        return list(self._adapters.keys())
-
-adapter = AdapterManager()
-adapterbase = BaseAdapter

erispulse-1.0.15/ErisPulse/raiserr.py

@@ -1,44 +0,0 @@
-import sys
-import traceback
-
-class Error:
-    def __init__(self):
-        self._types = {}
-
-    def register(self, name, doc="", base=Exception):
-        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):
-        def raiser(msg, exit=False):
-            from .logger import logger
-            err_cls = self._types.get(name) or self.register(name)
-            exc = err_cls(msg)
-            logger.error(f"{name}: {msg} | {err_cls.__doc__}")
-            logger.error("".join(traceback.format_stack()))
-            if exit:
-                raise exc
-        return raiser
-
-    def info(self, name: str = None):
-        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 None
-        return {
-            "type": name,
-            "doc": getattr(err_cls, "__doc__", ""),
-            "class": err_cls,
-        }
-
-raiserr = Error()