ErisPulse 1.0.15__py3-none-any.whl → 1.1.0__py3-none-any.whl

ErisPulse/__init__.py

@@ -1,30 +1,37 @@
+
+import types
+sdk = types.SimpleNamespace()
 import os
 import sys
-import types
 from . import util
 from .raiserr import raiserr
 from .logger import logger
 from .db import env
 from .mods import mods
-from .adapter import adapter, adapterbase
+from .adapter import adapter, BaseAdapter, SendDSL
 
-# 注册 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)
 setattr(sdk, "mods", mods)
 setattr(sdk, "util", util)
 setattr(sdk, "raiserr", raiserr)
 setattr(sdk, "logger", logger)
 setattr(sdk, "adapter", adapter)
-setattr(sdk, "BaseAdapter", adapterbase)
+setattr(sdk, "SendDSL", SendDSL)
+setattr(sdk, "BaseAdapter", BaseAdapter)
 
 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 +163,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/adapter.py

@@ -1,13 +1,47 @@
 import functools
 import asyncio
-from typing import Callable, Any, Dict, List, Type
+from typing import Callable, Any, Dict, List, Type, Optional
 from collections import defaultdict
 
+
+# DSL 基类，用于实现 Send.To(...).Func(...) 风格
+class SendDSLBase:
+    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):
         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)
@@ -21,10 +55,13 @@ class BaseAdapter:
         self._middlewares.append(func)
         return func
 
-    async def send(self, target: Any, message: Any, **kwargs):
+    async def call_api(self, endpoint: str, **params):
         raise NotImplementedError
 
-    async def call_api(self, endpoint: str, **params):
+    async def start(self):
+        raise NotImplementedError
+
+    async def shutdown(self):
         raise NotImplementedError
 
     async def emit(self, event_type: str, data: Any):
@@ -34,6 +71,14 @@ class BaseAdapter:
         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] = {}
@@ -56,10 +101,24 @@ class AdapterManager:
             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}")
+        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():
@@ -77,5 +136,6 @@ class AdapterManager:
     def platforms(self) -> list:
         return list(self._adapters.keys())
 
+
 adapter = AdapterManager()
-adapterbase = BaseAdapter
+SendDSL = SendDSLBase

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/raiserr.py

@@ -1,5 +1,6 @@
 import sys
 import traceback
+import asyncio
 
 class Error:
     def __init__(self):
@@ -16,8 +17,13 @@ class Error:
             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()))
+
+            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
@@ -42,3 +48,27 @@ class Error:
         }
 
 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/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.dist-info → erispulse-1.1.0.dist-info}/METADATA

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

erispulse-1.1.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+ErisPulse/__init__.py,sha256=5ScKZCsk7gMS07RKbJANsUV5MLJlpaZ6ipTdZ1Jrzxw,7613
+ErisPulse/__main__.py,sha256=-UdhsYP_X7EagomCjo73Y_qQdXwtMbDS5KoOSrI-OcU,32181
+ErisPulse/adapter.py,sha256=XoAx_7kgpVenM5TBe6Uyi6heRH7WTQCI8JjE7Ym4Kjo,5013
+ErisPulse/db.py,sha256=7F5MoeGkDO5E8LbaSWGBdXDUL9cMC8HfOgY1Uv5lGHk,3290
+ErisPulse/logger.py,sha256=HIQMYD75K-PL4IETMlm7V6Eyg0ussZ11_riEw5E5a08,5899
+ErisPulse/mods.py,sha256=M9XQWUQYNZ11m845hxbewBAauWXnysy-aOdLwb5xy_M,3312
+ErisPulse/raiserr.py,sha256=z8BigWkVrBE9dD_dJa5np2YYREwdugyWXKE4_-LEO_Q,2616
+ErisPulse/util.py,sha256=b9TqyRZKkpclN2fkHmWqBl3lnBMnUbucMvKvbqD5Ws8,2541
+erispulse-1.1.0.dist-info/METADATA,sha256=GnDCiP912Vr3S1NprRoe1B4EHCN-3qYwqrddpu1S0x8,2442
+erispulse-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+erispulse-1.1.0.dist-info/entry_points.txt,sha256=AjKvOdYR7QGXVpEJhjUYUwV2JluE4lm9vNbknC3hjOM,155
+erispulse-1.1.0.dist-info/top_level.txt,sha256=Lm_qtkVvNJR8_dXh_qEDdl_12cZGpic-i4HUlVVUMZc,10
+erispulse-1.1.0.dist-info/RECORD,,

erispulse-1.0.15.dist-info/RECORD

@@ -1,13 +0,0 @@
-ErisPulse/__init__.py,sha256=di4Bii26xJYMk1xqoPNGM0lk2CABlxa3MC-9iOvKPYs,7318
-ErisPulse/__main__.py,sha256=-UdhsYP_X7EagomCjo73Y_qQdXwtMbDS5KoOSrI-OcU,32181
-ErisPulse/adapter.py,sha256=9BxzBrr5LkQcKY8ONuv7MYxlUrvkINuG9TtdzKgwUWY,2687
-ErisPulse/db.py,sha256=oLdOe8LgklBSOWHXu8QDEnaVkjf0bvJLsbJVoT_uw2U,3188
-ErisPulse/logger.py,sha256=HIQMYD75K-PL4IETMlm7V6Eyg0ussZ11_riEw5E5a08,5899
-ErisPulse/mods.py,sha256=M9XQWUQYNZ11m845hxbewBAauWXnysy-aOdLwb5xy_M,3312
-ErisPulse/raiserr.py,sha256=MPA3ZcPEzuhJldmFG19oSvjxzVojcQ9jZYfmcEQr_SU,1292
-ErisPulse/util.py,sha256=01kUQwVFeE7gyD1skCwjpANYzVUHjLC6J1UUzfQXPco,2139
-erispulse-1.0.15.dist-info/METADATA,sha256=VmyDSAX2FLp-kHcsMeby2KImmwi_g_xwD8LJEVOsivI,2443
-erispulse-1.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-erispulse-1.0.15.dist-info/entry_points.txt,sha256=AjKvOdYR7QGXVpEJhjUYUwV2JluE4lm9vNbknC3hjOM,155
-erispulse-1.0.15.dist-info/top_level.txt,sha256=Lm_qtkVvNJR8_dXh_qEDdl_12cZGpic-i4HUlVVUMZc,10
-erispulse-1.0.15.dist-info/RECORD,,