ErisPulse 2.1.9__tar.gz → 2.1.10__tar.gz

{erispulse-2.1.9 → erispulse-2.1.10}/PKG-INFO

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

{erispulse-2.1.9 → erispulse-2.1.10}/docs/CHANGELOG.md

@@ -8,10 +8,14 @@
 > **贡献日志**
 > 如需为新版本添加日志，请在对应版本号下补充内容，并注明日期和主要贡献者。
 
-## [2.1.8] - 2025/07/20
+## [2.1.10] - 2025/07/20
+### 新增
+- 新增 `config` 模块，用于分离 `env` 模块功能，提供更友好的配置管理体验
 
 ### 变更
 - 标准日志处理器替换为RichHandler，提供更美观的彩色控制台日志输出
+- 使用独立的 `Config` 模块处理核心配置，避免与 `env` 模块冲突
+- 兼容性性改进：解决情况下部分循环引用问题
 
 ### 修复
 - 修复设置模块日志等级时，调用错误的问题

{erispulse-2.1.9 → erispulse-2.1.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ErisPulse"
-version = "2.1.9"
+version = "2.1.10"
 description = "ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。"
 readme = "README.md"
 requires-python = ">=3.8"

{erispulse-2.1.9 → erispulse-2.1.10}/src/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-2.1.9/src/ErisPulse/Core/core_config.py → erispulse-2.1.10/src/ErisPulse/Core/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-2.1.9 → erispulse-2.1.10}/src/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-2.1.9 → erispulse-2.1.10}/src/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"])