ErisPulse 1.0.14.dev3__tar.gz → 1.0.15__tar.gz

{erispulse-1.0.14.dev3 → erispulse-1.0.15}/ErisPulse/__init__.py

@@ -6,6 +6,7 @@ from .raiserr import raiserr
 from .logger import logger
 from .db import env
 from .mods import mods
+from .adapter import adapter, adapterbase
 
 # 注册 ErrorHook 并预注册常用错误类型
 raiserr.register("MissingDependencyError", doc="缺少依赖错误")
@@ -16,16 +17,18 @@ raiserr.register("ModuleLoadError"       , doc="模块加载错误")
 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, "util", util)
+setattr(sdk, "adapter", adapter)
+setattr(sdk, "BaseAdapter", adapterbase)
 
 env.load_env_file()
 
 def init():
     try:
         sdkModulePath = os.path.join(os.path.dirname(__file__), "modules")
-        
+
         if not os.path.exists(sdkModulePath):
             os.makedirs(sdkModulePath)
 
@@ -51,7 +54,7 @@ def init():
                 if not hasattr(moduleObj, "Main"):
                     logger.warning(f"模块 {module_name} 缺少 'Main' 类.")
                     continue
-                
+
                 module_info = mods.get_module(moduleObj.moduleInfo.get("meta", {}).get("name", None))
                 if module_info is None:
                     module_info = {
@@ -60,12 +63,12 @@ def init():
                     }
                     mods.set_module(moduleObj.moduleInfo.get("meta", {}).get("name", None), module_info)
                     logger.info(f"模块 {moduleObj.moduleInfo.get('meta', {}).get('name', None)} 信息已初始化并存储到数据库")
-                
+
                 if not module_info.get('status', True):
                     disabledModules.append(module_name)
                     logger.warning(f"模块 {moduleObj.moduleInfo.get('meta', {}).get('name', None)} 已禁用，跳过加载")
                     continue
-                    
+
                 required_deps = moduleObj.moduleInfo.get("dependencies", []).get("requires", [])
                 missing_required_deps = [dep for dep in required_deps if dep not in TempModules]
                 if missing_required_deps:
@@ -107,7 +110,7 @@ def init():
                 if dep in disabledModules:
                     logger.warning(f"模块 {module_name} 的依赖模块 {dep} 已禁用，跳过加载")
                     continue
-            
+
             if not all(dep in sdkInstalledModuleNames for dep in moduleDependecies):
                 raiserr.InvalidDependencyError(
                     f"模块 {module_name} 的依赖无效: {moduleDependecies}"
@@ -136,11 +139,22 @@ def init():
             module_status = mods.get_module_status(moduleInfo.get("meta", {}).get("name", None))
             if not module_status:
                 continue
-            
+
             moduleMain = moduleObj.Main(sdk)
             setattr(moduleMain, "moduleInfo", moduleInfo)
             setattr(sdk, moduleInfo.get("meta", {}).get("name", None), moduleMain)
             logger.debug(f"模块 {moduleInfo.get('meta', {}).get('name', None)} 正在初始化")
+
+            if hasattr(moduleMain, "register_adapters"):
+                try:
+                    adapters = moduleMain.register_adapters()
+                    if isinstance(adapters, dict):
+                        for platform_name, adapter_class in adapters.items():
+                            sdk.adapter.register(platform_name, adapter_class)
+                            logger.info(f"模块 {moduleInfo['meta']['name']} 注册了适配器: {platform_name}")
+                except Exception as e:
+                    logger.error(f"注册适配器失败: {e}")
+
     except Exception as e:
         logger.error(f"初始化失败: {e}")
         raise e

erispulse-1.0.15/ErisPulse/adapter.py

@@ -0,0 +1,81 @@
+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.14.dev3 → erispulse-1.0.15}/ErisPulse/db.py

@@ -17,7 +17,7 @@ class EnvManager:
         if not hasattr(self, "_initialized"):
             self._init_db()
             self._initialized = True
-    
+
     def _init_db(self):
         os.makedirs(os.path.dirname(self.db_path), exist_ok=True)
         conn = sqlite3.connect(self.db_path)
@@ -49,13 +49,13 @@ class EnvManager:
                 return self.get(key, default)
             else:
                 raise
-    
+
     def get_all_keys(self) -> list:
         with sqlite3.connect(self.db_path) as conn:
             cursor = conn.cursor()
             cursor.execute("SELECT key FROM config")
             return [row[0] for row in cursor.fetchall()]
-    
+
     def set(self, key, value):
         serialized_value = json.dumps(value) if isinstance(value, (dict, list)) else str(value)
         conn = sqlite3.connect(self.db_path)
@@ -70,7 +70,7 @@ class EnvManager:
         cursor.execute("DELETE FROM config WHERE key = ?", (key,))
         conn.commit()
         conn.close()
-    
+
     def clear(self):
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
@@ -87,7 +87,7 @@ class EnvManager:
             for key, value in vars(env_module).items():
                 if not key.startswith("__") and isinstance(value, (dict, list, str, int, float, bool)):
                     self.set(key, value)
-    
+
     def __getattr__(self, key):
         try:
             return self.get(key)

{erispulse-1.0.14.dev3 → erispulse-1.0.15}/ErisPulse/logger.py

@@ -19,7 +19,7 @@ class Logger:
         level = level.upper()
         if hasattr(logging, level):
             self._logger.setLevel(getattr(logging, level))
-    
+
     def set_module_level(self, module_name: str, level: str) -> bool:
         from .db import env
         if not env.get_module_status(module_name):
@@ -33,15 +33,15 @@ class Logger:
         else:
             self._logger.error(f"无效的日志等级: {level}")
             return False
-    
+
     def set_output_file(self, path: str | list):
         if self._file_handler:
             self._logger.removeHandler(self._file_handler)
             self._file_handler.close()
-        
+
         if isinstance(path, str):
             path = [path]
-        
+
         for p in path:
             try:
                 file_handler = logging.FileHandler(p, encoding='utf-8')
@@ -51,14 +51,14 @@ class Logger:
             except Exception as e:
                 self._logger.error(f"无法设置日志文件 {p}: {e}")
                 raise e
-        
+
     def save_logs(self, path: str | list):
         if self._logs == None:
             self._logger.warning("没有log记录可供保存。")
             return
         if isinstance(path, str):
             path = [path]
-        
+
         for p in path:
             try:
                 with open(p, "w", encoding="utf-8") as file:
@@ -70,14 +70,14 @@ class Logger:
             except Exception as e:
                 self._logger.error(f"无法保存日志到 {p}: {e}。")
                 raise e
-    
+
     def catch(self, func_or_level=None, level="error"):
         if isinstance(func_or_level, str):
             return lambda func: self.catch(func, level=func_or_level)
         if func_or_level is None:
             return lambda func: self.catch(func, level=level)
         func = func_or_level
-        
+
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
             try:
@@ -85,17 +85,17 @@ class Logger:
             except Exception as e:
                 import traceback
                 error_info = traceback.format_exc()
-                
+
                 module_name = func.__module__
                 if module_name == "__main__":
                     module_name = "Main"
                 func_name = func.__name__
-                
+
                 error_msg = f"Exception in {func_name}: {str(e)}\n{error_info}"
-                
+
                 log_method = getattr(self, level, self.error)
                 log_method(error_msg)
-                
+
                 return None
         return wrapper
 
@@ -105,10 +105,10 @@ class Logger:
         timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         msg = f"{timestamp} - {msg}"
         self._logs[ModuleName].append(msg)
-    
+
     def _get_effective_level(self, module_name):
         return self._module_levels.get(module_name, self._logger.level)
-    
+
     def _get_caller(self):
         frame = inspect.currentframe().f_back.f_back
         module = inspect.getmodule(frame)

{erispulse-1.0.14.dev3 → erispulse-1.0.15}/ErisPulse/mods.py

@@ -4,29 +4,29 @@ from typing import Dict, Optional
 class ModuleManager:
     DEFAULT_MODULE_PREFIX = "erispulse.module.data:"
     DEFAULT_STATUS_PREFIX = "erispulse.module.status:"
-    
+
     def __init__(self):
         from .db import env
         self.env = env
         self._ensure_prefixes()
-    
+
     def _ensure_prefixes(self):
         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)
-    
+
     @property
     def module_prefix(self) -> str:
         return self.env.get("erispulse.system.module_prefix")
-    
+
     @property
     def status_prefix(self) -> str:
         return self.env.get("erispulse.system.status_prefix")
 
     def set_module_status(self, module_name: str, status: bool) -> None:
         self.env.set(f"{self.status_prefix}{module_name}", bool(status))
-    
+
     def get_module_status(self, module_name: str) -> bool:
         status = self.env.get(f"{self.status_prefix}{module_name}", True)
         if isinstance(status, str):
@@ -48,7 +48,7 @@ class ModuleManager:
         modules_info = {}
         all_keys = self.env.get_all_keys()
         prefix_len = len(self.module_prefix)
-        
+
         for key in all_keys:
             if key.startswith(self.module_prefix):
                 module_name = key[prefix_len:]
@@ -58,14 +58,14 @@ class ModuleManager:
                     module_info['status'] = bool(status)
                     modules_info[module_name] = module_info
         return modules_info
-    
+
     def update_module(self, module_name: str, module_info: dict) -> None:
         self.set_module(module_name, module_info)
 
     def remove_module(self, module_name: str) -> bool:
         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)
@@ -77,7 +77,7 @@ class ModuleManager:
             if not module_prefix.endswith(':'):
                 module_prefix += ':'
             self.env.set("erispulse.system.module_prefix", module_prefix)
-        
+
         if status_prefix:
             if not status_prefix.endswith(':'):
                 status_prefix += ':'

{erispulse-1.0.14.dev3 → erispulse-1.0.15}/ErisPulse/raiserr.py

@@ -40,5 +40,5 @@ class Error:
             "doc": getattr(err_cls, "__doc__", ""),
             "class": err_cls,
         }
-    
+
 raiserr = Error()

erispulse-1.0.15/ErisPulse/util.py

@@ -0,0 +1,64 @@
+import time
+import asyncio
+import functools
+from concurrent.futures import ThreadPoolExecutor
+from collections import defaultdict, deque
+
+executor = ThreadPoolExecutor()
+
+def topological_sort(elements, dependencies, error):
+    graph = defaultdict(list)
+    in_degree = {element: 0 for element in elements}
+    for element, deps in dependencies.items():
+        for dep in deps:
+            graph[dep].append(element)
+            in_degree[element] += 1
+    queue = deque([element for element in elements if in_degree[element] == 0])
+    sorted_list = []
+    while queue:
+        node = queue.popleft()
+        sorted_list.append(node)
+        for neighbor in graph[node]:
+            in_degree[neighbor] -= 1
+            if in_degree[neighbor] == 0:
+                queue.append(neighbor)
+    if len(sorted_list) != len(elements):
+        raise error(f"Cycle detected in the dependencies: {elements} -> {dependencies}")
+    return sorted_list
+
+def ExecAsync(async_func, *args, **kwargs):
+    loop = asyncio.get_event_loop()
+    return loop.run_in_executor(executor, lambda: asyncio.run(async_func(*args, **kwargs)))
+
+def cache(func):
+    cache_dict = {}
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        key = (args, tuple(sorted(kwargs.items())))
+        if key not in cache_dict:
+            cache_dict[key] = func(*args, **kwargs)
+        return cache_dict[key]
+    return wrapper
+
+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))
+    return wrapper
+
+def retry(max_attempts=3, delay=1):
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            attempts = 0
+            while attempts < max_attempts:
+                try:
+                    return func(*args, **kwargs)
+                except Exception as e:
+                    attempts += 1
+                    if attempts == max_attempts:
+                        raise
+                    time.sleep(delay)
+        return wrapper
+    return decorator

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 1.0.14.dev3
+Version: 1.0.15
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>, runoneall <runoobsteve@gmail.com>
 Classifier: Development Status :: 5 - Production/Stable
@@ -20,8 +20,6 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: aiohttp
 
-⚠ 当前版本处于开发中，请谨慎使用。
-
 ![](./.github/assets/erispulse_logo.png)
 
 基于 [RyhBotPythonSDK V2](https://github.com/runoneall/RyhBotPythonSDK2) 构建，由 [sdkFrame](https://github.com/runoneall/sdkFrame) 提供支持的异步机器人开发框架。

{erispulse-1.0.14.dev3 → erispulse-1.0.15}/ErisPulse.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ README.md
 pyproject.toml
 ErisPulse/__init__.py
 ErisPulse/__main__.py
+ErisPulse/adapter.py
 ErisPulse/db.py
 ErisPulse/logger.py
 ErisPulse/mods.py

{erispulse-1.0.14.dev3 → erispulse-1.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 1.0.14.dev3
+Version: 1.0.15
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>, runoneall <runoobsteve@gmail.com>
 Classifier: Development Status :: 5 - Production/Stable
@@ -20,8 +20,6 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: aiohttp
 
-⚠ 当前版本处于开发中，请谨慎使用。
-
 ![](./.github/assets/erispulse_logo.png)
 
 基于 [RyhBotPythonSDK V2](https://github.com/runoneall/RyhBotPythonSDK2) 构建，由 [sdkFrame](https://github.com/runoneall/sdkFrame) 提供支持的异步机器人开发框架。

{erispulse-1.0.14.dev3 → erispulse-1.0.15}/README.md

@@ -1,5 +1,3 @@
-⚠ 当前版本处于开发中，请谨慎使用。
-
 ![](./.github/assets/erispulse_logo.png)
 
 基于 [RyhBotPythonSDK V2](https://github.com/runoneall/RyhBotPythonSDK2) 构建，由 [sdkFrame](https://github.com/runoneall/sdkFrame) 提供支持的异步机器人开发框架。

{erispulse-1.0.14.dev3 → erispulse-1.0.15}/pyproject.toml

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

erispulse-1.0.14.dev3/ErisPulse/util.py

@@ -1,29 +0,0 @@
-import asyncio
-from concurrent.futures import ThreadPoolExecutor
-from collections import defaultdict, deque
-
-executor = ThreadPoolExecutor()
-
-def topological_sort(elements, dependencies, error):
-    graph = defaultdict(list)
-    in_degree = {element: 0 for element in elements}
-    for element, deps in dependencies.items():
-        for dep in deps:
-            graph[dep].append(element)
-            in_degree[element] += 1
-    queue = deque([element for element in elements if in_degree[element] == 0])
-    sorted_list = []
-    while queue:
-        node = queue.popleft()
-        sorted_list.append(node)
-        for neighbor in graph[node]:
-            in_degree[neighbor] -= 1
-            if in_degree[neighbor] == 0:
-                queue.append(neighbor)
-    if len(sorted_list) != len(elements):
-        raise error(f"Cycle detected in the dependencies: {elements} -> {dependencies}")
-    return sorted_list
-
-def ExecAsync(async_func, *args, **kwargs):
-    loop = asyncio.get_event_loop()
-    return loop.run_in_executor(executor, lambda: asyncio.run(async_func(*args, **kwargs)))