ErisPulse 2.1.8__tar.gz → 2.1.9__tar.gz

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

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

{erispulse-2.1.8 → erispulse-2.1.9}/examples/example-adapter/MyAdapter/Core.py

@@ -12,24 +12,26 @@ class MyAdapter(BaseAdapter):
         self.logger = self.sdk.logger
         
         self.logger.info("MyModule 初始化完成")
-        self.load_config()
+        self.config = self._load_config()
+    
     # 加载配置方法，你需要在这里进行必要的配置加载逻辑
-    def load_config(self):
-        self.config = self.env.getConfig("MyAdapter", {})
-
-        if self.config is None:
-            self.logger.error("请在env.py中添加MyAdapter配置")
-            self.env.setConfig("MyAdapter", {
+    def _load_config(self):
+        _config = self.env.getConfig("MyAdapter", {})
+        if _config is None:
+            default_config = {
                 "mode": "server",
                 "server": {
-                    "host": "127.0.0.1",
-                    "port": 8080
+                    "path": "/webhook",
                 },
                 "client": {
                     "url": "http://127.0.0.1:8080",
                     "token": ""
                 }
-            })
+            }
+            self.env.setConfig("MyAdapter", default_config)
+            return default_config
+        return _config
+    
     class Send(BaseAdapter.Send):  # 继承BaseAdapter内置的Send类
         # 底层SendDSL中提供了To方法，用户调用的时候类会被定义 `self._target_type` 和 `self._target_id`/`self._target_to` 三个属性
         # 当你只需要一个接受的To时，例如 mail 的To只是一个邮箱，那么你可以使用 `self.To(email)`，这时只会有 `self._target_id`/`self._target_to` 两个属性被定义

{erispulse-2.1.8 → erispulse-2.1.9}/examples/example-module/MyModule/Core.py

@@ -9,23 +9,22 @@ class Main:
         self.logger = self.sdk.logger
         
         self.logger.info("MyModule 初始化完成")
-        self.load_config()
-
-    def load_config(self):
-        self.config = self.env.getConfig("MyModule", {})
-
-        if self.config is None:
-            self.logger.error("无法加载配置文件")
-
-            self.env.setConfig("MyModule", {
-                "key1": "value1",
-                "key2": ["value2", "value3"],
+        self.config = self._load_config()
+    
+    # 加载配置方法，你需要在这里进行必要的配置加载逻辑
+    def _load_config(self):
+        _config = self.env.getConfig("MyModule", {})
+        if _config is None:
+            default_config = {
+                "key": "value",
+                "key2": [1, 2, 3],
                 "key3": {
-                    "key4": "value4",
-                    "key5": "value5"
-                },
-                "key6": True
-            })
+                    "key4": "value4"
+                }
+            }
+            self.env.setConfig("MyModule", default_config)
+            return default_config
+        return _config
             
     def hello(self):
         self.logger.info("Hello World!")

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

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

erispulse-2.1.9/src/ErisPulse/Core/__init__.py

@@ -0,0 +1,21 @@
+from .adapter import AdapterFather, SendDSL, adapter
+from .env import env
+from .logger import logger
+from .mods import mods
+from .raiserr import raiserr
+from .util import util
+from .server import adapter_server
+BaseAdapter = AdapterFather
+
+__all__ = [
+    'BaseAdapter',
+    'AdapterFather',
+    'SendDSL',
+    'adapter',
+    'env',
+    'logger',
+    'mods',
+    'raiserr',
+    'util',
+    'adapter_server'
+]

{erispulse-2.1.8 → erispulse-2.1.9}/src/ErisPulse/Core/adapter.py

@@ -402,17 +402,14 @@ class AdapterManager:
         if platforms is None:
             platforms = list(self._adapters.keys())
 
-        from .env import env
-        from .logger import logger
         from .server import adapter_server
-
-        from . import _config
-        server_config = _config.get("server", {})
+        from .core_config import get_server_config
+        server_config = get_server_config()
         host = server_config["host"]
         port = server_config["port"]
         ssl_cert = server_config.get("ssl_certfile", None)
         ssl_key = server_config.get("ssl_keyfile", None)
-
+        
         # 启动服务器
         await adapter_server.start(
             host=host,

erispulse-2.1.9/src/ErisPulse/Core/core_config.py

@@ -0,0 +1,109 @@
+"""
+ErisPulse 配置中心
+
+集中管理所有配置项，避免循环导入问题
+提供自动补全缺失配置项的功能
+"""
+
+from typing import Dict, Any, Optional
+
+# 默认配置
+DEFAULT_CONFIG = {
+    "server": {
+        "host": "0.0.0.0",
+        "port": 8000,
+        "ssl_certfile": None,
+        "ssl_keyfile": None
+    },
+    "logger": {
+        "level": "INFO",
+        "log_files": [],
+        "memory_limit": 1000
+    }
+}
+
+def _ensure_config_structure(config: Dict[str, Any]) -> Dict[str, Any]:
+    """
+    确保配置结构完整，补全缺失的配置项
+    
+    :param config: 当前配置
+    :return: 补全后的完整配置
+    """
+    merged_config = DEFAULT_CONFIG.copy()
+    
+    # 深度合并配置
+    for section, default_values in DEFAULT_CONFIG.items():
+        if section not in config:
+            config[section] = default_values.copy()
+            continue
+            
+        if not isinstance(config[section], dict):
+            config[section] = default_values.copy()
+            continue
+            
+        for key, default_value in default_values.items():
+            if key not in config[section]:
+                config[section][key] = default_value
+                
+    return config
+
+def get_config() -> Dict[str, Any]:
+    """
+    获取当前配置，自动补全缺失的配置项并保存
+    
+    :return: 完整的配置字典
+    """
+    from .env import env
+    
+    # 获取现有配置
+    current_config = env.getConfig("ErisPulse")
+    
+    # 如果完全没有配置，设置默认配置
+    if current_config is None:
+        env.setConfig("ErisPulse", DEFAULT_CONFIG)
+        return DEFAULT_CONFIG
+    
+    # 检查并补全缺失的配置项
+    complete_config = _ensure_config_structure(current_config)
+    
+    # 如果配置有变化，更新到存储
+    if current_config != complete_config:
+        env.setConfig("ErisPulse", complete_config)
+    
+    return complete_config
+
+def update_config(new_config: Dict[str, Any]) -> bool:
+    """
+    更新配置，自动补全缺失的配置项
+    
+    :param new_config: 新的配置字典
+    :return: 是否更新成功
+    """
+    from .env import env
+    
+    # 获取当前配置并合并新配置
+    current = get_config()
+    merged = {**current, **new_config}
+    
+    # 确保合并后的配置结构完整
+    complete_config = _ensure_config_structure(merged)
+    
+    return env.setConfig("ErisPulse", complete_config)
+
+def get_server_config() -> Dict[str, Any]:
+    """
+    获取服务器配置，确保结构完整
+    
+    :return: 服务器配置字典
+    """
+    config = get_config()
+    return config["server"]
+
+def get_logger_config() -> Dict[str, Any]:
+    """
+    获取日志配置，确保结构完整
+    
+    :return: 日志配置字典
+    """
+    config = get_config()
+    return config["logger"]

{erispulse-2.1.8 → erispulse-2.1.9}/src/ErisPulse/Core/logger.py

@@ -119,7 +119,6 @@ class Logger:
                 # 使用自定义格式化器去除rich markup标签
                 file_handler.setFormatter(logging.Formatter("[%(name)s] %(message)s"))
                 self._logger.addHandler(file_handler)
-                self._logger.info(f"日志输出已设置到文件: {p}")
                 return True
             except Exception as e:
                 self._logger.error(f"无法设置日志文件 {p}: {e}")
@@ -175,17 +174,15 @@ class Logger:
         self._logs[ModuleName].append(msg)
 
     def _setup_config(self):
-        from .env import env
-        _config = env.getConfig("ErisPulse")
-        if "logger" in _config:
-            logger_config = _config["logger"]
-            if "level" in logger_config:
-                self.set_level(logger_config["level"])
-            if "log_files" in logger_config and logger_config["log_files"]:
-                self.set_output_file(logger_config["log_files"])
-            if "memory_limit" in logger_config:
-                self.set_memory_limit(logger_config["memory_limit"])
-
+        from .core_config import get_logger_config
+        logger_config = get_logger_config()
+        if "level" in logger_config:
+            self.set_level(logger_config["level"])
+        if "log_files" in logger_config and logger_config["log_files"]:
+            self.set_output_file(logger_config["log_files"])
+        if "memory_limit" in logger_config:
+            self.set_memory_limit(logger_config["memory_limit"])
+    
     def _get_effective_level(self, module_name):
         return self._module_levels.get(module_name, self._logger.level)
 

erispulse-2.1.8/src/ErisPulse/Core/__init__.py

@@ -1,57 +0,0 @@
-from .adapter import AdapterFather, SendDSL, adapter
-from .env import env
-from .logger import logger
-from .mods import mods
-from .raiserr import raiserr
-from .util import util
-from .server import adapter_server
-BaseAdapter = AdapterFather
-
-__all__ = [
-    'BaseAdapter',
-    'AdapterFather',
-    'SendDSL',
-    'adapter',
-    'env',
-    'logger',
-    'mods',
-    'raiserr',
-    'util',
-    'adapter_server'
-]
-
-_config = env.getConfig("ErisPulse")
-
-if _config is None:
-    defaultConfig = {
-        "server": {
-            "host": "0.0.0.0",
-            "port": 8000,
-            "ssl_certfile": None,
-            "ssl_keyfile": None
-        },
-        "logger": {
-            "level": "INFO",
-            "log_files": [],
-            "memory_limit": 1000
-        }
-    }
-    env.setConfig("ErisPulse", defaultConfig)
-    _config = defaultConfig
-
-if _config.get("server") is None:
-    _config["server"] = {
-        "host": "0.0.0.0",
-        "port": 8000,
-        "ssl_certfile": None,
-        "ssl_keyfile": None
-    }
-    env.setConfig("ErisPulse", _config)
-    
-if _config.get("logger") is None:
-    _config["logger"] = {
-        "level": "INFO",
-        "log_files": [],
-        "memory_limit": 1000
-    }
-    env.setConfig("ErisPulse", _config)