update: update SDK and CLI

Author: tkspuk

netpulse-client/netpulse_client/__init__.py

@@ -3,7 +3,7 @@
 
 提供同步和异步的网络设备操作接口, 支持命令执行和配置推送。
 
-核心方法 (与API端点对应) : 
+核心方法 (与API端点对应) :
 - exec_command(): 同步执行命令 -> /device/execute
 - exec_config(): 同步推送配置 -> /device/execute
 - bulk_command(): 同步批量执行命令 -> /device/bulk
@@ -53,32 +53,37 @@
     create_device_request,
 )
 
-__version__ = "0.1.0"
+from importlib import metadata
+
+try:
+    __version__ = metadata.version("netpulse-client")
+except metadata.PackageNotFoundError:
+    __version__ = "0.1.1-dev"
 
 __all__ = [
-    # 客户端类
-    "NetPulseClient",
-    "AsyncNetPulseClient",
     "AsyncJobHandle",
+    "AsyncNetPulseClient",
+    "AuthenticationError",
+    "BatchResult",
+    "CommandResult",
+    "ConfigResult",
     # 数据模型
     "ConnectionArgs",  # 主要的连接参数模型
+    "ConnectionError",
+    "ConnectionTestResult",
     "Device",  # 向后兼容的Device别名
-    "CommandResult",
-    "ConfigResult",
-    "BatchResult",
-    "JobInfo",
-    "WorkerInfo",
     "HealthCheckResult",
-    "ConnectionTestResult",
-    # 工具函数
-    "create_device_request",
-    "create_batch_device_request",
+    "JobError",
+    "JobInfo",
+    # 客户端类
+    "NetPulseClient",
     # 异常类
     "NetPulseError",
-    "AuthenticationError",
-    "ConnectionError",
-    "JobError",
+    "SDKValidationError",
     "TimeoutError",
     "ValidationError",
-    "SDKValidationError",
+    "WorkerInfo",
+    "create_batch_device_request",
+    # 工具函数
+    "create_device_request",
 ]

netpulse-client/netpulse_client/async_client.py

@@ -185,8 +185,8 @@ async def execute(
 
         Args:
             device: 目标设备
-            command: 要执行的命令 (Pull操作) 
-            config: 要推送的配置 (Push操作) 
+            command: 要执行的命令 (Pull操作)
+            config: 要推送的配置 (Push操作)
             parse_with: 解析器类型
             save: 是否保存配置
             dry_run: 是否为干运行模式
@@ -229,9 +229,15 @@ async def execute(
         }
 
         if parse_with:
+            cmd_or_cfg = command or config
+            template_name = (
+                cmd_or_cfg.replace(" ", "_")
+                if isinstance(cmd_or_cfg, str)
+                else cmd_or_cfg[0].replace(" ", "_")
+            )
             options["parsing"] = {
                 "name": parse_with,
-                "template": f"file:///templates/{(command or config).replace(' ', '_') if isinstance((command or config), str) else (command or config)[0].replace(' ', '_')}.{parse_with}",
+                "template": f"file:///templates/{template_name}.{parse_with}",
             }
 
         # 创建请求
@@ -317,8 +323,8 @@ async def bulk(
 
         Args:
             devices: 设备列表
-            command: 要执行的命令 (Pull操作) 
-            config: 要推送的配置 (Push操作) 
+            command: 要执行的命令 (Pull操作)
+            config: 要推送的配置 (Push操作)
             parse_with: 解析器类型
             save: 是否保存配置
             dry_run: 是否为干运行模式
@@ -373,9 +379,15 @@ async def bulk(
         }
 
         if parse_with:
+            cmd_or_cfg = command or config
+            template_name = (
+                cmd_or_cfg.replace(" ", "_")
+                if isinstance(cmd_or_cfg, str)
+                else cmd_or_cfg[0].replace(" ", "_")
+            )
             options["parsing"] = {
                 "name": parse_with,
-                "template": f"file:///templates/{(command or config).replace(' ', '_') if isinstance((command or config), str) else (command or config)[0].replace(' ', '_')}.{parse_with}",
+                "template": f"file:///templates/{template_name}.{parse_with}",
             }
 
         # 创建请求
@@ -722,14 +734,16 @@ async def _wait_for_result_with_progressive_retry(
         """
         异步激进递进式重试等待任务结果
 
-        轮询策略: 
+        轮询策略:
         - 初始延迟: 0.4秒
-        - 递增步长序列: 0.1s -> 0.2s -> 0.3s -> 0.5s -> 1.5s -> 2.5s -> 4.0s -> 6.0s -> 9.0s -> 13.5s -> 20.0s -> 30.0s
-        - 轮询间隔: 0.4s -> 0.5s -> 0.7s -> 1.0s -> 1.5s -> 3.0s -> 5.5s -> 9.5s -> 15.5s -> 24.5s -> 37.5s -> 57.5s
+        - 递增步长序列: 0.1s -> 0.2s -> 0.3s -> 0.5s -> 1.5s -> 2.5s -> 4.0s
+          -> 6.0s -> 9.0s -> 13.5s -> 20.0s -> 30.0s
+        - 轮询间隔: 0.4s -> 0.5s -> 0.7s -> 1.0s -> 1.5s -> 3.0s -> 5.5s
+          -> 9.5s -> 15.5s -> 24.5s -> 37.5s -> 57.5s
         - 最大间隔: 30秒
         - 最大总时长: 120秒
 
-        示例轮询序列: 
+        示例轮询序列:
         第1次: 0.4s (初始)
         第2次: 0.5s (0.4s + 0.1s)
         第3次: 0.7s (0.5s + 0.2s)
@@ -766,16 +780,19 @@ async def _wait_for_result_with_progressive_retry(
 
                     if status in ["finished", "failed"]:
                         logger.info(
-                            f"任务 {job_id} 完成, 总耗时: {total_elapsed:.2f}秒, 轮询次数: {attempt}"
+                            f"任务 {job_id} 完成, 总耗时: {total_elapsed:.2f}秒, "
+                            f"轮询次数: {attempt}"
                         )
                         return result
                     elif status == "queued":
                         logger.info(
-                            f"任务 {job_id} 排队中... (第{attempt}次轮询, 已耗时{total_elapsed:.2f}秒)"
+                            f"任务 {job_id} 排队中... "
+                            f"(第{attempt}次轮询, 已耗时{total_elapsed:.2f}秒)"
                         )
                     elif status == "started":
                         logger.info(
-                            f"任务 {job_id} 执行中... (第{attempt}次轮询, 已耗时{total_elapsed:.2f}秒)"
+                            f"任务 {job_id} 执行中... "
+                            f"(第{attempt}次轮询, 已耗时{total_elapsed:.2f}秒)"
                         )
 
                 # 激进递进式延迟
@@ -796,7 +813,8 @@ async def _wait_for_result_with_progressive_retry(
                 # 记录轮询信息
                 if attempt % 3 == 0:  # 每3次轮询记录一次详细信息
                     logger.info(
-                        f"任务 {job_id} 轮询中... 第{attempt}次, 当前延迟: {delay:.2f}s, 总耗时: {total_elapsed:.2f}s"
+                        f"任务 {job_id} 轮询中... 第{attempt}次, "
+                        f"当前延迟: {delay:.2f}s, 总耗时: {total_elapsed:.2f}s"
                     )
 
             except Exception as e:

netpulse-client/netpulse_client/client.py

@@ -96,8 +96,10 @@ def _wait_for_result_with_progressive_retry(
 
         轮询策略:
         - 初始延迟: 0.4秒
-        - 递增步长序列: 0.1s -> 0.2s -> 0.3s -> 0.5s -> 1.5s -> 2.5s -> 4.0s -> 6.0s -> 9.0s -> 13.5s -> 20.0s -> 30.0s
-        - 轮询间隔: 0.4s -> 0.5s -> 0.7s -> 1.0s -> 1.5s -> 3.0s -> 5.5s -> 9.5s -> 15.5s -> 24.5s -> 37.5s -> 57.5s
+        - 递增步长序列: 0.1s -> 0.2s -> 0.3s -> 0.5s -> 1.5s -> 2.5s -> 4.0s
+          -> 6.0s -> 9.0s -> 13.5s -> 20.0s -> 30.0s
+        - 轮询间隔: 0.4s -> 0.5s -> 0.7s -> 1.0s -> 1.5s -> 3.0s -> 5.5s
+          -> 9.5s -> 15.5s -> 24.5s -> 37.5s -> 57.5s
         - 最大间隔: 30秒
         - 最大总时长: 120秒
 

netpulse-client/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netpulse-client"
-version = "0.1.0"
+version = "0.1.1"
 description = "Professional Python SDK for NetPulse network automation platform"
 authors = [
     { name = "NetPulse Team", email = "[email protected]" },
@@ -106,6 +106,8 @@ strict_equality = true
 [tool.ruff]
 line-length = 100
 target-version = "py38"
+
+[tool.ruff.lint]
 select = ["E", "F", "W", "RUF", "I"]
 
 [tool.pytest.ini_options]

netpulse/__init__.py

@@ -3,4 +3,4 @@
 try:
     __version__ = metadata.version("netpulse")
 except metadata.PackageNotFoundError:
-    __version__ = "0.1.0-dev"
+    __version__ = "0.1.1-dev"

netpulse/cli/main.py

@@ -862,7 +862,7 @@ def main():
         signal.signal(signal.SIGINT, lambda sig, frame: sys.exit(0))
         _ = CliApp.run(RootSettings)
     except Exception as e:
-        print(f"Uncatched exception: {e}")
+        logging.error(f"Uncaught exception: {e}", exc_info=True)
         sys.exit(1)