ErisPulse 1.0.9__tar.gz → 1.0.10__tar.gz

{erispulse-1.0.9 → erispulse-1.0.10}/ErisPulse/__init__.py

@@ -64,17 +64,18 @@ def init():
 
                 optional_deps = moduleObj.moduleInfo.get("optional_dependencies", [])
                 available_optional_deps = []
-
                 for dep in optional_deps:
                     if isinstance(dep, list):
-                        if all(d in TempModules for d in dep):
-                            available_optional_deps.extend(dep)
+                        available_deps = [d for d in dep if d in TempModules]
+                        if available_deps:
+                            available_optional_deps.extend(available_deps)
                     elif dep in TempModules:
                         available_optional_deps.append(dep)
 
-                if optional_deps and not available_optional_deps:
+                if available_optional_deps:
+                    logger.info(f"模块 {module_name} 加载了部分可选依赖: {available_optional_deps}")
+                else:
                     logger.warning(f"模块 {module_name} 缺少所有可选依赖: {optional_deps}")
-                    continue
 
                 sdkInstalledModuleNames.append(module_name)
             except Exception as e:

{erispulse-1.0.9 → erispulse-1.0.10}/ErisPulse/envManager.py

@@ -1,211 +1,211 @@
-import os
-import json
-import sqlite3
-import importlib.util
-from pathlib import Path
-
-class EnvManager:
-    _instance = None
-    db_path = os.path.join(os.path.dirname(__file__), "config.db")
-
-    def __new__(cls, *args, **kwargs):
-        if not cls._instance:
-            cls._instance = super().__new__(cls)
-        return cls._instance
-
-    def __init__(self):
-        if not hasattr(self, "_initialized"):
-            self._init_db()
-    
-    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("""
-        CREATE TABLE IF NOT EXISTS config (
-            key TEXT PRIMARY KEY,
-            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()
-
-    def get(self, key, default=None):
-        try:
-            with sqlite3.connect(self.db_path) as conn:
-                cursor = conn.cursor()
-                cursor.execute("SELECT value FROM config WHERE key = ?", (key,))
-                result = cursor.fetchone()
-            if result:
-                try:
-                    return json.loads(result[0])
-                except json.JSONDecodeError:
-                    return result[0]
-            return default
-        except sqlite3.OperationalError as e:
-            if "no such table" in str(e):
-                self._init_db()
-                return self.get(key, default)
-            else:
-                raise
-
-    def set(self, key, value):
-        serialized_value = json.dumps(value) if isinstance(value, (dict, list)) else str(value)
-        conn = sqlite3.connect(self.db_path)
-        cursor = conn.cursor()
-        cursor.execute("INSERT OR REPLACE INTO config (key, value) VALUES (?, ?)", (key, serialized_value))
-        conn.commit()
-        conn.close()
-
-    def delete(self, key):
-        conn = sqlite3.connect(self.db_path)
-        cursor = conn.cursor()
-        cursor.execute("DELETE FROM config WHERE key = ?", (key,))
-        conn.commit()
-        conn.close()
-    
-    def clear(self):
-        conn = sqlite3.connect(self.db_path)
-        cursor = conn.cursor()
-        cursor.execute("DELETE FROM config")
-        conn.commit()
-        conn.close()
-
-    def load_env_file(self):
-        env_file = Path("env.py")
-        if env_file.exists():
-            spec = importlib.util.spec_from_file_location("env_module", env_file)
-            env_module = importlib.util.module_from_spec(spec)
-            spec.loader.exec_module(env_module)
-            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():
-                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)),
-                    module_info.get('info', {}).get('version', ''),
-                    module_info.get('info', {}).get('description', ''),
-                    module_info.get('info', {}).get('author', ''),
-                    json.dumps(module_info.get('info', {}).get('dependencies', [])),
-                    json.dumps(module_info.get('info', {}).get('optional_dependencies', [])),
-                    json.dumps(module_info.get('info', {}).get('pip_dependencies', []))  # 新增
-                ))
-            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': {
-                        'version': version,
-                        'description': description,
-                        'author': author,
-                        'dependencies': json.loads(dependencies) if dependencies else [],
-                        'optional_dependencies': json.loads(optional_dependencies) if optional_dependencies else [],
-                        'pip_dependencies': json.loads(pip_dependencies) if pip_dependencies else []  # 新增
-                    }
-                }
-            return modules_info
-
-    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': {
-                        'version': version,
-                        'description': description,
-                        'author': author,
-                        'dependencies': json.loads(dependencies) if dependencies else [],
-                        'optional_dependencies': json.loads(optional_dependencies) if optional_dependencies else [],
-                        'pip_dependencies': json.loads(pip_dependencies) if pip_dependencies else []  # 新增
-                    }
-                }
-            return None
-
-    def set_module(self, module_name, module_info):
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.cursor()
-            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)),
-                module_info.get('info', {}).get('version', ''),
-                module_info.get('info', {}).get('description', ''),
-                module_info.get('info', {}).get('author', ''),
-                json.dumps(module_info.get('info', {}).get('dependencies', [])),
-                json.dumps(module_info.get('info', {}).get('optional_dependencies', [])),
-                json.dumps(module_info.get('info', {}).get('pip_dependencies', []))  # 新增
-            ))
-            conn.commit()
-
-    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:
-            return self.get(key)
-        except KeyError:
-            raise AttributeError(f"配置项 {key} 不存在")
-
-env = EnvManager()
+import os
+import json
+import sqlite3
+import importlib.util
+from pathlib import Path
+
+class EnvManager:
+    _instance = None
+    db_path = os.path.join(os.path.dirname(__file__), "config.db")
+
+    def __new__(cls, *args, **kwargs):
+        if not cls._instance:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
+    def __init__(self):
+        if not hasattr(self, "_initialized"):
+            self._init_db()
+    
+    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("""
+        CREATE TABLE IF NOT EXISTS config (
+            key TEXT PRIMARY KEY,
+            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()
+
+    def get(self, key, default=None):
+        try:
+            with sqlite3.connect(self.db_path) as conn:
+                cursor = conn.cursor()
+                cursor.execute("SELECT value FROM config WHERE key = ?", (key,))
+                result = cursor.fetchone()
+            if result:
+                try:
+                    return json.loads(result[0])
+                except json.JSONDecodeError:
+                    return result[0]
+            return default
+        except sqlite3.OperationalError as e:
+            if "no such table" in str(e):
+                self._init_db()
+                return self.get(key, default)
+            else:
+                raise
+
+    def set(self, key, value):
+        serialized_value = json.dumps(value) if isinstance(value, (dict, list)) else str(value)
+        conn = sqlite3.connect(self.db_path)
+        cursor = conn.cursor()
+        cursor.execute("INSERT OR REPLACE INTO config (key, value) VALUES (?, ?)", (key, serialized_value))
+        conn.commit()
+        conn.close()
+
+    def delete(self, key):
+        conn = sqlite3.connect(self.db_path)
+        cursor = conn.cursor()
+        cursor.execute("DELETE FROM config WHERE key = ?", (key,))
+        conn.commit()
+        conn.close()
+    
+    def clear(self):
+        conn = sqlite3.connect(self.db_path)
+        cursor = conn.cursor()
+        cursor.execute("DELETE FROM config")
+        conn.commit()
+        conn.close()
+
+    def load_env_file(self):
+        env_file = Path("env.py")
+        if env_file.exists():
+            spec = importlib.util.spec_from_file_location("env_module", env_file)
+            env_module = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(env_module)
+            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():
+                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)),
+                    module_info.get('info', {}).get('version', ''),
+                    module_info.get('info', {}).get('description', ''),
+                    module_info.get('info', {}).get('author', ''),
+                    json.dumps(module_info.get('info', {}).get('dependencies', [])),
+                    json.dumps(module_info.get('info', {}).get('optional_dependencies', [])),
+                    json.dumps(module_info.get('info', {}).get('pip_dependencies', []))
+                ))
+            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': {
+                        'version': version,
+                        'description': description,
+                        'author': author,
+                        'dependencies': json.loads(dependencies) if dependencies else [],
+                        'optional_dependencies': json.loads(optional_dependencies) if optional_dependencies else [],
+                        'pip_dependencies': json.loads(pip_dependencies) if pip_dependencies else []
+                    }
+                }
+            return modules_info
+
+    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': {
+                        'version': version,
+                        'description': description,
+                        'author': author,
+                        'dependencies': json.loads(dependencies) if dependencies else [],
+                        'optional_dependencies': json.loads(optional_dependencies) if optional_dependencies else [],
+                        'pip_dependencies': json.loads(pip_dependencies) if pip_dependencies else []
+                    }
+                }
+            return None
+
+    def set_module(self, module_name, module_info):
+        with sqlite3.connect(self.db_path) as conn:
+            cursor = conn.cursor()
+            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)),
+                module_info.get('info', {}).get('version', ''),
+                module_info.get('info', {}).get('description', ''),
+                module_info.get('info', {}).get('author', ''),
+                json.dumps(module_info.get('info', {}).get('dependencies', [])),
+                json.dumps(module_info.get('info', {}).get('optional_dependencies', [])),
+                json.dumps(module_info.get('info', {}).get('pip_dependencies', []))
+            ))
+            conn.commit()
+
+    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:
+            return self.get(key)
+        except KeyError:
+            raise AttributeError(f"配置项 {key} 不存在")
+
+env = EnvManager()

{erispulse-1.0.9 → erispulse-1.0.10}/ErisPulse.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 1.0.9
+Version: 1.0.10
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Home-page: https://github.com/wsu2059q/ErisPulse
 Author: 艾莉丝·格雷拉特(WSu2059)
@@ -63,3 +63,8 @@ ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用
 
 ## 1.0.9
 修复了部分命令行参数的错误
+
+## 1.0.10
+- 修复了模块加载逻辑中可选依赖未正确加载的问题。
+- 增强了日志输出，便于调试模块加载过程。
+- 改进了 `optional_dependencies` 的处理逻辑，支持部分依赖加载。

{erispulse-1.0.9 → erispulse-1.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 1.0.9
+Version: 1.0.10
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Home-page: https://github.com/wsu2059q/ErisPulse
 Author: 艾莉丝·格雷拉特(WSu2059)
@@ -63,3 +63,8 @@ ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用
 
 ## 1.0.9
 修复了部分命令行参数的错误
+
+## 1.0.10
+- 修复了模块加载逻辑中可选依赖未正确加载的问题。
+- 增强了日志输出，便于调试模块加载过程。
+- 改进了 `optional_dependencies` 的处理逻辑，支持部分依赖加载。

{erispulse-1.0.9 → erispulse-1.0.10}/README.md

@@ -21,4 +21,9 @@ ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用
 现在包会被添加至系统环境，用户可以直接通过命令行'ep'或'epsdk'命令调用cli
 
 ## 1.0.9
-修复了部分命令行参数的错误
+修复了部分命令行参数的错误
+
+## 1.0.10
+- 修复了模块加载逻辑中可选依赖未正确加载的问题。
+- 增强了日志输出，便于调试模块加载过程。
+- 改进了 `optional_dependencies` 的处理逻辑，支持部分依赖加载。

{erispulse-1.0.9 → erispulse-1.0.10}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='ErisPulse',
-    version='1.0.9',
+    version='1.0.10',
     author='艾莉丝·格雷拉特(WSu2059)',
     author_email='wsu2059@qq.com',
     maintainer='runoneall',