obvyr-cli 2.5.0__tar.gz → 2.6.0__tar.gz

{obvyr_cli-2.5.0 → obvyr_cli-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: obvyr-cli
-Version: 2.5.0
+Version: 2.6.0
 Summary: Command-line wrapper to allow Obvyr to capture evidence from any machine.
 License: Proprietary
 Author: Wyrd Technology Ltd
@@ -8,11 +8,11 @@ Requires-Python: >=3.14,<4.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: click (==8.3.3)
+Requires-Dist: click (==8.4.2)
 Requires-Dist: httpx (==0.28.1)
-Requires-Dist: orjson (==3.11.8)
-Requires-Dist: pydantic (==2.13.3)
-Requires-Dist: pydantic-settings (==2.14.0)
+Requires-Dist: orjson (==3.11.9)
+Requires-Dist: pydantic (==2.13.4)
+Requires-Dist: pydantic-settings (==2.14.2)
 Requires-Dist: python-dotenv (==1.2.2)
 Requires-Dist: tenacity (==9.1.4)
 Requires-Dist: toml (==0.10.2)

{obvyr_cli-2.5.0 → obvyr_cli-2.6.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["poetry-core==2.3.2"]
+requires = ["poetry-core==2.4.1"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "obvyr-cli"
-version = "2.5.0"
+version = "2.6.0"
 description = "Command-line wrapper to allow Obvyr to capture evidence from any machine."
 authors = ["Wyrd Technology Ltd"]
 license = "Proprietary"
@@ -29,25 +29,25 @@ include = "obvyr_cli"
 [tool.poetry.dependencies]
 python = ">=3.14,<4.0"
 python-dotenv = "1.2.2"
-click = "8.3.3"
-pydantic = "2.13.3"
-pydantic-settings = "2.14.0"
+click = "8.4.2"
+pydantic = "2.13.4"
+pydantic-settings = "2.14.2"
 httpx = "0.28.1"
 tenacity = "9.1.4"
 toml = "0.10.2"
-orjson = "3.11.8"
+orjson = "3.11.9"
 zstandard = "0.25.0"
 
 [tool.poetry.group.dev.dependencies]
-ruff = "0.15.12"
+ruff = "0.15.20"
 mypy = "1.20.2"
-pytest = "9.0.3"
+pytest = "9.1.1"
 pytest-cov = "7.1.0"
-black = "26.3.1"
-pyproject-fmt = "2.21.1"
-pytest-subprocess = "1.5.4"
+black = "26.5.1"
+pyproject-fmt = "2.25.1"
+pytest-subprocess = "1.6.0"
 types-toml = "^0.10.8.20240310"
-poethepoet = "0.44.0"
+poethepoet = "0.47.1"
 
 [tool.poetry.scripts]
 obvyr = "obvyr_cli.cli:cli_run_process"

{obvyr_cli-2.5.0 → obvyr_cli-2.6.0}/src/obvyr_cli/cli.py

@@ -1,6 +1,9 @@
 import glob
+import logging
+import math
 import pathlib
 import time
+from datetime import datetime, timezone
 from typing import List
 
 import click
@@ -9,7 +12,11 @@ from obvyr_cli.api_client import ObvyrAPIClient
 from obvyr_cli.archive_builder import build_artifacts_tar_zst
 from obvyr_cli.command_wrapper import run_command
 from obvyr_cli.config import ProfileSettings, Settings, get_settings
-from obvyr_cli.error_handling import handle_archive_error
+from obvyr_cli.error_handling import (
+    handle_archive_error,
+    log_customer_friendly_error,
+)
+from obvyr_cli.jwt_utils import get_jwt_expiry
 from obvyr_cli.logging_config import configure_logging, get_logger
 from obvyr_cli.schemas import (
     CommandExecutionConfig,
@@ -19,6 +26,8 @@ from obvyr_cli.schemas import (
 
 logger = get_logger("cli")
 
+TOKEN_EXPIRY_WARNING_DAYS = 14
+
 # ===================================
 # CLI Support Functions
 # ===================================
@@ -173,6 +182,31 @@ def fetch_active_profile(
     return active_profile
 
 
+def check_token_expiry(active_profile: ProfileSettings) -> None:
+    """Warn when the active profile's API token is near or past expiry."""
+    expiry = get_jwt_expiry(active_profile.API_KEY)
+    if expiry is None:
+        return
+
+    seconds_remaining = (expiry - datetime.now(timezone.utc)).total_seconds()
+    days_remaining = math.ceil(seconds_remaining / 86400)
+
+    if days_remaining < 0:
+        log_customer_friendly_error(
+            f"Token expired {abs(days_remaining)} day(s) ago.",
+            "Your Obvyr agent token has expired — nothing is being "
+            "reported. Generate a new one in Project > Agents.",
+            level=logging.WARNING,
+        )
+    elif days_remaining <= TOKEN_EXPIRY_WARNING_DAYS:
+        log_customer_friendly_error(
+            f"Token expires in {days_remaining} day(s).",
+            f"Your Obvyr agent token expires in {days_remaining} day(s). "
+            "Regenerate it in Project > Agents.",
+            level=logging.WARNING,
+        )
+
+
 def display_execution_summary(response: RunCommandResponse) -> None:
     """Display the execution summary after streaming output."""
     output = (
@@ -357,6 +391,7 @@ def cli_run_process(
             return
 
         active_profile = fetch_active_profile(settings, profile)
+        check_token_expiry(active_profile)
 
         # Create streaming callback for real-time output display
         def stream_output(line: str) -> None:

{obvyr_cli-2.5.0 → obvyr_cli-2.6.0}/src/obvyr_cli/config.py

@@ -114,6 +114,6 @@ class Settings(BaseSettings):
 
 def get_settings() -> Settings:
     """Return the current settings."""
-    load_dotenv(".env", override=True)
+    load_dotenv(".env", override=False)
 
     return Settings()

{obvyr_cli-2.5.0 → obvyr_cli-2.6.0}/src/obvyr_cli/error_handling.py

@@ -44,7 +44,9 @@ def handle_api_error(error: httpx.HTTPStatusError) -> Optional[dict]:
         if status_code == 401:
             log_customer_friendly_error(
                 f"Authentication failed: {error.response.text}",
-                "Authentication failed. Please check your API token configuration.",
+                "Authentication failed. Your token may be invalid, "
+                "revoked, or expired — agent tokens expire after 6 "
+                "months, generate a new one in Project > Agents.",
             )
         elif status_code == 403:
             log_customer_friendly_error(

obvyr_cli-2.6.0/src/obvyr_cli/jwt_utils.py

@@ -0,0 +1,17 @@
+"""Unverified local decoding of JWT expiry claims."""
+
+import base64
+import json
+from datetime import datetime, timezone
+from typing import Optional
+
+
+def get_jwt_expiry(token: str) -> Optional[datetime]:
+    """Return the expiry datetime encoded in a JWT's unverified payload, if present."""
+    try:
+        _, payload_segment, _ = token.split(".")
+        padded = payload_segment + "=" * (-len(payload_segment) % 4)
+        payload = json.loads(base64.urlsafe_b64decode(padded))
+        return datetime.fromtimestamp(payload["exp"], tz=timezone.utc)
+    except (ValueError, KeyError, TypeError, OverflowError, UnicodeDecodeError):
+        return None