ErisPulse 2.3.4.dev0__py3-none-any.whl → 2.3.4.dev2__py3-none-any.whl

ErisPulse/{utils → CLI/utils}/package_manager.py

@@ -17,7 +17,7 @@ from rich.panel import Panel
 from rich.progress import Progress, BarColumn, TextColumn
 from rich.prompt import Confirm
 
-from .console import console
+from ..console import console
 
 class PackageManager:
     """
@@ -41,6 +41,8 @@ class PackageManager:
         """初始化包管理器"""
         self._cache = {}
         self._cache_time = {}
+        self._pypi_cache = {}  # PyPI版本缓存
+        self._pypi_cache_time = {}  # PyPI版本缓存时间
         
     async def _fetch_remote_packages(self, url: str) -> Optional[dict]:
         """
@@ -204,27 +206,42 @@ class PackageManager:
     async def _find_package_by_alias(self, alias: str) -> Optional[str]:
         """
         通过别名查找实际包名（大小写不敏感）
+        支持查找已安装包和远程包
         
-        :param alias: 包别名
+        :param alias: 包别名或PyPI包名
         :return: 实际包名，未找到返回None
         """
         normalized_alias = self._normalize_name(alias)
         remote_packages = await self.get_remote_packages()
         
+        # 首先检查是否是已安装包的PyPI包名
+        installed_package = self._find_installed_package_by_name(alias)
+        if installed_package:
+            return installed_package
+        
         # 检查模块
         for name, info in remote_packages["modules"].items():
             if self._normalize_name(name) == normalized_alias:
                 return info["package"]
+            # 同时检查PyPI包名
+            if self._normalize_name(info["package"]) == normalized_alias:
+                return info["package"]
                 
         # 检查适配器
         for name, info in remote_packages["adapters"].items():
             if self._normalize_name(name) == normalized_alias:
                 return info["package"]
+            # 同时检查PyPI包名
+            if self._normalize_name(info["package"]) == normalized_alias:
+                return info["package"]
                 
         # 检查CLI扩展
         for name, info in remote_packages.get("cli_extensions", {}).items():
             if self._normalize_name(name) == normalized_alias:
                 return info["package"]
+            # 同时检查PyPI包名
+            if self._normalize_name(info["package"]) == normalized_alias:
+                return info["package"]
                 
         return None
     
@@ -255,6 +272,80 @@ class PackageManager:
                 
         return None
 
+    async def check_package_updates(self) -> Dict[str, Tuple[str, str]]:
+        """
+        检查包更新，对比本地版本和远程版本
+        
+        :return: {包名: (当前版本, 最新版本)}，仅包含有新版本的包
+        """
+        installed = self.get_installed_packages()
+        remote_packages = await self.get_remote_packages()
+        
+        updates = {}
+        
+        # 构建远程包索引：PyPI包名 -> 版本
+        remote_index = {}
+        for pkg_type in ["modules", "adapters", "cli_extensions"]:
+            for name, info in remote_packages[pkg_type].items():
+                remote_index[info["package"]] = info["version"]
+        
+        # 检查每个已安装包
+        for pkg_type in ["modules", "adapters", "cli_extensions"]:
+            for entry_name, pkg_info in installed[pkg_type].items():
+                current_version = pkg_info["version"]
+                package_name = pkg_info["package"]
+                
+                # 检查远程是否有更新
+                if package_name in remote_index:
+                    remote_version = remote_index[package_name]
+                    
+                    # 比较版本
+                    comparison = self._compare_versions(remote_version, current_version)
+                    if comparison > 0:  # 远程版本更新
+                        updates[package_name] = (current_version, remote_version)
+                else:
+                    # 如果远程找不到，尝试通过PyPI检查（使用pip show）
+                    remote_version = await self._get_pypi_package_version(package_name)
+                    if remote_version and self._compare_versions(remote_version, current_version) > 0:
+                        updates[package_name] = (current_version, remote_version)
+        
+        return updates
+    
+    async def _get_pypi_package_version(self, package_name: str, force_refresh: bool = False) -> Optional[str]:
+        """
+        从PyPI获取包的最新版本，带缓存机制
+        
+        :param package_name: PyPI包名
+        :param force_refresh: 是否强制刷新缓存
+        :return: 最新版本号，失败返回None
+        """
+        # 检查缓存
+        cache_key = package_name.lower()
+        if not force_refresh and cache_key in self._pypi_cache:
+            if time.time() - self._pypi_cache_time[cache_key] < self.CACHE_EXPIRY:
+                return self._pypi_cache[cache_key]
+        
+        import aiohttp
+        from aiohttp import ClientError, ClientTimeout
+        
+        timeout = ClientTimeout(total=10)
+        url = f"https://pypi.org/pypi/{package_name}/json"
+        
+        try:
+            async with aiohttp.ClientSession(timeout=timeout) as session:
+                async with session.get(url) as response:
+                    if response.status == 200:
+                        data = await response.json()
+                        version = data["info"]["version"]
+                        # 更新缓存
+                        self._pypi_cache[cache_key] = version
+                        self._pypi_cache_time[cache_key] = time.time()
+                        return version
+        except (ClientError, asyncio.TimeoutError, json.JSONDecodeError, KeyError) as e:
+            console.print(f"[warning]获取PyPI版本失败 ({package_name}): {e}[/]")
+        
+        return None
+    
     def _run_pip_command_with_output(self, args: List[str], description: str) -> Tuple[bool, str, str]:
         """
         执行pip命令并捕获输出
@@ -537,35 +628,42 @@ class PackageManager:
     
     def upgrade_all(self) -> bool:
         """
-        升级所有已安装的ErisPulse包
+        升级所有有新版本的ErisPulse包
         
         :return: 升级是否成功
         
         :raises KeyboardInterrupt: 用户取消操作时抛出
         """
-        installed = self.get_installed_packages()
-        all_packages = set()
+        # 检查可更新的包
+        updates = asyncio.run(self.check_package_updates())
         
-        for pkg_type in ["modules", "adapters", "cli_extensions"]:
-            for pkg_info in installed[pkg_type].values():
-                all_packages.add(pkg_info["package"])
+        if not updates:
+            console.print("[success]所有ErisPulse包已是最新版本[/]")
+            return True
         
-        if not all_packages:
-            console.print("[info]没有找到可升级的ErisPulse包[/]")
-            return False
-            
+        # 显示可升级的包列表
         console.print(Panel(
-            f"找到 [bold]{len(all_packages)}[/] 个可升级的包:\n" + 
-            "\n".join(f"  - [package]{pkg}[/]" for pkg in sorted(all_packages)),
+            f"找到 [bold]{len(updates)}[/] 个可升级的包:\n" + 
+            "\n".join(
+                f"  - [package]{pkg}[/] [dim]{current_ver}[/] → [success]{new_ver}[/]"
+                for pkg, (current_ver, new_ver) in updates.items()
+            ),
             title="升级列表"
         ))
         
-        if not Confirm.ask("确认升级所有包吗？", default=False):
+        if not Confirm.ask("确认升级以上包吗？", default=False):
+            console.print("[info]操作已取消[/]")
             return False
-            
+        
+        # 执行升级
         results = {}
-        for pkg in sorted(all_packages):
+        for pkg in sorted(updates.keys()):
+            console.print(f"\n[info]正在升级 [package]{pkg}[/]...")
             results[pkg] = self.install_package([pkg], upgrade=True)
+        
+        # 显示结果摘要
+        success_count = sum(1 for success in results.values() if success)
+        console.print(f"\n[success]升级完成: {success_count}/{len(results)} 个包成功[/]")
             
         failed = [pkg for pkg, success in results.items() if not success]
         if failed:
@@ -593,13 +691,41 @@ class PackageManager:
             actual_package = asyncio.run(self._find_package_by_alias(package_name))
             
             if actual_package:
-                console.print(f"[info]找到别名映射: [bold]{package_name}[/] → [package]{actual_package}[/][/]") 
+                console.print(f"[info]找到包: [package]{actual_package}[/][/]") 
                 current_package_name = actual_package
             else:
                 current_package_name = package_name
 
+            # 检查当前版本和远程版本
+            installed = self.get_installed_packages()
+            current_version = None
+            for pkg_type in ["modules", "adapters", "cli_extensions"]:
+                for pkg_info in installed[pkg_type].values():
+                    if pkg_info["package"] == current_package_name:
+                        current_version = pkg_info["version"]
+                        break
+                if current_version:
+                    break
+            
+            # 获取远程版本
+            remote_version = asyncio.run(self._get_pypi_package_version(current_package_name))
+            
+            # 显示版本信息
+            if current_version:
+                if remote_version:
+                    comparison = self._compare_versions(remote_version, current_version)
+                    if comparison <= 0:
+                        console.print(f"[success]{current_package_name} 已是最新版本 ({current_version})[/]")
+                        continue
+                    else:
+                        console.print(f"[info]{current_package_name}: {current_version} → {remote_version}[/]")
+                else:
+                    console.print(f"[info]{current_package_name}: 当前版本 {current_version}[/]")
+            else:
+                console.print(f"[warning]未找到 {current_package_name} 的安装信息[/]")
+
             # 检查SDK版本兼容性
-            package_info = asyncio.run(self._get_package_info(package_name))
+            package_info = asyncio.run(self._get_package_info(current_package_name))
             if package_info and "min_sdk_version" in package_info:
                 is_compatible, message = self._check_sdk_compatibility(package_info["min_sdk_version"])
                 if not is_compatible:
@@ -842,4 +968,4 @@ except:
                     border_style="error"
                 ))
                 
-            return success
+            return success

ErisPulse/{utils → CLI/utils}/package_manager.pyi

@@ -21,7 +21,7 @@ from typing import List, Dict, Tuple, Optional, Any
 from rich.panel import Panel
 from rich.progress import Progress, BarColumn, TextColumn
 from rich.prompt import Confirm
-from .console import console
+from ..console import console
 
 class PackageManager:
     """
@@ -100,8 +100,9 @@ class PackageManager:
     async def _find_package_by_alias(self: object, alias: str) -> Optional[str]:
         """
         通过别名查找实际包名（大小写不敏感）
+        支持查找已安装包和远程包
         
-        :param alias: 包别名
+        :param alias: 包别名或PyPI包名
         :return: 实际包名，未找到返回None
         """
         ...
@@ -113,6 +114,22 @@ class PackageManager:
         :return: 实际包名，未找到返回None
         """
         ...
+    async def check_package_updates(self: object) -> Dict[(str, Tuple[(str, str)])]:
+        """
+        检查包更新，对比本地版本和远程版本
+        
+        :return: {包名: (当前版本, 最新版本)}，仅包含有新版本的包
+        """
+        ...
+    async def _get_pypi_package_version(self: object, package_name: str, force_refresh: bool = ...) -> Optional[str]:
+        """
+        从PyPI获取包的最新版本，带缓存机制
+        
+        :param package_name: PyPI包名
+        :param force_refresh: 是否强制刷新缓存
+        :return: 最新版本号，失败返回None
+        """
+        ...
     def _run_pip_command_with_output(self: object, args: List[str], description: str) -> Tuple[(bool, str, str)]:
         """
         执行pip命令并捕获输出
@@ -167,7 +184,7 @@ class PackageManager:
         ...
     def upgrade_all(self: object) -> bool:
         """
-        升级所有已安装的ErisPulse包
+        升级所有有新版本的ErisPulse包
         
         :return: 升级是否成功
         

ErisPulse/{utils → CLI/utils}/reload_handler.py

@@ -10,7 +10,7 @@ import sys
 import time
 from watchdog.events import FileSystemEventHandler
 
-from .console import console
+from ..console import console
 
 
 class ReloadHandler(FileSystemEventHandler):
@@ -96,16 +96,15 @@ class ReloadHandler(FileSystemEventHandler):
         :param event: 文件系统事件
         :param reason: 重载原因
         """
-        from ErisPulse.Core import logger
     
         try:
-            from .cli import _cleanup_adapters, _cleanup_modules
-            logger.info(f"检测到文件变更 ({reason})，正在关闭适配器和模块...")
-            _cleanup_adapters()
-            _cleanup_modules()
+            import asyncio
+            from ... import uninit
+            console.print(f"检测到文件变更 ({reason})，正在关闭适配器和模块...")
+            asyncio.run(uninit())
         except Exception as e:
-            logger.warning(f"关闭适配器和模块时出错: {e}")
+            console.print(f"关闭适配器和模块时出错: {e}")
         
-        logger.info("正在重启...")
+        console.print("正在重启...")
         self._terminate_process()
         self.start_process()

ErisPulse/{utils → CLI/utils}/reload_handler.pyi

@@ -15,7 +15,7 @@ import subprocess
 import sys
 import time
 from watchdog.events import FileSystemEventHandler
-from .console import console
+from ..console import console
 
 class ReloadHandler(FileSystemEventHandler):
     """

ErisPulse/Core/Bases/manager.py

@@ -0,0 +1,136 @@
+"""
+ErisPulse 管理器基类
+
+提供适配器和模块管理器的统一接口定义
+
+{!--< tips >!--}
+适配器管理器和模块管理器都应继承此基类以保持接口一致性
+{!--< /tips >!--}
+"""
+
+from abc import ABC, abstractmethod
+from typing import Dict, List, Any, Type, Optional
+
+
+class ManagerBase(ABC):
+    """
+    管理器基类
+    
+    定义适配器和模块管理器的统一接口
+    
+    {!--< tips >!--}
+    统一方法：
+    - register(): 注册类
+    - unregister(): 取消注册
+    - get(): 获取实例
+    - exists(): 检查是否存在
+    - enable()/disable(): 启用/禁用
+    - is_enabled(): 检查是否启用
+    - list_*(): 列出相关项
+    {!--< /tips >!--}
+    """
+    
+    # ==================== 注册与取消注册 ====================
+    
+    @abstractmethod
+    def register(self, name: str, class_type: Type, info: Optional[Dict] = None) -> bool:
+        """
+        注册类
+        
+        :param name: 名称
+        :param class_type: 类类型
+        :param info: 额外信息
+        :return: 是否注册成功
+        """
+        ...
+    
+    @abstractmethod
+    def unregister(self, name: str) -> bool:
+        """
+        取消注册
+        
+        :param name: 名称
+        :return: 是否取消成功
+        """
+        ...
+    
+    # ==================== 实例获取 ====================
+    
+    @abstractmethod
+    def get(self, name: str) -> Any:
+        """
+        获取实例
+        
+        :param name: 名称
+        :return: 实例或 None
+        """
+        ...
+    
+    # ==================== 存在性检查 ====================
+    
+    @abstractmethod
+    def exists(self, name: str) -> bool:
+        """
+        检查是否存在（在配置中注册）
+        
+        :param name: 名称
+        :return: 是否存在
+        """
+        ...
+    
+    # ==================== 启用/禁用管理 ====================
+    
+    @abstractmethod
+    def is_enabled(self, name: str) -> bool:
+        """
+        检查是否启用
+        
+        :param name: 名称
+        :return: 是否启用
+        """
+        ...
+    
+    @abstractmethod
+    def enable(self, name: str) -> bool:
+        """
+        启用
+        
+        :param name: 名称
+        :return: 是否成功
+        """
+        ...
+    
+    @abstractmethod
+    def disable(self, name: str) -> bool:
+        """
+        禁用
+        
+        :param name: 名称
+        :return: 是否成功
+        """
+        ...
+    
+    # ==================== 列表方法 ====================
+    
+    @abstractmethod
+    def list_registered(self) -> List[str]:
+        """
+        列出所有已注册的项
+        
+        :return: 名称列表
+        """
+        ...
+    
+    @abstractmethod
+    def list_items(self) -> Dict[str, bool]:
+        """
+        列出所有项及其状态
+        
+        :return: {名称: 是否启用} 字典
+        """
+        ...
+
+
+__all__ = [
+    "ManagerBase"
+]

ErisPulse/Core/Bases/manager.pyi

@@ -0,0 +1,108 @@
+# type: ignore
+#
+# Auto-generated type stub for manager.py
+# DO NOT EDIT MANUALLY - Generated by generate-type-stubs.py
+#
+
+"""
+ErisPulse 管理器基类
+
+提供适配器和模块管理器的统一接口定义
+
+{!--< tips >!--}
+适配器管理器和模块管理器都应继承此基类以保持接口一致性
+{!--< /tips >!--}
+"""
+
+from abc import ABC, abstractmethod
+from typing import Dict, List, Any, Type, Optional
+
+class ManagerBase(ABC):
+    """
+    管理器基类
+    
+    定义适配器和模块管理器的统一接口
+    
+    {!--< tips >!--}
+    统一方法：
+    - register(): 注册类
+    - unregister(): 取消注册
+    - get(): 获取实例
+    - exists(): 检查是否存在
+    - enable()/disable(): 启用/禁用
+    - is_enabled(): 检查是否启用
+    - list_*(): 列出相关项
+    {!--< /tips >!--}
+    """
+    def register(self: object, name: str, class_type: Type, info: Optional[Dict] = ...) -> bool:
+        """
+        注册类
+        
+        :param name: 名称
+        :param class_type: 类类型
+        :param info: 额外信息
+        :return: 是否注册成功
+        """
+        ...
+    def unregister(self: object, name: str) -> bool:
+        """
+        取消注册
+        
+        :param name: 名称
+        :return: 是否取消成功
+        """
+        ...
+    def get(self: object, name: str) -> Any:
+        """
+        获取实例
+        
+        :param name: 名称
+        :return: 实例或 None
+        """
+        ...
+    def exists(self: object, name: str) -> bool:
+        """
+        检查是否存在（在配置中注册）
+        
+        :param name: 名称
+        :return: 是否存在
+        """
+        ...
+    def is_enabled(self: object, name: str) -> bool:
+        """
+        检查是否启用
+        
+        :param name: 名称
+        :return: 是否启用
+        """
+        ...
+    def enable(self: object, name: str) -> bool:
+        """
+        启用
+        
+        :param name: 名称
+        :return: 是否成功
+        """
+        ...
+    def disable(self: object, name: str) -> bool:
+        """
+        禁用
+        
+        :param name: 名称
+        :return: 是否成功
+        """
+        ...
+    def list_registered(self: object) -> List[str]:
+        """
+        列出所有已注册的项
+        
+        :return: 名称列表
+        """
+        ...
+    def list_items(self: object) -> Dict[(str, bool)]:
+        """
+        列出所有项及其状态
+        
+        :return: {名称: 是否启用} 字典
+        """
+        ...

ErisPulse/Core/Bases/module.py

@@ -4,6 +4,10 @@ ErisPulse 模块基础模块
 提供模块基类定义和标准接口
 """
 
+from typing import Union, Dict, Any
+from ...loaders.strategy import ModuleLoadStrategy
+
+
 class BaseModule:
     """
     模块基类
@@ -11,15 +15,63 @@ class BaseModule:
     提供模块加载和卸载的标准接口
     """
     
+    @staticmethod
+    def get_load_strategy() -> Union[ModuleLoadStrategy, Dict[str, Any]]:
+        """
+        获取模块加载策略
+        
+        支持返回 ModuleLoadStrategy 对象或字典
+        所有属性统一处理，没有任何预定义字段
+        
+        :return: 加载策略对象或字典
+        
+        {!--< tips >!--}
+        常用配置项：
+        - lazy_load: bool, 是否懒加载（默认 True）
+        - priority: int, 加载优先级（默认 0，数值越大优先级越高）
+        
+        使用方式：
+        >>> class MyModule(BaseModule):
+        ...     @staticmethod
+        ...     def get_load_strategy() -> ModuleLoadStrategy:
+        ...         return ModuleLoadStrategy(
+        ...             lazy_load=False,
+        ...             priority=100
+        ...         )
+        
+        或使用字典：
+        >>> class MyModule(BaseModule):
+        ...     @staticmethod
+        ...     def get_load_strategy() -> dict:
+        ...         return {
+        ...             "lazy_load": False,
+        ...             "priority": 100
+        ...         }
+        {!--< /tips >!--}
+        """
+        return ModuleLoadStrategy(
+            lazy_load=True,   # 默认懒加载
+            priority=0        # 默认优先级
+        )
+    
     @staticmethod
     def should_eager_load() -> bool:
         """
         模块是否应该在启动时加载
         默认为False(即懒加载)
+        
+        兼容方法，实际调用 get_load_strategy()
 
         :return: 是否应该在启动时加载
+        
+        {!--< tips >!--}
+        旧版方法，建议使用 get_load_strategy() 替代
+        {!--< /tips >!--}
         """
-        return False
+        strategy = BaseModule.get_load_strategy()
+        if isinstance(strategy, dict):
+            return not strategy.get('lazy_load', True)
+        return not (strategy.lazy_load if 'lazy_load' in strategy else True)
     
     async def on_load(self, event: dict) -> bool:
         """