ErisPulse 2.1.1__py3-none-any.whl → 2.1.2__py3-none-any.whl

ErisPulse/Core/__init__.py

@@ -17,3 +17,17 @@ __all__ = [
     '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
+        }
+    }
+    env.setConfig("ErisPulse", defaultConfig)
+    _config = defaultConfig

ErisPulse/Core/adapter.py

@@ -34,20 +34,22 @@ class SendDSLBase:
     {!--< /tips >!--}
     """
     
-    def __init__(self, adapter: 'BaseAdapter', target_type: Optional[str] = None, target_id: Optional[str] = None):
+    def __init__(self, adapter: 'BaseAdapter', target_type: Optional[str] = None, target_id: Optional[str] = None, account_id: Optional[str] = None):
         """
         初始化DSL发送器
         
         :param adapter: 所属适配器实例
         :param target_type: 目标类型(可选)
         :param target_id: 目标ID(可选)
+        :param _account_id: 发送账号(可选)
         """
         self._adapter = adapter
         self._target_type = target_type
         self._target_id = target_id
         self._target_to = target_id
+        self._account = account_id
 
-    def To(self, target_type: str = None, target_id: str = None) -> 'SendDSL':
+    def To(self, target_type: str = None, target_id: Union[str, int] = None) -> 'SendDSL':
         """
         设置消息目标
         
@@ -63,7 +65,20 @@ class SendDSLBase:
             target_id = target_type
             target_type = None
 
-        return self.__class__(self._adapter, target_type, target_id)
+        return self.__class__(self._adapter, target_type, target_id, self._account_id)
+
+    def Using(self, account_id: Union[str, int]) -> 'SendDSL':
+        """
+        设置发送账号
+        
+        :param _account_id: 发送账号
+        :return: SendDSL实例
+        
+        :example:
+        >>> adapter.Send.Using("bot1").To("123").Text("Hello")
+        >>> adapter.Send.To("123").Using("bot1").Text("Hello")  # 支持乱序
+        """
+        return self.__class__(self._adapter, self._target_type, self._target_id, account_id)
 
 
 class BaseAdapter:
@@ -90,23 +105,18 @@ class BaseAdapter:
         {!--< /tips >!--}
         """
         
-        def Text(self, text: str) -> Awaitable[Any]:
+        def Example(self, text: str) -> Awaitable[Any]:
             """
-            基础文本消息发送方法
+            示例消息发送方法
             
             :param text: 文本内容
             :return: 异步任务
             :example:
-            >>> await adapter.Send.To("123").Text("Hello")
+            >>> await adapter.Send.To("123").Example("Hello")
             """
-            return asyncio.create_task(
-                self._adapter.call_api(
-                    endpoint="/send",
-                    content=text,
-                    recvId=self._target_id,
-                    recvType=self._target_type
-                )
-            )
+            from .logger import logger
+            logger.debug(f"适配器 {self._adapter.__class__.__name__} 发送了实例类型的消息: {text}")
+            
         
     def __init__(self):
         """
@@ -396,18 +406,8 @@ class AdapterManager:
         from .logger import logger
         from .server import adapter_server
 
-        server_config = env.getConfig("Server")
-
-        if server_config is None:
-            server_config = {
-                "host": "0.0.0.0",
-                "port": 8000,
-                "ssl_certfile": None,
-                "ssl_keyfile": None
-            }
-            env.setConfig("Server", server_config)
-            logger.info("已创建服务器配置")
-        
+        from . import _config
+        server_config = _config.get("server", {})
         host = server_config["host"]
         port = server_config["port"]
         ssl_cert = server_config.get("ssl_certfile", None)
@@ -494,7 +494,7 @@ class AdapterManager:
             await adapter.shutdown()
         
         from .server import adapter_server
-        adapter_server.stop()
+        await adapter_server.stop()
 
     def get(self, platform: str) -> Optional[BaseAdapter]:
         """
@@ -545,4 +545,4 @@ class AdapterManager:
 
 AdapterFather = BaseAdapter
 adapter = AdapterManager()
-SendDSL = SendDSLBase
+SendDSL = SendDSLBase

ErisPulse/Core/server.py

@@ -245,7 +245,7 @@ class AdapterServer:
 
         config = Config()
         config.bind = [f"{host}:{port}"]
-        # config.loglevel = "debug"
+        config.loglevel = "warning"
         
         if ssl_certfile and ssl_keyfile:
             config.certfile = ssl_certfile

ErisPulse/__init__.py

@@ -490,7 +490,8 @@ class ModuleInitializer:
             module_objs, enabled_modules, disabled_modules = ModuleLoader.load()
             logger.info(f"[Init] 加载了 {len(enabled_modules)} 个模块, {len(disabled_modules)} 个模块被禁用")
             
-            if os.path.join(os.path.dirname(__file__), "modules"):
+            modules_dir = os.path.join(os.path.dirname(__file__), "modules")
+            if os.path.exists(modules_dir) and os.listdir(modules_dir):
                 logger.warning("[Warning] 你的项目使用了已经弃用的模块加载方式, 请尽快使用 PyPI 模块加载方式代替")
             
             if not enabled_modules and not enabled_adapters:
@@ -514,7 +515,7 @@ class ModuleInitializer:
             return False
     
     @staticmethod
-    def _initialize_modules(modules: List[str], module_objs: Dict[str, Any]) -> None:
+    def _initialize_modules(modules: List[str], module_objs: Dict[str, Any]) -> bool:
         """
         {!--< internal-use >!--}
         初始化模块
@@ -524,13 +525,14 @@ class ModuleInitializer:
         
         :return: bool 模块初始化是否成功
         """
+        # 第一阶段：将所有模块挂载到LazyModule代理上
         for module_name in modules:
             module_obj = module_objs[module_name]
             meta_name = module_obj.moduleInfo["meta"]["name"]
             
             if hasattr(sdk, meta_name):
                 continue
-            
+                
             try:
                 entry_points = importlib.metadata.entry_points()
                 if hasattr(entry_points, 'select'):
@@ -543,29 +545,51 @@ class ModuleInitializer:
                 entry_point = module_entry_map.get(meta_name)
                 if entry_point:
                     module_class = entry_point.load()
-                    lazy_load = ModuleLoader._should_lazy_load(module_class)
                     
-                    if lazy_load:
-                        lazy_module = LazyModule(meta_name, module_class, sdk, module_obj.moduleInfo)
-                        setattr(sdk, meta_name, lazy_module)
-                    else:
-                        init_signature = inspect.signature(module_class.__init__)
-                        if 'sdk' in init_signature.parameters:
-                            instance = module_class(sdk)
-                        else:
-                            instance = module_class()
-                        
-                        setattr(instance, "moduleInfo", module_obj.moduleInfo)
-                        setattr(sdk, meta_name, instance)
+                    # 创建LazyModule代理
+                    lazy_module = LazyModule(meta_name, module_class, sdk, module_obj.moduleInfo)
+                    setattr(sdk, meta_name, lazy_module)
                     
                     logger.debug(f"预注册模块: {meta_name}")
-
-                return True
                     
             except Exception as e:
                 logger.error(f"预注册模块 {meta_name} 失败: {e}")
                 setattr(sdk, meta_name, None)
                 return False
+        
+        # 第二阶段：检查并初始化需要立即加载的模块
+        for module_name in modules:
+            module_obj = module_objs[module_name]
+            meta_name = module_obj.moduleInfo["meta"]["name"]
+            
+            if not hasattr(sdk, meta_name):
+                continue
+                
+            try:
+                entry_points = importlib.metadata.entry_points()
+                if hasattr(entry_points, 'select'):
+                    module_entries = entry_points.select(group='erispulse.module')
+                    module_entry_map = {entry.name: entry for entry in module_entries}
+                else:
+                    module_entries = entry_points.get('erispulse.module', [])
+                    module_entry_map = {entry.name: entry for entry in module_entries}
+                
+                entry_point = module_entry_map.get(meta_name)
+                if entry_point:
+                    module_class = entry_point.load()
+                    
+                    # 检查是否需要立即加载
+                    lazy_load = ModuleLoader._should_lazy_load(module_class)
+                    if not lazy_load:
+                        # 触发LazyModule的初始化
+                        getattr(sdk, meta_name)._initialize()
+                        logger.debug(f"立即初始化模块: {meta_name}")
+                        
+            except Exception as e:
+                logger.error(f"初始化模块 {meta_name} 失败: {e}")
+                return False
+                
+        return True
     
     @staticmethod
     def _register_adapters(adapters: List[str], adapter_objs: Dict[str, Any]) -> bool:

{erispulse-2.1.1.dist-info → erispulse-2.1.2.dist-info}/METADATA

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

{erispulse-2.1.1.dist-info → erispulse-2.1.2.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ErisPulse/__init__.py,sha256=JLcJpPdgwBzPVEurGM6hLGxok4wajh9PF8wp6VAeKGo,26329
+ErisPulse/__init__.py,sha256=kQr2n1oeThlJVy7NY_ZMXgDsgZuhsBC5V6ysl2I59PQ,27471
 ErisPulse/__main__.py,sha256=yxlB-rCQKy7D5XMWqP5id1sOQbzLuPx048NNpLaCDf8,19851
-ErisPulse/Core/__init__.py,sha256=CIxWFdB6-0D8YJz7IdW052A4YllDsklEONCRj7mOpkQ,362
-ErisPulse/Core/adapter.py,sha256=2tHaN2wvPeOHN4o3BroHqeA0T-u097-HFlY8qxHvyLs,17943
+ErisPulse/Core/__init__.py,sha256=Wnkb4rI5kZhg8cdJE1sBfNRch55Aqp56npQ0DGXyHMA,675
+ErisPulse/Core/adapter.py,sha256=zeil2mhlZoUg8Wg6GlEMVnQ7f5rJWZNxc0c1g3c4W0w,18146
 ErisPulse/Core/env.py,sha256=9WYNadD9h2jP_2wxOVBJEhH1uDzbctW7eB4Ba9RSjA4,20409
 ErisPulse/Core/logger.py,sha256=40vDe_D3L6ople-RZX8eGXntrZpFGHHzSl3pYxK-FLI,7196
 ErisPulse/Core/mods.py,sha256=5SPutuzbMrA-VZwiXeNxYWfrdbpLRdYfQ0RvEkFuQgg,7308
 ErisPulse/Core/raiserr.py,sha256=QLQ3r7p4iFP86XBLq9mtf1wv1xSlgny35i8t5-l4DXo,4620
-ErisPulse/Core/server.py,sha256=H8dUUj8mxBLEd3ick7btbWEE_m58Y6277Zo5FY7Ild4,9217
+ErisPulse/Core/server.py,sha256=FkDTeLuHD5IBnWVxvYU8pHb6yCt8GzyvC1bpOiJ7G7I,9217
 ErisPulse/Core/shellprint.py,sha256=-BFoyFho_D3XEhxIoKt6x5gO4C62LKwmJWKDUGiPjNY,5908
 ErisPulse/Core/util.py,sha256=kyydBAJHHG9I7rMRzKWtLAQMZoJyBqHiBAweqcraFkU,4001
-erispulse-2.1.1.dist-info/METADATA,sha256=QYngGAOCd2sYXMr-Ezfeift5FyZPqBEWKBI8Kf76S_0,6161
-erispulse-2.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-erispulse-2.1.1.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
-erispulse-2.1.1.dist-info/licenses/LICENSE,sha256=lBYj7Nk4urLvByj4HvQFxu8j9hThhFF6OGfyxAZBP9Q,1451
-erispulse-2.1.1.dist-info/RECORD,,
+erispulse-2.1.2.dist-info/METADATA,sha256=weSMmPWTDHy4mx36qhkHle7Wj9dC7dKv7qO_IX19vOI,6161
+erispulse-2.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+erispulse-2.1.2.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
+erispulse-2.1.2.dist-info/licenses/LICENSE,sha256=lBYj7Nk4urLvByj4HvQFxu8j9hThhFF6OGfyxAZBP9Q,1451
+erispulse-2.1.2.dist-info/RECORD,,