ErisPulse 1.0.14.dev1__py3-none-any.whl → 1.0.14.dev3__py3-none-any.whl

ErisPulse/__init__.py

@@ -5,6 +5,7 @@ from . import util
 from .raiserr import raiserr
 from .logger import logger
 from .db import env
+from .mods import mods
 
 # 注册 ErrorHook 并预注册常用错误类型
 raiserr.register("MissingDependencyError", doc="缺少依赖错误")
@@ -14,6 +15,7 @@ raiserr.register("ModuleLoadError"       , doc="模块加载错误")
 
 sdk = types.SimpleNamespace()
 setattr(sdk, "env", env)
+setattr(sdk, "mods", mods)
 setattr(sdk, "raiserr", raiserr)
 setattr(sdk, "logger", logger)
 setattr(sdk, "util", util)
@@ -50,13 +52,13 @@ def init():
                     logger.warning(f"模块 {module_name} 缺少 'Main' 类.")
                     continue
                 
-                module_info = env.get_module(moduleObj.moduleInfo.get("meta", {}).get("name", None))
+                module_info = mods.get_module(moduleObj.moduleInfo.get("meta", {}).get("name", None))
                 if module_info is None:
                     module_info = {
                         "status": True,
                         "info": moduleObj.moduleInfo
                     }
-                    env.set_module(moduleObj.moduleInfo.get("meta", {}).get("name", None), module_info)
+                    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):
@@ -121,8 +123,8 @@ def init():
             moduleObj = __import__(module_name)
             moduleInfo: dict = moduleObj.moduleInfo
 
-            module_info = env.get_module(moduleInfo.get("meta", {}).get("name", None))
-            env.set_module(moduleInfo.get("meta", {}).get("name", None), {
+            module_info = mods.get_module(moduleInfo.get("meta", {}).get("name", None))
+            mods.set_module(moduleInfo.get("meta", {}).get("name", None), {
                 "status": True,
                 "info": moduleInfo
             })
@@ -131,7 +133,7 @@ def init():
         for module_name in sdkInstalledModuleNames:
             moduleObj = __import__(module_name)
             moduleInfo = moduleObj.moduleInfo
-            module_status = env.get_module_status(moduleInfo.get("meta", {}).get("name", None))
+            module_status = mods.get_module_status(moduleInfo.get("meta", {}).get("name", None))
             if not module_status:
                 continue
             

ErisPulse/__main__.py

@@ -9,6 +9,7 @@ import asyncio
 import subprocess
 import json
 from .db import env
+from .mods import mods
 
 def print_panel(msg, title=None, border_style=None):
     print("=" * 60)
@@ -157,17 +158,17 @@ class SourceManager:
             print_panel(f"源 {value} 不存在", "错误")
 
 def enable_module(module_name):
-    module_info = env.get_module(module_name)
+    module_info = mods.get_module(module_name)
     if module_info:
-        env.set_module_status(module_name, True)
+        mods.set_module_status(module_name, True)
         print_panel(f"✓ 模块 {module_name} 已成功启用", "成功")
     else:
         print_panel(f"模块 {module_name} 不存在", "错误")
 
 def disable_module(module_name):
-    module_info = env.get_module(module_name)
+    module_info = mods.get_module(module_name)
     if module_info:
-        env.set_module_status(module_name, False)
+        mods.set_module_status(module_name, False)
         print_panel(f"✓ 模块 {module_name} 已成功禁用", "成功")
     else:
         print_panel(f"模块 {module_name} 不存在", "错误")
@@ -255,7 +256,7 @@ def install_module(module_name, force=False):
                 SourceManager().update_sources()
                 env.set('last_origin_update_time', datetime.now().isoformat())
                 print("✓ 源更新完成")
-    module_info = env.get_module(module_name)
+    module_info = mods.get_module(module_name)
     if module_info and not force:
         meta = module_info.get('info', {}).get('meta', {})
         print_panel(
@@ -332,7 +333,7 @@ def install_module(module_name, force=False):
         module_dir=module_dir
     ):
         return
-    env.set_module(module_name, {
+    mods.set_module(module_name, {
         'status': True,
         'info': {
             'meta': {
@@ -352,7 +353,7 @@ def install_module(module_name, force=False):
 
 def uninstall_module(module_name):
     print_panel(f"准备卸载模块: {module_name}", "卸载摘要")
-    module_info = env.get_module(module_name)
+    module_info = mods.get_module(module_name)
     if not module_info:
         print_panel(f"模块 {module_name} 不存在", "错误")
         return
@@ -383,7 +384,7 @@ def uninstall_module(module_name):
         return
     pip_dependencies = depsinfo.get('pip', [])
     if pip_dependencies:
-        all_modules = env.get_all_modules()
+        all_modules = mods.get_all_modules()
         unused_pip_dependencies = []
         essential_packages = {'aiohttp'}
         for dep in pip_dependencies:
@@ -419,13 +420,13 @@ def uninstall_module(module_name):
                         f"卸载 pip 依赖失败: {e.stderr.decode()}",
                         "错误"
                     )
-    if env.remove_module(module_name):
+    if mods.remove_module(module_name):
         print_panel(f"✓ 模块 {module_name} 已成功卸载", "成功")
     else:
         print_panel(f"模块 {module_name} 不存在", "错误")
 
 def upgrade_all_modules(force=False):
-    all_modules = env.get_all_modules()
+    all_modules = mods.get_all_modules()
     if not all_modules:
         print("未找到任何模块，无法更新")
         return
@@ -478,16 +479,16 @@ def upgrade_all_modules(force=False):
         ):
             continue
         all_modules[update['name']]['info']['version'] = update['remote_version']
-        env.set_all_modules(all_modules)
+        mods.set_all_modules(all_modules)
         print(f"模块 {update['name']} 已更新至版本 {update['remote_version']}")
 
 def list_modules(module_name=None):
-    all_modules = env.get_all_modules()
+    all_modules = mods.get_all_modules()
     if not all_modules:
         print_panel("未在数据库中发现注册模块,正在初始化模块列表...", "提示")
         from . import init as init_module
         init_module()
-        all_modules = env.get_all_modules()
+        all_modules = mods.get_all_modules()
     if not all_modules:
         print_panel("未找到任何模块", "错误")
         return
@@ -576,7 +577,7 @@ def main():
                 continue
             if '*' in module_name or '?' in module_name:
                 print(f"正在匹配模块模式: {module_name}...")
-                all_modules = env.get_all_modules()
+                all_modules = mods.get_all_modules()
                 if not all_modules:
                     print_panel("未找到任何模块，请先更新源或检查配置", "错误")
                     continue
@@ -601,7 +602,7 @@ def main():
                 continue
             if '*' in module_name or '?' in module_name:
                 print(f"正在匹配模块模式: {module_name}...")
-                all_modules = env.get_all_modules()
+                all_modules = mods.get_all_modules()
                 if not all_modules:
                     print_panel("未找到任何模块，请先更新源或检查配置", "错误")
                     continue
@@ -628,7 +629,7 @@ def main():
                 continue
             if '*' in module_name or '?' in module_name:
                 print(f"正在匹配模块模式: {module_name}...")
-                all_modules = env.get_all_modules()
+                all_modules = mods.get_all_modules()
                 if not all_modules:
                     print_panel("未找到任何模块，请先更新源或检查配置", "错误")
                     continue
@@ -653,7 +654,7 @@ def main():
                 continue
             if '*' in module_name or '?' in module_name:
                 print(f"正在匹配模块模式: {module_name}...")
-                all_modules = env.get_all_modules()
+                all_modules = mods.get_all_modules()
                 if not all_modules:
                     print_panel("未找到任何模块，请先更新源或检查配置", "错误")
                     continue

ErisPulse/db.py

@@ -11,17 +11,15 @@ class EnvManager:
     def __new__(cls, *args, **kwargs):
         if not cls._instance:
             cls._instance = super().__new__(cls)
-            cls._instance.dev_mode = kwargs.get('dev_mode', False)
         return cls._instance
 
-    def __init__(self, dev_mode=False):
+    def __init__(self):
         if not hasattr(self, "_initialized"):
-            self.dev_mode = dev_mode
             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)
         cursor = conn.cursor()
         cursor.execute("""
@@ -30,18 +28,6 @@ class EnvManager:
             value TEXT NOT NULL
         )
         """)
-        cursor.execute("""
-        CREATE TABLE IF NOT EXISTS modules (
-            module_name TEXT PRIMARY KEY,
-            status INTEGER NOT NULL,
-            version TEXT,
-            description TEXT,
-            author TEXT,
-            dependencies TEXT,
-            optional_dependencies TEXT,
-            pip_dependencies TEXT
-        )
-        """)
         conn.commit()
         conn.close()
 
@@ -63,7 +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)
@@ -95,128 +87,6 @@ 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 set_module_status(self, module_name, status):
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.cursor()
-            cursor.execute("""
-            UPDATE modules SET status = ? WHERE module_name = ?
-            """, (int(status), module_name))
-            conn.commit()
-    
-    def get_module_status(self, module_name):
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.cursor()
-            cursor.execute("""
-            SELECT status FROM modules WHERE module_name = ?
-            """, (module_name,))
-            result = cursor.fetchone()
-            return bool(result[0]) if result else True
-
-    def set_all_modules(self, modules_info):
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.cursor()
-            for module_name, module_info in modules_info.items():
-                meta = module_info.get('info', {}).get('meta', {})
-                dependencies = module_info.get('info', {}).get('dependencies', {})
-                cursor.execute("""
-                INSERT OR REPLACE INTO modules (
-                    module_name, status, version, description, author, 
-                    dependencies, optional_dependencies, pip_dependencies
-                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-                """, (
-                    module_name,
-                    int(module_info.get('status', True)),
-                    meta.get('version', ''),
-                    meta.get('description', ''),
-                    meta.get('author', ''),
-                    json.dumps(dependencies.get('requires', [])),
-                    json.dumps(dependencies.get('optional', [])),
-                    json.dumps(dependencies.get('pip', []))
-                ))
-            conn.commit()
-
-    def get_all_modules(self):
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.cursor()
-            cursor.execute("SELECT * FROM modules")
-            rows = cursor.fetchall()
-            modules_info = {}
-            for row in rows:
-                module_name, status, version, description, author, dependencies, optional_dependencies, pip_dependencies = row
-                modules_info[module_name] = {
-                    'status': bool(status),
-                    'info': {
-                        'meta': {
-                            'version': version,
-                            'description': description,
-                            'author': author,
-                            'pip_dependencies': json.loads(pip_dependencies) if pip_dependencies else []
-                        },
-                        'dependencies': {
-                            'requires': json.loads(dependencies) if dependencies else [],
-                            'optional': json.loads(optional_dependencies) if optional_dependencies else [],
-                            'pip': json.loads(pip_dependencies) if pip_dependencies else []
-                        }
-                    }
-                }
-            return modules_info
-
-    def set_module(self, module_name, module_info):
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.cursor()
-            meta = module_info.get('info', {}).get('meta', {})
-            dependencies = module_info.get('info', {}).get('dependencies', {})
-            cursor.execute("""
-            INSERT OR REPLACE INTO modules (
-                module_name, status, version, description, author, 
-                dependencies, optional_dependencies, pip_dependencies
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-            """, (
-                module_name,
-                int(module_info.get('status', True)),
-                meta.get('version', ''),
-                meta.get('description', ''),
-                meta.get('author', ''),
-                json.dumps(dependencies.get('requires', [])),
-                json.dumps(dependencies.get('optional', [])),
-                json.dumps(dependencies.get('pip', []))
-            ))
-            conn.commit()
-
-    def get_module(self, module_name):
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.cursor()
-            cursor.execute("SELECT * FROM modules WHERE module_name = ?", (module_name,))
-            row = cursor.fetchone()
-            if row:
-                module_name, status, version, description, author, dependencies, optional_dependencies, pip_dependencies = row
-                return {
-                    'status': bool(status),
-                    'info': {
-                        'meta': {
-                            'version': version,
-                            'description': description,
-                            'author': author,
-                            'pip_dependencies': json.loads(pip_dependencies) if pip_dependencies else []
-                        },
-                        'dependencies': {
-                            'requires': json.loads(dependencies) if dependencies else [],
-                            'optional': json.loads(optional_dependencies) if optional_dependencies else [],
-                            'pip': json.loads(pip_dependencies) if pip_dependencies else []
-                        }
-                    }
-                }
-            return None
-
-    def update_module(self, module_name, module_info):
-        self.set_module(module_name, module_info)
-
-    def remove_module(self, module_name):
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.cursor()
-            cursor.execute("DELETE FROM modules WHERE module_name = ?", (module_name,))
-            conn.commit()
-            return cursor.rowcount > 0
     
     def __getattr__(self, key):
         try:

ErisPulse/logger.py

@@ -1,6 +1,7 @@
 import logging
 import inspect
 import datetime
+import functools
 
 class Logger:
     def __init__(self):
@@ -69,6 +70,34 @@ 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:
+                return func(*args, **kwargs)
+            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
 
     def _save_in_memory(self, ModuleName, msg):
         if ModuleName not in self._logs:

ErisPulse/mods.py

@@ -0,0 +1,86 @@
+import json
+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):
+            return status.lower() == 'true'
+        return bool(status)
+
+    def set_module(self, module_name: str, module_info: dict) -> None:
+        self.env.set(f"{self.module_prefix}{module_name}", module_info)
+        self.set_module_status(module_name, module_info.get('status', True))
+
+    def get_module(self, module_name: str) -> Optional[dict]:
+        return self.env.get(f"{self.module_prefix}{module_name}")
+
+    def set_all_modules(self, modules_info: Dict[str, dict]) -> None:
+        for module_name, module_info in modules_info.items():
+            self.set_module(module_name, module_info)
+
+    def get_all_modules(self) -> dict:
+        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:]
+                module_info = self.get_module(module_name)
+                if module_info:
+                    status = self.get_module_status(module_name)
+                    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)
+            return True
+        return False
+
+    def update_prefixes(self, module_prefix: str = None, status_prefix: str = None) -> None:
+        if module_prefix:
+            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 += ':'
+            self.env.set("erispulse.system.status_prefix", status_prefix)
+
+mods = ModuleManager()

{erispulse-1.0.14.dev1.dist-info → erispulse-1.0.14.dev3.dist-info}/METADATA

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

erispulse-1.0.14.dev3.dist-info/RECORD

@@ -0,0 +1,12 @@
+ErisPulse/__init__.py,sha256=eLYg5fmwxwXsH7YK7z2f5AZRZA5SQIoS0xqMJN7KhVg,6717
+ErisPulse/__main__.py,sha256=-UdhsYP_X7EagomCjo73Y_qQdXwtMbDS5KoOSrI-OcU,32181
+ErisPulse/db.py,sha256=CnREeykvRmEDx9HE4bS4gakcAUYWuBOfN3WgPsQMAd4,3208
+ErisPulse/logger.py,sha256=HwceD81nLiLCh_WGcCVsEG6OqL-NL5HmdONFTGH-8Og,6023
+ErisPulse/mods.py,sha256=o6yT5YhNyfeCpXrEFZYSBCr3YQqjFXZ0hN3u1XoKHJ4,3360
+ErisPulse/raiserr.py,sha256=WTMQEUbUSx4PS9_l9cEnuNuvm6zulgwQFipqVZZg3zc,1296
+ErisPulse/util.py,sha256=90j71c32yP-s2zy1SM-1FExJRu7pWpkuPVQSXCaVTrg,1087
+erispulse-1.0.14.dev3.dist-info/METADATA,sha256=ALV5xc2zQl_1ZcDNM3yjGKCOAbM1o3J5RaXqg0N5DVg,2502
+erispulse-1.0.14.dev3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+erispulse-1.0.14.dev3.dist-info/entry_points.txt,sha256=AjKvOdYR7QGXVpEJhjUYUwV2JluE4lm9vNbknC3hjOM,155
+erispulse-1.0.14.dev3.dist-info/top_level.txt,sha256=Lm_qtkVvNJR8_dXh_qEDdl_12cZGpic-i4HUlVVUMZc,10
+erispulse-1.0.14.dev3.dist-info/RECORD,,

erispulse-1.0.14.dev1.dist-info/RECORD

@@ -1,11 +0,0 @@
-ErisPulse/__init__.py,sha256=75SfkJEYHy73K3UGaEuMYlHtJadjpoNWd1yF-f5-aGc,6662
-ErisPulse/__main__.py,sha256=1-mWPmZArG-o_eYxZiabmMs4MokQn_-TBa43R4_WYlc,32141
-ErisPulse/db.py,sha256=2vBVFFEU-AcR-GkzWTqpn8fFV9EvuQee2mi1XzfDXVI,9077
-ErisPulse/logger.py,sha256=AVjBuoF18Wu6mPMxB90i7Nge0IoMx2xPlTYrQX-UKaU,4973
-ErisPulse/raiserr.py,sha256=WTMQEUbUSx4PS9_l9cEnuNuvm6zulgwQFipqVZZg3zc,1296
-ErisPulse/util.py,sha256=90j71c32yP-s2zy1SM-1FExJRu7pWpkuPVQSXCaVTrg,1087
-erispulse-1.0.14.dev1.dist-info/METADATA,sha256=132PK2kNWhBPBoQdx-9yf6wJV7RNQpksk3EjwMdAjOc,2502
-erispulse-1.0.14.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-erispulse-1.0.14.dev1.dist-info/entry_points.txt,sha256=AjKvOdYR7QGXVpEJhjUYUwV2JluE4lm9vNbknC3hjOM,155
-erispulse-1.0.14.dev1.dist-info/top_level.txt,sha256=Lm_qtkVvNJR8_dXh_qEDdl_12cZGpic-i4HUlVVUMZc,10
-erispulse-1.0.14.dev1.dist-info/RECORD,,