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

ErisPulse/CLI/registry.py

@@ -0,0 +1,112 @@
+"""
+CLI 命令注册器
+
+负责命令的注册、查找和管理
+"""
+
+from typing import Optional, List, Dict
+from .base import Command
+
+
+class CommandRegistry:
+    """
+    命令注册器
+    
+    管理所有已注册的 CLI 命令
+    
+    {!--< tips >!--}
+    1. 使用单例模式确保全局唯一
+    2. 支持命令的动态注册和查找
+    3. 支持第三方命令的兼容
+    {!--< /tips >!--}
+    
+    :ivar _commands: 已注册的命令字典 {name: Command}
+    """
+    
+    _instance = None
+    
+    def __new__(cls):
+        """实现单例模式"""
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+            cls._instance._commands: Dict[str, Command] = {}
+            cls._instance._external_commands: Dict[str, Command] = {}
+        return cls._instance
+    
+    def register(self, command: Command):
+        """
+        注册命令
+        
+        :param command: 要注册的命令实例
+        :raises ValueError: 命令名称已存在时抛出
+        """
+        if command.name in self._commands:
+            raise ValueError(f"命令 '{command.name}' 已存在")
+        self._commands[command.name] = command
+    
+    def register_external(self, name: str, command: Command):
+        """
+        注册第三方命令
+        
+        :param name: 命令名称
+        :param command: 命令实例
+        """
+        self._external_commands[name] = command
+    
+    def get(self, name: str) -> Optional[Command]:
+        """
+        获取命令
+        
+        :param name: 命令名称
+        :return: 命令实例，未找到返回 None
+        """
+        # 优先查找内置命令
+        if name in self._commands:
+            return self._commands[name]
+        # 然后查找外部命令
+        return self._external_commands.get(name)
+    
+    def get_all(self) -> List[Command]:
+        """
+        获取所有命令（包括外部命令）
+        
+        :return: 所有命令列表
+        """
+        return list(self._commands.values()) + list(self._external_commands.values())
+    
+    def list_all(self) -> List[str]:
+        """
+        列出所有命令名称
+        
+        :return: 命令名称列表
+        """
+        return list(self._commands.keys()) + list(self._external_commands.keys())
+    
+    def list_builtin(self) -> List[str]:
+        """
+        列出内置命令名称
+        
+        :return: 内置命令名称列表
+        """
+        return list(self._commands.keys())
+    
+    def list_external(self) -> List[str]:
+        """
+        列出外部命令名称
+        
+        :return: 外部命令名称列表
+        """
+        return list(self._external_commands.keys())
+    
+    def exists(self, name: str) -> bool:
+        """
+        检查命令是否存在
+        
+        :param name: 命令名称
+        :return: 命令是否存在
+        """
+        return name in self._commands or name in self._external_commands
+    
+    def clear_external(self):
+        """清空外部命令"""
+        self._external_commands.clear()

ErisPulse/CLI/registry.pyi

@@ -0,0 +1,99 @@
+# type: ignore
+#
+# Auto-generated type stub for registry.py
+# DO NOT EDIT MANUALLY - Generated by generate-type-stubs.py
+#
+
+"""
+CLI 命令注册器
+
+负责命令的注册、查找和管理
+"""
+
+from typing import Optional, List, Dict
+from .base import Command
+
+class CommandRegistry:
+    """
+    命令注册器
+    
+    管理所有已注册的 CLI 命令
+    
+    {!--< tips >!--}
+    1. 使用单例模式确保全局唯一
+    2. 支持命令的动态注册和查找
+    3. 支持第三方命令的兼容
+    {!--< /tips >!--}
+    
+    :ivar _commands: 已注册的命令字典 {name: Command}
+    """
+    def __new__(cls: object) -> ...:
+        """
+        实现单例模式
+        """
+        ...
+    def register(self: object, command: Command) -> ...:
+        """
+        注册命令
+        
+        :param command: 要注册的命令实例
+        :raises ValueError: 命令名称已存在时抛出
+        """
+        ...
+    def register_external(self: object, name: str, command: Command) -> ...:
+        """
+        注册第三方命令
+        
+        :param name: 命令名称
+        :param command: 命令实例
+        """
+        ...
+    def get(self: object, name: str) -> Optional[Command]:
+        """
+        获取命令
+        
+        :param name: 命令名称
+        :return: 命令实例，未找到返回 None
+        """
+        ...
+    def get_all(self: object) -> List[Command]:
+        """
+        获取所有命令（包括外部命令）
+        
+        :return: 所有命令列表
+        """
+        ...
+    def list_all(self: object) -> List[str]:
+        """
+        列出所有命令名称
+        
+        :return: 命令名称列表
+        """
+        ...
+    def list_builtin(self: object) -> List[str]:
+        """
+        列出内置命令名称
+        
+        :return: 内置命令名称列表
+        """
+        ...
+    def list_external(self: object) -> List[str]:
+        """
+        列出外部命令名称
+        
+        :return: 外部命令名称列表
+        """
+        ...
+    def exists(self: object, name: str) -> bool:
+        """
+        检查命令是否存在
+        
+        :param name: 命令名称
+        :return: 命令是否存在
+        """
+        ...
+    def clear_external(self: object) -> ...:
+        """
+        清空外部命令
+        """
+        ...

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

@@ -6,12 +6,8 @@ ErisPulse SDK 工具模块
 
 from .package_manager import PackageManager
 from .reload_handler import ReloadHandler
-from .cli import CLI
-from .console import console
 
 __all__ = [
     "PackageManager",
-    "ReloadHandler",
-    "CLI",
-    "console",
-]
+    "ReloadHandler"
+]

ErisPulse/CLI/utils/__init__.pyi

@@ -0,0 +1,14 @@
+# type: ignore
+#
+# Auto-generated type stub for __init__.py
+# DO NOT EDIT MANUALLY - Generated by generate-type-stubs.py
+#
+
+"""
+ErisPulse SDK 工具模块
+
+包含各种辅助工具和实用程序。
+"""
+
+from .package_manager import PackageManager
+from .reload_handler import ReloadHandler

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