proxcli 0.6.0__tar.gz → 0.7.1__tar.gz

{proxcli-0.6.0 → proxcli-0.7.1}/CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.1] - 2026-06-20
+
+### Fixed
+- API token authentication: Removed incorrect base64 encoding.
+  Proxmox expects `PVEAPIToken=user@realm!tokenid=secret` as plain text
+  in the Authorization header, not base64-encoded.
+- Dry-run mode now always sets API token headers so that
+  `--dry-run` output accurately reflects the Authorization header
+  that would be sent. (Password auth is still skipped in dry-run
+  since it requires a network call.)
+
+## [0.7.0] - 2026-06-20
+
+### Added
+- Task log streaming: `proxmox task log <upid> [--follow]`.
+  Without `--follow`, prints available log lines. With `--follow`,
+  polls every second until the task exits (like `tail -f`).
+  Also added `ProxmoxClient._extract_node_from_upid()` as a static helper.
+
 ## [0.6.0] - 2026-06-20
 
 ### Added
@@ -74,6 +93,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - CSRF ticket auto-refresh on 401.
 - AI-agent-friendly: default JSON output, strict exit codes, `--dry-run` mode.
 
+[0.7.1]: https://github.com/xezpeleta/proxcli/releases/tag/v0.7.1
+[0.7.0]: https://github.com/xezpeleta/proxcli/releases/tag/v0.7.0
 [0.6.0]: https://github.com/xezpeleta/proxcli/releases/tag/v0.6.0
 [0.5.0]: https://github.com/xezpeleta/proxcli/releases/tag/v0.5.0
 [0.4.0]: https://github.com/xezpeleta/proxcli/releases/tag/v0.4.0

{proxcli-0.6.0 → proxcli-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxcli
-Version: 0.6.0
+Version: 0.7.1
 Summary: A CLI tool to interact with Proxmox VE nodes and clusters via the REST API
 Author-email: Xabi Ezpeleta <xezpeleta@gmail.com>
 License: MIT
@@ -21,7 +21,7 @@ Requires-Dist: pyyaml>=6
 Requires-Dist: rich>=13
 Description-Content-Type: text/markdown
 
-# proxmox
+# proxcli
 
 A CLI tool to interact with [Proxmox VE](https://www.proxmox.com/) nodes and clusters via the REST API.
 
@@ -33,7 +33,7 @@ Requires Python 3.10+ and [uv](https://docs.astral.sh/uv/).
 
 ```bash
 # From PyPI
-uv tool install proxmox
+uv tool install proxcli
 
 # From Git
 uv tool install git+https://github.com/xezpeleta/proxcli.git
@@ -276,8 +276,12 @@ proxmox cluster firewall refs [--type alias|ipset|group]
 ```bash
 proxmox task list [--node <node>]
 proxmox task show <upid>
+proxmox task log <upid> [--follow]
 ```
 
+`proxmox task log --follow` polls `/nodes/{node}/tasks/{upid}/log` every second
+and streams new lines until the task completes (like `tail -f`).
+
 ## Output Formats
 
 ### JSON (default)

{proxcli-0.6.0 → proxcli-0.7.1}/README.md

@@ -1,4 +1,4 @@
-# proxmox
+# proxcli
 
 A CLI tool to interact with [Proxmox VE](https://www.proxmox.com/) nodes and clusters via the REST API.
 
@@ -10,7 +10,7 @@ Requires Python 3.10+ and [uv](https://docs.astral.sh/uv/).
 
 ```bash
 # From PyPI
-uv tool install proxmox
+uv tool install proxcli
 
 # From Git
 uv tool install git+https://github.com/xezpeleta/proxcli.git
@@ -253,8 +253,12 @@ proxmox cluster firewall refs [--type alias|ipset|group]
 ```bash
 proxmox task list [--node <node>]
 proxmox task show <upid>
+proxmox task log <upid> [--follow]
 ```
 
+`proxmox task log --follow` polls `/nodes/{node}/tasks/{upid}/log` every second
+and streams new lines until the task completes (like `tail -f`).
+
 ## Output Formats
 
 ### JSON (default)

{proxcli-0.6.0 → proxcli-0.7.1}/TODO.md

@@ -2,15 +2,20 @@
 
 Planned improvements for future releases. Items are roughly ordered by priority.
 
+Completed items are marked with a check. Implementation notes are preserved for context.
+
 ---
 
-## v1.1 — Polish & Usability
+## ✅ Done
+
+- [x] **Firewall management** — cluster, node, VM, and container. Options, enable/disable, policy, rules (CRUD), aliases (cluster), ipsets with CIDR mgmt (cluster), refs.
+- [x] **Pool management** — `proxmox pool`: list, show, create, update, delete. Wraps `/pools`.
+- [x] **Shell completions** — `proxmox completion bash|zsh|fish`. Dynamic, introspects the parser tree.
 
-- [ ] **Shell completions**
-  - Add `proxmox completion bash|zsh|fish` subcommand that emits a completion script. Use argparse's built-in completion or a lightweight generator. Makes tab-completion work for all subcommands and flags.
+## v1.1 — Polish & Usability
 
 - [ ] **Streaming task logs (`--follow`)**
-  - `proxmox task log <upid>` that streams task output in real time (like `tail -f`). Requires httpx streaming support (already viable — httpx is the chosen HTTP client).
+  - `proxmox task log <upid> --follow` that streams task output in real time (like `tail -f`). Requires httpx streaming.
 
 - [ ] **Startup time optimization**
   - Current `proxmox --help` takes ~350ms. Lazy-load subcommand modules so only the requested resource's code is imported. Move `import rich`, `import yaml` inside formatter functions. Target: <200ms.
@@ -29,17 +34,13 @@ Planned improvements for future releases. Items are roughly ordered by priority.
   - `proxmox backup` subcommand: `list`, `create`, `show`, `delete`. Wrap `/nodes/{node}/vzdump` and `/nodes/{node}/storage/{storage}/content` for backup files.
 
 - [ ] **User & permission management**
-  - `proxmox user` subcommand: `list`, `show`, `create`, `update`, `delete`. Wraps `/access/users`, `/access/acl`, `/access/roles`.
-
-- [ ] **Pool management**
-  - `proxmox pool` subcommand: `list`, `show`, `create`, `update`, `delete`. Wraps `/pools`.
+  - `proxmox user` subcommand: `list`, `show`, `create`, `update`, `delete`.
+  - `proxmox role` subcommand: `list`, `show`, `create`, `update`, `delete`.
+  - `proxmox acl` subcommand: `list`, `show`. Wraps `/access/users`, `/access/roles`, `/access/acl`, `/access/groups`.
 
 - [ ] **Network management**
   - `proxmox network` subcommand: `list`, `show`, `update` for bridges, bonds, VLANs. Wraps `/nodes/{node}/network`.
 
-- [ ] **Firewall management**
-  - `proxmox firewall` subcommand: `list`, `show`, `enable`, `disable`, `create rule`, `delete rule`. Wraps `/nodes/{node}/firewall`, `/cluster/firewall`.
-
 - [ ] **SDN (Software-Defined Networking)**
   - `proxmox sdn` subcommand: `zones`, `vnets`, `subnets`. Wraps `/cluster/sdn/*` endpoints.
 

{proxcli-0.6.0 → proxcli-0.7.1}/proxmox/cli/main.py

@@ -149,21 +149,19 @@ def _build_client(overrides: dict[str, Any], args: argparse.Namespace) -> Proxmo
 
     auth_mgr = AuthManager()
 
-    # Don't authenticate if dry-run (no actual API calls will be made)
-    if not args.dry_run:
-        if overrides["api_token_id"] and overrides["api_token_secret"]:
-            auth_mgr.set_api_token(
-                overrides["username"] or "root@pam",
-                overrides["api_token_id"],
-                overrides["api_token_secret"],
-            )
-        elif overrides["password"]:
-            auth_mgr.authenticate_password(
-                overrides["url"],
-                overrides["username"] or "root@pam",
-                overrides["password"],
-                verify=overrides["verify_tls"],
-            )
+    if overrides["api_token_id"] and overrides["api_token_secret"]:
+        auth_mgr.set_api_token(
+            overrides["username"] or "root@pam",
+            overrides["api_token_id"],
+            overrides["api_token_secret"],
+        )
+    elif overrides["password"] and not args.dry_run:
+        auth_mgr.authenticate_password(
+            overrides["url"],
+            overrides["username"] or "root@pam",
+            overrides["password"],
+            verify=overrides["verify_tls"],
+        )
 
     client = ProxmoxClient(
         base_url=overrides["url"],

{proxcli-0.6.0 → proxcli-0.7.1}/proxmox/cli/tasks.py

@@ -22,13 +22,20 @@ def register_task_parser(subparsers: argparse._SubParsersAction) -> None:
     task_show.add_argument("upid", help="Task UPID")
     task_show.set_defaults(func=_task_show)
 
+    # --- task log ---
+    task_log = task_sub.add_parser("log", help="Show task log output")
+    task_log.add_argument("upid", help="Task UPID")
+    task_log.add_argument(
+        "--follow", "-f",
+        action="store_true",
+        help="Follow log output until task completes (like tail -f)",
+    )
+    task_log.set_defaults(func=_task_log)
+
 
 def _extract_node_from_upid(upid: str) -> str | None:
     """Parse node name from a Proxmox UPID string: UPID:{node}:..."""
-    parts = upid.split(":")
-    if len(parts) >= 2:
-        return parts[1]
-    return None
+    return ProxmoxClient._extract_node_from_upid(upid)
 
 
 def _task_list(args: argparse.Namespace, client: ProxmoxClient) -> dict | list:
@@ -63,3 +70,8 @@ def _task_show(args: argparse.Namespace, client: ProxmoxClient) -> dict:
     if not node:
         return {"error": f"Could not extract node from UPID: {args.upid}"}
     return client.get(f"/nodes/{node}/tasks/{args.upid}/status")
+
+
+def _task_log(args: argparse.Namespace, client: ProxmoxClient) -> None:
+    """Stream task log (returns None so main.py skips JSON formatting)."""
+    client.stream_task_log(args.upid, follow=args.follow)

{proxcli-0.6.0 → proxcli-0.7.1}/proxmox/client/auth.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import base64
 from enum import Enum
 from typing import Any
 
@@ -63,9 +62,7 @@ class AuthManager:
 
     def set_api_token(self, user: str, token_id: str, secret: str) -> None:
         """Use a Proxmox API token for authentication."""
-        raw = f"{user}!{token_id}={secret}"
-        encoded = base64.b64encode(raw.encode()).decode()
-        self._auth_header = f"PVEAPIToken {encoded}"
+        self._auth_header = f"PVEAPIToken={user}!{token_id}={secret}"
         self._method = AuthMethod.API_TOKEN
         self._ticket = None
         self._csrf_token = None

{proxcli-0.6.0 → proxcli-0.7.1}/proxmox/client/client.py

@@ -280,3 +280,81 @@ class ProxmoxClient:
             import sys
 
             print(f"[proxmox] {message}", file=sys.stderr)
+
+    # ------------------------------------------------------------------
+    # Task log streaming
+    # ------------------------------------------------------------------
+
+    def stream_task_log(self, upid: str, *, follow: bool = False) -> None:
+        """Stream task log lines to stdout.
+
+        Args:
+            upid: Task UPID string (e.g. UPID:pve01:00000010:...).
+            follow: If True, keep polling until task exits.
+        """
+        import sys
+
+        node = self._extract_node_from_upid(upid)
+        if not node:
+            print(f"Error: could not extract node from UPID: {upid}", file=sys.stderr)
+            return
+
+        if self._dry_run:
+            self._print_dry_run("GET", f"{self._base_url}/api2/json/nodes/{node}/tasks/{upid}/log", None)
+            if follow:
+                print("[dry-run] --follow would poll /tasks/{upid}/status until stopped")
+            return
+
+        start = 0
+        seen_lines: set[int] = set()
+
+        while True:
+            try:
+                log_data = self.request("GET", f"/nodes/{node}/tasks/{upid}/log", params={"start": start})
+            except ProxmoxAPIError:
+                if not follow:
+                    break
+                time.sleep(1)
+                continue
+
+            if isinstance(log_data, dict):
+                log_data = log_data.get("data", []) if "data" in log_data else []
+
+            if isinstance(log_data, list):
+                for entry in log_data:
+                    if not isinstance(entry, dict):
+                        continue
+                    n = entry.get("n", 0)
+                    if n in seen_lines:
+                        continue
+                    seen_lines.add(n)
+                    line = entry.get("t", "")
+                    print(line)
+
+            # Check if task is done
+            if follow:
+                try:
+                    status_data = self.request("GET", f"/nodes/{node}/tasks/{upid}/status")
+                    if isinstance(status_data, dict):
+                        status = status_data.get("status")
+                        if status == "stopped":
+                            exit_code = status_data.get("exitstatus")
+                            if exit_code is not None:
+                                print(f"\nTask completed with exit code: {exit_code}")
+                            break
+                except ProxmoxAPIError:
+                    pass
+
+            if not follow:
+                break
+
+            start = len(seen_lines)
+            time.sleep(1)
+
+    @staticmethod
+    def _extract_node_from_upid(upid: str) -> str | None:
+        """Parse node name from a Proxmox UPID string: UPID:{node}:..."""
+        parts = upid.split(":")
+        if len(parts) >= 2:
+            return parts[1]
+        return None

{proxcli-0.6.0 → proxcli-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "proxcli"
-version = "0.6.0"
+version = "0.7.1"
 description = "A CLI tool to interact with Proxmox VE nodes and clusters via the REST API"
 readme = "README.md"
 authors = [

{proxcli-0.6.0 → proxcli-0.7.1}/tests/test_auth.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-import base64
-
 import pytest
 
 from proxmox.client.auth import AuthMethod
@@ -60,9 +58,7 @@ class TestAuthManager:
         assert auth_manager.method == AuthMethod.API_TOKEN
 
         headers = auth_manager.get_headers()
-        expected_raw = "root@pam!my-token=my-secret"
-        expected_encoded = base64.b64encode(expected_raw.encode()).decode()
-        assert headers["Authorization"] == f"PVEAPIToken {expected_encoded}"
+        assert headers["Authorization"] == "PVEAPIToken=root@pam!my-token=my-secret"
         assert "Cookie" not in headers
         assert "CSRFPreventionToken" not in headers
 

{proxcli-0.6.0 → proxcli-0.7.1}/uv.lock

@@ -1,5 +1,5 @@
 version = 1
-revision = 3
+revision = 2
 requires-python = ">=3.10"
 
 [[package]]
@@ -254,7 +254,7 @@ wheels = [
 
 [[package]]
 name = "proxcli"
-version = "0.6.0"
+version = "0.7.1"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },