ErisPulse 2.1.9__py3-none-any.whl → 2.1.11__py3-none-any.whl

ErisPulse/Core/adapter.py

@@ -403,7 +403,7 @@ class AdapterManager:
             platforms = list(self._adapters.keys())
 
         from .server import adapter_server
-        from .core_config import get_server_config
+        from .config import get_server_config
         server_config = get_server_config()
         host = server_config["host"]
         port = server_config["port"]

ErisPulse/Core/{core_config.py → config.py}

@@ -4,9 +4,75 @@ ErisPulse 配置中心
 集中管理所有配置项，避免循环导入问题
 提供自动补全缺失配置项的功能
 """
-
+import os
+import toml
 from typing import Dict, Any, Optional
 
+class ConfigManager:
+    def __init__(self, config_file: str = "config.toml"):
+        self.CONFIG_FILE = config_file
+
+    def getConfig(self, key: str, default: Any = None) -> Any:
+        """
+        获取模块/适配器配置项
+        :param key: 配置项的键(支持点分隔符如"module.sub.key")
+        :param default: 默认值
+        :return: 配置项的值
+        """
+        try:
+            if not os.path.exists(self.CONFIG_FILE):
+                return default
+                
+            with open(self.CONFIG_FILE, "r", encoding="utf-8") as f:
+                config = toml.load(f)
+            
+            # 支持点分隔符访问嵌套配置
+            keys = key.split('.')
+            value = config
+            for k in keys:
+                if k not in value:
+                    return default
+                value = value[k]
+                
+            return value
+        except Exception as e:
+            from . import logger
+            logger.error(f"读取配置文件 {self.CONFIG_FILE} 失败: {e}")
+            return default
+    
+    def setConfig(self, key: str, value: Any) -> bool:
+        """
+        设置模块/适配器配置
+        :param key: 配置项键名(支持点分隔符如"module.sub.key")
+        :param value: 配置项值
+        :return: 操作是否成功
+        """
+        try:
+            config = {}
+            if os.path.exists(self.CONFIG_FILE):
+                with open(self.CONFIG_FILE, "r", encoding="utf-8") as f:
+                    config = toml.load(f)
+            
+            # 支持点分隔符设置嵌套配置
+            keys = key.split('.')
+            current = config
+            for k in keys[:-1]:
+                if k not in current:
+                    current[k] = {}
+                current = current[k]
+            current[keys[-1]] = value
+            
+            with open(self.CONFIG_FILE, "w", encoding="utf-8") as f:
+                toml.dump(config, f)
+                
+            return True
+        except Exception as e:
+            from . import logger
+            logger.error(f"写入配置文件 {self.CONFIG_FILE} 失败: {e}")
+            return False
+
+config = ConfigManager()
+
 # 默认配置
 DEFAULT_CONFIG = {
     "server": {
@@ -53,14 +119,13 @@ def get_config() -> Dict[str, Any]:
     
     :return: 完整的配置字典
     """
-    from .env import env
-    
+
     # 获取现有配置
-    current_config = env.getConfig("ErisPulse")
+    current_config = config.getConfig("ErisPulse")
     
     # 如果完全没有配置，设置默认配置
     if current_config is None:
-        env.setConfig("ErisPulse", DEFAULT_CONFIG)
+        config.setConfig("ErisPulse", DEFAULT_CONFIG)
         return DEFAULT_CONFIG
     
     # 检查并补全缺失的配置项
@@ -68,7 +133,7 @@ def get_config() -> Dict[str, Any]:
     
     # 如果配置有变化，更新到存储
     if current_config != complete_config:
-        env.setConfig("ErisPulse", complete_config)
+        config.setConfig("ErisPulse", complete_config)
     
     return complete_config
 
@@ -79,8 +144,6 @@ def update_config(new_config: Dict[str, Any]) -> bool:
     :param new_config: 新的配置字典
     :return: 是否更新成功
     """
-    from .env import env
-    
     # 获取当前配置并合并新配置
     current = get_config()
     merged = {**current, **new_config}
@@ -88,7 +151,7 @@ def update_config(new_config: Dict[str, Any]) -> bool:
     # 确保合并后的配置结构完整
     complete_config = _ensure_config_structure(merged)
     
-    return env.setConfig("ErisPulse", complete_config)
+    return config.setConfig("ErisPulse", complete_config)
 
 def get_server_config() -> Dict[str, Any]:
     """

ErisPulse/Core/env.py

@@ -180,6 +180,7 @@ class EnvManager:
             return True
         except Exception as e:
             return False
+            
     def getConfig(self, key: str, default: Any = None) -> Any:
         """
         获取模块/适配器配置项
@@ -188,21 +189,8 @@ class EnvManager:
         :return: 配置项的值
         """
         try:
-            if not os.path.exists(self.CONFIG_FILE):
-                return default
-                
-            with open(self.CONFIG_FILE, "r", encoding="utf-8") as f:
-                config = toml.load(f)
-            
-            # 支持点分隔符访问嵌套配置
-            keys = key.split('.')
-            value = config
-            for k in keys:
-                if k not in value:
-                    return default
-                value = value[k]
-                
-            return value
+            from .config import config
+            return config.getConfig(key, default)
         except Exception as e:
             from . import logger
             logger.error(f"读取配置文件 {self.CONFIG_FILE} 失败: {e}")
@@ -216,24 +204,8 @@ class EnvManager:
         :return: 操作是否成功
         """
         try:
-            config = {}
-            if os.path.exists(self.CONFIG_FILE):
-                with open(self.CONFIG_FILE, "r", encoding="utf-8") as f:
-                    config = toml.load(f)
-            
-            # 支持点分隔符设置嵌套配置
-            keys = key.split('.')
-            current = config
-            for k in keys[:-1]:
-                if k not in current:
-                    current[k] = {}
-                current = current[k]
-            current[keys[-1]] = value
-            
-            with open(self.CONFIG_FILE, "w", encoding="utf-8") as f:
-                toml.dump(config, f)
-                
-            return True
+            from .config import config
+            return config.setConfig(key, value)
         except Exception as e:
             from . import logger
             logger.error(f"写入配置文件 {self.CONFIG_FILE} 失败: {e}")

ErisPulse/Core/logger.py

@@ -174,7 +174,7 @@ class Logger:
         self._logs[ModuleName].append(msg)
 
     def _setup_config(self):
-        from .core_config import get_logger_config
+        from .config import get_logger_config
         logger_config = get_logger_config()
         if "level" in logger_config:
             self.set_level(logger_config["level"])

ErisPulse/__main__.py

@@ -486,8 +486,8 @@ def main():
     upgrade_parser.add_argument('--force', '-f', action='store_true', help='跳过确认直接升级')
     
     # 运行命令
-    run_parser = subparsers.add_parser('run', help='运行指定主程序')
-    run_parser.add_argument('script', type=str, help='要运行的主程序路径')
+    run_parser = subparsers.add_parser('run', help='运行指定主程序(默认为main.py)')
+    run_parser.add_argument('script', type=str, nargs='?', help='要运行的主程序路径(可选，默认为main.py)')
     run_parser.add_argument('--reload', action='store_true', help='启用热重载模式')
     
     args = parser.parse_args()
@@ -603,6 +603,16 @@ def main():
                 PyPIManager.upgrade_all()
                 
         elif args.command == "run":
+            if not hasattr(args, 'script') or not args.script:
+                if not os.path.exists("config.toml") or not os.path.isfile("main.py"):
+                    from ErisPulse import sdk
+                    sdk.init()
+                args.script = "main.py"
+                console.print(Panel(
+                    "未指定主程序，运行入口点为 [bold]main.py[/]",
+                    title="提示",
+                    style="info"
+                ))
             start_reloader(args.script, args.reload)
         elif args.command == "list-remote":
             import asyncio
@@ -646,7 +656,14 @@ def main():
                     title="错误",
                     style="error"
                 ))
-        
+        elif args.command == "init":
+            from ErisPulse import sdk
+            sdk.init()
+            console.print(Panel(
+                "初始化完成",
+                title="成功",
+                style="success"
+            ))
     except KeyboardInterrupt as e:
         pass
     except Exception as e:

{erispulse-2.1.9.dist-info → erispulse-2.1.11.dist-info}/METADATA

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

erispulse-2.1.11.dist-info/RECORD

@@ -0,0 +1,16 @@
+ErisPulse/__init__.py,sha256=T-N56UQyBmpvlqwH2wGi5ptPzaJpbgF5tKkJt0DlkaM,26099
+ErisPulse/__main__.py,sha256=a_XkG4Zs2MzH5laNFxPigDlArWGJ5AkMglwChIgIW94,25617
+ErisPulse/Core/__init__.py,sha256=tBYPahQ7-w7U6M69xy8DW0_ECa9ja-Q0y_SQqVswYBo,409
+ErisPulse/Core/adapter.py,sha256=ZK81dibJ471FowL0MRXkS113iBcMgj_VzpTw0PzhAEo,18102
+ErisPulse/Core/config.py,sha256=ZmwGdtHSOE7K5uOGzLYcyl3ZF3sAmeWAntqcdfDzhpM,5027
+ErisPulse/Core/env.py,sha256=HGkzsdbxh8c1GSDJhnGP9B09Sz2ZeNbRxWieaFmAcug,18870
+ErisPulse/Core/logger.py,sha256=3PPwJVcIM_TZerGGK_68vCdxsR0owrhyek3iyugGVg0,8295
+ErisPulse/Core/mods.py,sha256=2yIq8t9Ca9CBPRiZU0yr8Lc0XGmmkB7LlH-5FWqXjw4,7023
+ErisPulse/Core/raiserr.py,sha256=vlyaaiOIYkyqm9dAqSW9E54JBzX-9roHDp5_r6I0yUU,5591
+ErisPulse/Core/server.py,sha256=FkDTeLuHD5IBnWVxvYU8pHb6yCt8GzyvC1bpOiJ7G7I,9217
+ErisPulse/Core/util.py,sha256=7rdMmn6sBFqYd4znxBCcJjuv2eyTExdeKyZopgds868,3796
+erispulse-2.1.11.dist-info/METADATA,sha256=sWtikjfI0bG6Khd8gUHl-2bX_xYTZOmDZffq9cA6PW8,6259
+erispulse-2.1.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+erispulse-2.1.11.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
+erispulse-2.1.11.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
+erispulse-2.1.11.dist-info/RECORD,,

erispulse-2.1.9.dist-info/RECORD

@@ -1,16 +0,0 @@
-ErisPulse/__init__.py,sha256=T-N56UQyBmpvlqwH2wGi5ptPzaJpbgF5tKkJt0DlkaM,26099
-ErisPulse/__main__.py,sha256=QwHMu8lmWbjS3EyOYV-wea3I0xcGmH_McWNx7JSGwts,24853
-ErisPulse/Core/__init__.py,sha256=tBYPahQ7-w7U6M69xy8DW0_ECa9ja-Q0y_SQqVswYBo,409
-ErisPulse/Core/adapter.py,sha256=Kmm_D8UcrDBJfn9EemAbgh3NB06Aj8u3iVNrBa1htJI,18107
-ErisPulse/Core/core_config.py,sha256=LwsOOIrZqm3-oUR-zkkaw_fmR3f4wMlEhFrc2tgiiRU,2847
-ErisPulse/Core/env.py,sha256=D2BwtSbKggbeAsOzwwVv-kd5UkVmYlDUHtgLzFZqKUI,19841
-ErisPulse/Core/logger.py,sha256=WfoFLHQfhRo4hKx-nOSTWq3maLMv-RexWLATvWQO4mc,8300
-ErisPulse/Core/mods.py,sha256=2yIq8t9Ca9CBPRiZU0yr8Lc0XGmmkB7LlH-5FWqXjw4,7023
-ErisPulse/Core/raiserr.py,sha256=vlyaaiOIYkyqm9dAqSW9E54JBzX-9roHDp5_r6I0yUU,5591
-ErisPulse/Core/server.py,sha256=FkDTeLuHD5IBnWVxvYU8pHb6yCt8GzyvC1bpOiJ7G7I,9217
-ErisPulse/Core/util.py,sha256=7rdMmn6sBFqYd4znxBCcJjuv2eyTExdeKyZopgds868,3796
-erispulse-2.1.9.dist-info/METADATA,sha256=SolTFf_3ALM1br71LporfFLq_2UM_ikHkNqEbqBxV1Q,6258
-erispulse-2.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-erispulse-2.1.9.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
-erispulse-2.1.9.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
-erispulse-2.1.9.dist-info/RECORD,,