palonexus 0.3.0__tar.gz → 0.3.2__tar.gz

{palonexus-0.3.0 → palonexus-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: palonexus
-Version: 0.3.0
+Version: 0.3.2
 Summary: Python SDK for the PaloNexus agent control plane
 Project-URL: Homepage, https://github.com/rogerchucker/palonexus-sdk
 Project-URL: Repository, https://github.com/rogerchucker/palonexus-sdk

palonexus-0.3.2/src/palonexus/_build.py

@@ -0,0 +1,2 @@
+# generated by the PaloNexus build hook
+SOURCE_REVISION = "58e2607d1c2ed32be5a4fc7c9a334be66bd8e347"

{palonexus-0.3.0 → palonexus-0.3.2}/src/palonexus/_sdist_provenance.py

@@ -1,3 +1,3 @@
 # generated by the PaloNexus build hook
 SDIST_MARKER = "palonexus-sdk-sdist-v1"
-SOURCE_REVISION = "a31fb765278faa27455e8697489f1155fe6c8be2"
+SOURCE_REVISION = "58e2607d1c2ed32be5a4fc7c9a334be66bd8e347"

{palonexus-0.3.0 → palonexus-0.3.2}/src/palonexus/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.3.0'
-__version_tuple__ = version_tuple = (0, 3, 0)
+__version__ = version = '0.3.2'
+__version_tuple__ = version_tuple = (0, 3, 2)
 
 __commit_id__ = commit_id = None

{palonexus-0.3.0 → palonexus-0.3.2}/src/palonexus/cli/commands.py

@@ -22,6 +22,7 @@ from packaging.version import InvalidVersion, Version
 from palonexus.developer.client import (
     DeveloperClient,
     DeveloperClientError,
+    ProtocolError,
     RequestRejected,
     _origin,
     _registration_authority_profile,
@@ -139,6 +140,8 @@ def login(args: Namespace) -> int:
 
     try:
         client.login(store, on_authorization=display)
+    except KeyboardInterrupt as error:
+        raise CommandError("Login canceled.", 130) from error
     except (DeveloperClientError, CredentialStoreUnavailable) as error:
         raise CommandError(f"login failed: {error}") from error
     if getattr(args, "register", False):
@@ -809,6 +812,7 @@ def agents_register(args: Namespace) -> int:
         result, recovered = _register_with_recovery(
             client, session, agent, descriptor, cli_version
         )
+        _retire_stale_ceiling_request(agent, str(result["descriptor_digest"]))
         agent["agent_id"] = str(result["agent_id"])
         agent["agent_generation"] = str(result["generation"])
         agent["registered_descriptor_digest"] = str(result["descriptor_digest"])
@@ -883,6 +887,23 @@ def register_agent(args: Namespace) -> int:
     return agents_register(args)
 
 
+def _retire_stale_ceiling_request(
+    agent: dict[str, str], registered_descriptor_digest: str
+) -> None:
+    request_id = agent.get("ceiling_request_id")
+    encoded_body = agent.get("ceiling_request_body")
+    if request_id is None or encoded_body is None:
+        return
+    try:
+        body = decode_strict_json(encoded_body.encode("utf-8"), _CEILING_BODY_FIELDS)
+    except ProtocolError:
+        return
+    if body.get("descriptorDigest") == registered_descriptor_digest:
+        return
+    agent.pop("ceiling_request_id", None)
+    agent.pop("ceiling_request_body", None)
+
+
 def _new_ceiling_request(
     agent: dict[str, str], descriptor: dict[str, Any]
 ) -> tuple[str, dict[str, Any]]:
@@ -1497,8 +1518,12 @@ def logout(args: Namespace) -> int:
     return 0
 
 
-def version(_args: Namespace) -> int:
-    print(json.dumps(version_metadata(), sort_keys=True, separators=(",", ":")))
+def version(args: Namespace) -> int:
+    metadata = version_metadata()
+    if getattr(args, "json", False):
+        print(json.dumps(metadata, sort_keys=True, separators=(",", ":")))
+    else:
+        print(f"pnxs {metadata['version']}")
     return 0
 
 

{palonexus-0.3.0 → palonexus-0.3.2}/src/palonexus/cli/main.py

@@ -10,7 +10,15 @@ from . import commands
 
 def build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(prog="pnxs", allow_abbrev=False)
-    subcommands = parser.add_subparsers(dest="command", required=True)
+    parser.set_defaults(json=False)
+    parser.add_argument(
+        "--version",
+        dest="handler",
+        action="store_const",
+        const=commands.version,
+        help="show the installed pnxs version and exit",
+    )
+    subcommands = parser.add_subparsers(dest="command")
 
     login = subcommands.add_parser("login", allow_abbrev=False)
     login.add_argument("--tenant")
@@ -98,13 +106,16 @@ def build_parser() -> argparse.ArgumentParser:
     logout.set_defaults(handler=commands.logout)
 
     version = subcommands.add_parser("version", allow_abbrev=False)
-    version.add_argument("--json", action="store_true", required=True)
+    version.add_argument("--json", action="store_true")
     version.set_defaults(handler=commands.version)
     return parser
 
 
 def main(argv: Sequence[str] | None = None) -> int:
-    args = build_parser().parse_args(argv)
+    parser = build_parser()
+    args = parser.parse_args(argv)
+    if getattr(args, "handler", None) is None:
+        parser.error("a command is required")
     try:
         return int(args.handler(args))
     except commands.CommandError as error:

palonexus-0.3.0/src/palonexus/_build.py

@@ -1,2 +0,0 @@
-# generated by the PaloNexus build hook
-SOURCE_REVISION = "a31fb765278faa27455e8697489f1155fe6c8be2"