ErisPulse 2.1.14.dev1__py3-none-any.whl → 2.1.15.dev3__py3-none-any.whl

ErisPulse/Core/env.py

@@ -1,542 +1,15 @@
 """
-ErisPulse 环境配置模块
+ErisPulse 环境模块 (已弃用)
 
-提供键值存储、事务支持、快照和恢复功能，用于管理框架配置数据。基于SQLite实现持久化存储，支持复杂数据类型和原子操作。
+此模块已重命名为 storage，为保持向后兼容性而保留。
+建议使用 from ErisPulse.Core import storage 替代 from ErisPulse.Core import env
 
-{!--< tips >!--}
-1. 支持JSON序列化存储复杂数据类型
-2. 提供事务支持确保数据一致性
-3. 自动快照功能防止数据丢失
-{!--< /tips >!--}
+{!--< deprecated >!--} 请使用 storage 模块替代
 """
 
-import os
-import json
-import sqlite3
-import shutil
-import time
-from datetime import datetime
-from typing import List, Dict, Optional, Any, Tuple, Type
+from .storage import storage
 
-class EnvManager:
-    """
-    环境配置管理器
-    
-    单例模式实现，提供配置的增删改查、事务和快照管理
-    
-    {!--< tips >!--}
-    1. 使用get/set方法操作配置项
-    2. 使用transaction上下文管理事务
-    3. 使用snapshot/restore管理数据快照
-    {!--< /tips >!--}
-    """
-    
-    _instance = None
-    db_path = os.path.join(os.path.dirname(__file__), "../data/config.db")
-    SNAPSHOT_DIR = os.path.join(os.path.dirname(__file__), "../data/snapshots")
-    
+# 向后兼容性
+env = storage
 
-    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._last_snapshot_time = time.time()
-            self._snapshot_interval = 3600
-            self._init_db()
-            self._initialized = True
-
-    def _init_db(self) -> None:
-        """
-        {!--< internal-use >!--}
-        初始化数据库
-        """
-        os.makedirs(os.path.dirname(self.db_path), exist_ok=True)
-        os.makedirs(self.SNAPSHOT_DIR, exist_ok=True)
-        conn = sqlite3.connect(self.db_path)
-        
-        # 启用WAL模式提高并发性能
-        conn.execute("PRAGMA journal_mode=WAL")
-        conn.execute("PRAGMA synchronous=NORMAL")
-        
-        cursor = conn.cursor()
-        cursor.execute("""
-        CREATE TABLE IF NOT EXISTS config (
-            key TEXT PRIMARY KEY,
-            value TEXT NOT NULL
-        )
-        """)
-        conn.commit()
-        conn.close()
-        
-        # 初始化自动快照调度器
-        self._last_snapshot_time = time.time()  # 初始化为当前时间
-        self._snapshot_interval = 3600  # 默认每小时自动快照
-
-    def get(self, key: str, default: Any = None) -> Any:
-        """
-        获取配置项的值
-        
-        :param key: 配置项键名
-        :param default: 默认值(当键不存在时返回)
-        :return: 配置项的值
-        
-        :example:
-        >>> timeout = env.get("network.timeout", 30)
-        >>> user_settings = env.get("user.settings", {})
-        """
-        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:
-                from . import logger
-                logger.error(f"数据库操作错误: {e}")
-    def get_all_keys(self) -> List[str]:
-        """
-        获取所有配置项的键名
-        
-        :return: 键名列表
-        
-        :example:
-        >>> all_keys = env.get_all_keys()
-        >>> print(f"共有 {len(all_keys)} 个配置项")
-        """
-        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: str, value: Any) -> bool:
-        """
-        设置配置项的值
-        
-        :param key: 配置项键名
-        :param value: 配置项的值
-        :return: 操作是否成功
-        
-        :example:
-        >>> env.set("app.name", "MyApp")
-        >>> env.set("user.settings", {"theme": "dark"})
-        """
-        try:
-            serialized_value = json.dumps(value) if isinstance(value, (dict, list)) else str(value)
-            with self.transaction():
-                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()
-            
-            self._check_auto_snapshot()
-            return True
-        except Exception as e:
-            return False
-
-    def set_multi(self, items: Dict[str, Any]) -> bool:
-        """
-        批量设置多个配置项
-        
-        :param items: 键值对字典
-        :return: 操作是否成功
-        
-        :example:
-        >>> env.set_multi({
-        >>>     "app.name": "MyApp",
-        >>>     "app.version": "1.0.0",
-        >>>     "app.debug": True
-        >>> })
-        """
-        try:
-            with self.transaction():
-                conn = sqlite3.connect(self.db_path)
-                cursor = conn.cursor()
-                for key, value in items.items():
-                    serialized_value = json.dumps(value) if isinstance(value, (dict, list)) else str(value)
-                    cursor.execute("INSERT OR REPLACE INTO config (key, value) VALUES (?, ?)", 
-                        (key, serialized_value))
-                conn.commit()
-                conn.close()
-            
-            self._check_auto_snapshot()
-            return True
-        except Exception as e:
-            return False
-            
-    def getConfig(self, key: str, default: Any = None) -> Any:
-        """
-        获取模块/适配器配置项
-        :param key: 配置项的键(支持点分隔符如"module.sub.key")
-        :param default: 默认值
-        :return: 配置项的值
-        """
-        try:
-            from .config import config
-            return config.getConfig(key, default)
-        except Exception as e:
-            return default
-    
-    def setConfig(self, key: str, value: Any) -> bool:
-        """
-        设置模块/适配器配置
-        :param key: 配置项键名(支持点分隔符如"module.sub.key")
-        :param value: 配置项值
-        :return: 操作是否成功
-        """
-        try:
-            from .config import config
-            return config.setConfig(key, value)
-        except Exception as e:
-            return False
-
-    def delete(self, key: str) -> bool:
-        """
-        删除配置项
-        
-        :param key: 配置项键名
-        :return: 操作是否成功
-        
-        :example:
-        >>> env.delete("temp.session")
-        """
-        try:
-            with self.transaction():
-                conn = sqlite3.connect(self.db_path)
-                cursor = conn.cursor()
-                cursor.execute("DELETE FROM config WHERE key = ?", (key,))
-                conn.commit()
-                conn.close()
-            
-            self._check_auto_snapshot()
-            return True
-        except Exception as e:
-            return False
-            
-    def delete_multi(self, keys: List[str]) -> bool:
-        """
-        批量删除多个配置项
-        
-        :param keys: 键名列表
-        :return: 操作是否成功
-        
-        :example:
-        >>> env.delete_multi(["temp.key1", "temp.key2"])
-        """
-        try:
-            with self.transaction():
-                conn = sqlite3.connect(self.db_path)
-                cursor = conn.cursor()
-                cursor.executemany("DELETE FROM config WHERE key = ?", [(k,) for k in keys])
-                conn.commit()
-                conn.close()
-            
-            self._check_auto_snapshot()
-            return True
-        except Exception as e:
-            return False
-            
-    def get_multi(self, keys: List[str]) -> Dict[str, Any]:
-        """
-        批量获取多个配置项的值
-        
-        :param keys: 键名列表
-        :return: 键值对字典
-        
-        :example:
-        >>> settings = env.get_multi(["app.name", "app.version"])
-        """
-        conn = sqlite3.connect(self.db_path)
-        cursor = conn.cursor()
-        placeholders = ','.join(['?'] * len(keys))
-        cursor.execute(f"SELECT key, value FROM config WHERE key IN ({placeholders})", keys)
-        results = {row[0]: json.loads(row[1]) if row[1].startswith(('{', '[')) else row[1] 
-                    for row in cursor.fetchall()}
-        conn.close()
-        return results
-
-    def transaction(self) -> 'EnvManager._Transaction':
-        """
-        创建事务上下文
-        
-        :return: 事务上下文管理器
-        
-        :example:
-        >>> with env.transaction():
-        >>>     env.set("key1", "value1")
-        >>>     env.set("key2", "value2")
-        """
-        return self._Transaction(self)
-
-    class _Transaction:
-        """
-        事务上下文管理器
-        
-        {!--< internal-use >!--}
-        确保多个操作的原子性
-        """
-        
-        def __init__(self, env_manager: 'EnvManager'):
-            self.env_manager = env_manager
-            self.conn = None
-            self.cursor = None
-
-        def __enter__(self) -> 'EnvManager._Transaction':
-            """
-            进入事务上下文
-            """
-            self.conn = sqlite3.connect(self.env_manager.db_path)
-            self.cursor = self.conn.cursor()
-            self.cursor.execute("BEGIN TRANSACTION")
-            return self
-
-        def __exit__(self, exc_type: Type[Exception], exc_val: Exception, exc_tb: Any) -> None:
-            """
-            退出事务上下文
-            """
-            if exc_type is None:
-                self.conn.commit()
-            else:
-                self.conn.rollback()
-                from .logger import logger
-                logger.error(f"事务执行失败: {exc_val}")
-            self.conn.close()
-
-    def _check_auto_snapshot(self) -> None:
-        """
-        {!--< internal-use >!--}
-        检查并执行自动快照
-        """
-        from .logger import logger
-        
-        if not hasattr(self, '_last_snapshot_time') or self._last_snapshot_time is None:
-            self._last_snapshot_time = time.time()
-            
-        if not hasattr(self, '_snapshot_interval') or self._snapshot_interval is None:
-            self._snapshot_interval = 3600
-            
-        current_time = time.time()
-        
-        try:
-            time_diff = current_time - self._last_snapshot_time
-            if not isinstance(time_diff, (int, float)):
-                raise ValueError("时间差应为数值类型")
-
-            if not isinstance(self._snapshot_interval, (int, float)):
-                raise ValueError("快照间隔应为数值类型")
-                
-            if time_diff > self._snapshot_interval:
-                self._last_snapshot_time = current_time
-                self.snapshot(f"auto_{datetime.now().strftime('%Y%m%d_%H%M%S')}")
-                
-        except Exception as e:
-            logger.error(f"自动快照检查失败: {e}")
-            self._last_snapshot_time = current_time
-            self._snapshot_interval = 3600
-
-    def set_snapshot_interval(self, seconds: int) -> None:
-        """
-        设置自动快照间隔
-        
-        :param seconds: 间隔秒数
-        
-        :example:
-        >>> # 每30分钟自动快照
-        >>> env.set_snapshot_interval(1800)
-        """
-        self._snapshot_interval = seconds
-
-    def clear(self) -> bool:
-        """
-        清空所有配置项
-        
-        :return: 操作是否成功
-        
-        :example:
-        >>> env.clear()  # 清空所有配置
-        """
-        try:
-            conn = sqlite3.connect(self.db_path)
-            cursor = conn.cursor()
-            cursor.execute("DELETE FROM config")
-            conn.commit()
-            conn.close()
-            return True
-        except Exception as e:
-            return False
-        
-    def __getattr__(self, key: str) -> Any:
-        """
-        通过属性访问配置项
-        
-        :param key: 配置项键名
-        :return: 配置项的值
-        
-        :raises KeyError: 当配置项不存在时抛出
-            
-        :example:
-        >>> app_name = env.app_name
-        """
-        try:
-            return self.get(key)
-        except KeyError:
-            from . import logger
-            logger.error(f"配置项 {key} 不存在")
-
-    def __setattr__(self, key: str, value: Any) -> None:
-        """
-        通过属性设置配置项
-        
-        :param key: 配置项键名
-        :param value: 配置项的值
-            
-        :example:
-        >>> env.app_name = "MyApp"
-        """
-        try:
-            self.set(key, value)
-        except Exception as e:
-            from . import logger
-            logger.error(f"设置配置项 {key} 失败: {e}")
-
-    def snapshot(self, name: Optional[str] = None) -> str:
-        """
-        创建数据库快照
-        
-        :param name: 快照名称(可选)
-        :return: 快照文件路径
-        
-        :example:
-        >>> # 创建命名快照
-        >>> snapshot_path = env.snapshot("before_update")
-        >>> # 创建时间戳快照
-        >>> snapshot_path = env.snapshot()
-        """
-        if not name:
-            name = datetime.now().strftime("%Y%m%d_%H%M%S")
-        snapshot_path = os.path.join(self.SNAPSHOT_DIR, f"{name}.db")
-        
-        try:
-            # 快照目录
-            os.makedirs(self.SNAPSHOT_DIR, exist_ok=True)
-            
-            # 安全关闭连接
-            if hasattr(self, "_conn") and self._conn is not None:
-                try:
-                    self._conn.close()
-                except Exception as e:
-                    from . import logger
-                    logger.warning(f"关闭数据库连接时出错: {e}")
-            
-            # 创建快照
-            shutil.copy2(self.db_path, snapshot_path)
-            from . import logger
-            logger.info(f"数据库快照已创建: {snapshot_path}")
-            return snapshot_path
-        except Exception as e:
-            from . import logger
-            logger.error(f"创建快照失败: {e}")
-            raise
-
-    def restore(self, snapshot_name: str) -> bool:
-        """
-        从快照恢复数据库
-        
-        :param snapshot_name: 快照名称或路径
-        :return: 恢复是否成功
-        
-        :example:
-        >>> env.restore("before_update")
-        """
-        snapshot_path = os.path.join(self.SNAPSHOT_DIR, f"{snapshot_name}.db") \
-            if not snapshot_name.endswith('.db') else snapshot_name
-            
-        if not os.path.exists(snapshot_path):
-            from . import logger
-            logger.error(f"快照文件不存在: {snapshot_path}")
-            return False
-            
-        try:
-            # 安全关闭连接
-            if hasattr(self, "_conn") and self._conn is not None:
-                try:
-                    self._conn.close()
-                except Exception as e:
-                    from . import logger
-                    logger.warning(f"关闭数据库连接时出错: {e}")
-            
-            # 执行恢复操作
-            shutil.copy2(snapshot_path, self.db_path)
-            self._init_db()  # 恢复后重新初始化数据库连接
-            from . import logger
-            logger.info(f"数据库已从快照恢复: {snapshot_path}")
-            return True
-        except Exception as e:
-            from . import logger
-            logger.error(f"恢复快照失败: {e}")
-            return False
-
-    def list_snapshots(self) -> List[Tuple[str, datetime, int]]:
-        """
-        列出所有可用的快照
-        
-        :return: 快照信息列表(名称, 创建时间, 大小)
-        
-        :example:
-        >>> for name, date, size in env.list_snapshots():
-        >>>     print(f"{name} - {date} ({size} bytes)")
-        """
-        snapshots = []
-        for f in os.listdir(self.SNAPSHOT_DIR):
-            if f.endswith('.db'):
-                path = os.path.join(self.SNAPSHOT_DIR, f)
-                stat = os.stat(path)
-                snapshots.append((
-                    f[:-3],  # 去掉.db后缀
-                    datetime.fromtimestamp(stat.st_ctime),
-                    stat.st_size
-                ))
-        return sorted(snapshots, key=lambda x: x[1], reverse=True)
-
-    def delete_snapshot(self, snapshot_name: str) -> bool:
-        """
-        删除指定的快照
-        
-        :param snapshot_name: 快照名称
-        :return: 删除是否成功
-        
-        :example:
-        >>> env.delete_snapshot("old_backup")
-        """
-        snapshot_path = os.path.join(self.SNAPSHOT_DIR, f"{snapshot_name}.db") \
-            if not snapshot_name.endswith('.db') else snapshot_name
-            
-        if not os.path.exists(snapshot_path):
-            from . import logger
-            logger.error(f"快照文件不存在: {snapshot_path}")
-            return False
-            
-        try:
-            os.remove(snapshot_path)
-            from . import logger
-            logger.info(f"快照已删除: {snapshot_path}")
-            return True
-        except Exception as e:
-            from . import logger
-            logger.error(f"删除快照失败: {e}")
-            return False
-
-
-env = EnvManager()
+__all__ = ['env']

ErisPulse/Core/erispulse_config.py

@@ -0,0 +1,105 @@
+"""
+ErisPulse 框架配置管理
+
+专门管理 ErisPulse 框架自身的配置项。
+"""
+
+from typing import Dict, Any
+from .config import config
+
+# 默认配置
+DEFAULT_ERISPULSE_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_erispulse_config_structure(config_dict: Dict[str, Any]) -> Dict[str, Any]:
+    """
+    确保 ErisPulse 配置结构完整，补全缺失的配置项
+    
+    :param config_dict: 当前配置
+    :return: 补全后的完整配置
+    """
+    merged_config = DEFAULT_ERISPULSE_CONFIG.copy()
+    
+    # 深度合并配置
+    for section, default_values in DEFAULT_ERISPULSE_CONFIG.items():
+        if section not in config_dict:
+            config_dict[section] = default_values.copy()
+            continue
+            
+        if not isinstance(config_dict[section], dict):
+            config_dict[section] = default_values.copy()
+            continue
+            
+        for key, default_value in default_values.items():
+            if key not in config_dict[section]:
+                config_dict[section][key] = default_value
+                
+    return config_dict
+
+def get_erispulse_config() -> Dict[str, Any]:
+    """
+    获取 ErisPulse 框架配置，自动补全缺失的配置项并保存
+    
+    :return: 完整的 ErisPulse 配置字典
+    """
+    # 获取现有配置
+    current_config = config.getConfig("ErisPulse")
+    
+    # 如果完全没有配置，设置默认配置
+    if current_config is None:
+        config.setConfig("ErisPulse", DEFAULT_ERISPULSE_CONFIG)
+        return DEFAULT_ERISPULSE_CONFIG
+    
+    # 检查并补全缺失的配置项
+    complete_config = _ensure_erispulse_config_structure(current_config)
+    
+    # 如果配置有变化，更新到存储
+    if current_config != complete_config:
+        config.setConfig("ErisPulse", complete_config)
+    
+    return complete_config
+
+def update_erispulse_config(new_config: Dict[str, Any]) -> bool:
+    """
+    更新 ErisPulse 配置，自动补全缺失的配置项
+    
+    :param new_config: 新的配置字典
+    :return: 是否更新成功
+    """
+    # 获取当前配置并合并新配置
+    current = get_erispulse_config()
+    merged = {**current, **new_config}
+    
+    # 确保合并后的配置结构完整
+    complete_config = _ensure_erispulse_config_structure(merged)
+    
+    return config.setConfig("ErisPulse", complete_config)
+
+def get_server_config() -> Dict[str, Any]:
+    """
+    获取服务器配置，确保结构完整
+    
+    :return: 服务器配置字典
+    """
+    erispulse_config = get_erispulse_config()
+    return erispulse_config["server"]
+
+def get_logger_config() -> Dict[str, Any]:
+    """
+    获取日志配置，确保结构完整
+    
+    :return: 日志配置字典
+    """
+    erispulse_config = get_erispulse_config()
+    return erispulse_config["logger"]