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

ErisPulse/Core/__init__.py

@@ -1,18 +1,20 @@
 from .adapter import AdapterFather, SendDSL, adapter
+from .storage import storage
 from .env import env
 from .logger import logger
 from .mods import mods
-from .exceptions import exceptions
 from .router import router, adapter_server
 from .config import config
+from . import exceptions
+
 BaseAdapter = AdapterFather
 
 __all__ = [
     'BaseAdapter',
     'AdapterFather',
     'SendDSL',
-    'exceptions',
     'adapter',
+    'storage',
     'env',
     'logger',
     'mods',

ErisPulse/Core/adapter.py

@@ -18,7 +18,7 @@ from typing import (
     Union, Awaitable
 )
 from collections import defaultdict
-
+from .logger import logger
 
 class SendDSLBase:
     """
@@ -112,7 +112,6 @@ class BaseAdapter:
             :example:
             >>> await adapter.Send.To("123").Example("Hello")
             """
-            from .logger import logger
             logger.debug(f"适配器 {self._adapter.__class__.__name__} 发送了实例类型的消息: {text}")
             
         
@@ -376,7 +375,7 @@ class AdapterManager:
             for name in set(combinations):
                 setattr(self, name, instance)
         else:
-            self.logger.warning(f"平台名 {platform} 过长，如果您是开发者，请考虑使用更短的名称")
+            logger.warning(f"平台名 {platform} 过长，如果您是开发者，请考虑使用更短的名称")
             setattr(self, platform.lower(), instance)
             setattr(self, platform.upper(), instance)
             setattr(self, platform.capitalize(), instance)
@@ -405,12 +404,12 @@ class AdapterManager:
             if platform not in self._adapters:
                 raise ValueError(f"平台 {platform} 未注册")
         
-        self.logger.info(f"启动适配器 {platforms}")
+        logger.info(f"启动适配器 {platforms}")
 
-        # 启动OneBot服务
         from .router import adapter_server
-        from .config import get_server_config
+        from .erispulse_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)
@@ -447,16 +446,14 @@ class AdapterManager:
         :param adapter: 适配器实例
         :param platform: 平台名称
         """
-        from .. import sdk
 
-        # 加锁防止并发启动
         if not getattr(adapter, "_starting_lock", None):
             adapter._starting_lock = asyncio.Lock()
 
         async with adapter._starting_lock:
             # 再次确认是否已经被启动
             if adapter in self._started_instances:
-                sdk.logger.info(f"适配器 {platform}（实例ID: {id(adapter)}）已被其他协程启动，跳过")
+                logger.info(f"适配器 {platform}（实例ID: {id(adapter)}）已被其他协程启动，跳过")
                 return
 
             retry_count = 0
@@ -470,12 +467,12 @@ class AdapterManager:
                     return
                 except Exception as e:
                     retry_count += 1
-                    sdk.logger.error(f"平台 {platform} 启动失败（第{retry_count}次重试）: {e}")
+                    logger.error(f"平台 {platform} 启动失败（第{retry_count}次重试）: {e}")
 
                     try:
                         await adapter.shutdown()
                     except Exception as stop_err:
-                        sdk.logger.warning(f"停止适配器失败: {stop_err}")
+                        logger.warning(f"停止适配器失败: {stop_err}")
 
                     # 计算等待时间
                     if retry_count <= len(backoff_intervals):
@@ -483,7 +480,7 @@ class AdapterManager:
                     else:
                         wait_time = fixed_delay
 
-                    sdk.logger.info(f"将在 {wait_time // 60} 分钟后再次尝试重启 {platform}")
+                    logger.info(f"将在 {wait_time // 60} 分钟后再次尝试重启 {platform}")
                     await asyncio.sleep(wait_time)
 
     async def shutdown(self) -> None:
@@ -548,4 +545,10 @@ class AdapterManager:
 
 AdapterFather = BaseAdapter
 adapter = AdapterManager()
-SendDSL = SendDSLBase
+SendDSL = SendDSLBase
+
+__all__ = [
+    "AdapterFather",
+    "adapter",
+    "SendDSL"
+]

ErisPulse/Core/config.py

@@ -73,100 +73,6 @@ class ConfigManager:
 
 config = ConfigManager()
 
-# 默认配置
-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: 完整的配置字典
-    """
-
-    # 获取现有配置
-    current_config = config.getConfig("ErisPulse")
-    
-    # 如果完全没有配置，设置默认配置
-    if current_config is None:
-        config.setConfig("ErisPulse", DEFAULT_CONFIG)
-        return DEFAULT_CONFIG
-    
-    # 检查并补全缺失的配置项
-    complete_config = _ensure_config_structure(current_config)
-    
-    # 如果配置有变化，更新到存储
-    if current_config != complete_config:
-        config.setConfig("ErisPulse", complete_config)
-    
-    return complete_config
-
-def update_config(new_config: Dict[str, Any]) -> bool:
-    """
-    更新配置，自动补全缺失的配置项
-    
-    :param new_config: 新的配置字典
-    :return: 是否更新成功
-    """
-    # 获取当前配置并合并新配置
-    current = get_config()
-    merged = {**current, **new_config}
-    
-    # 确保合并后的配置结构完整
-    complete_config = _ensure_config_structure(merged)
-    
-    return config.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"]
+__all__ = [
+    "config"
+]