upscaler-cli 0.2.3.dev6697__tar.gz → 0.2.3.dev6699__tar.gz

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: upscaler-cli
-Version: 0.2.3.dev6697
+Version: 0.2.3.dev6699
 Summary: Upscaler CLI - search, retrieve, and manage documents, records, and workflows
 Requires-Python: >=3.10
 Requires-Dist: click>=8.0

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "upscaler-cli"
-version = "0.2.3.dev6697"
+version = "0.2.3.dev6699"
 description = "Upscaler CLI - search, retrieve, and manage documents, records, and workflows"
 requires-python = ">=3.10"
 dependencies = [

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/src/auth/oauth.py

@@ -477,7 +477,11 @@ class OAuthFlow:
             expires_at=time.time() + data.get("expires_in", 86400),
             client_id=token_data.client_id,
             client_secret=token_data.client_secret,
-            organization_id=token_data.organization_id,
+            # Read org from the refresh response (matching the login path) so a
+            # refreshed session reflects the token's real scope. Fall back to the
+            # existing value when the endpoint omits it, to avoid nulling a
+            # previously-valid org.
+            organization_id=data.get("organization_id") or token_data.organization_id,
             token_endpoint=token_data.token_endpoint,
         )
 

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/src/cli/auth.py

@@ -388,6 +388,7 @@ def status(ctx):
         return
 
     mode = "device" if token_data.client_id == "device" else "oauth"
+    refresh_present = bool(token_data.refresh_token)
 
     if ctx.json_mode:
         expires_in = int(token_data.expires_at - time.time())
@@ -397,11 +398,21 @@ def status(ctx):
             "expires_in": max(0, expires_in),
             "organization_id": token_data.organization_id,
             "mode": mode,
+            "refresh_token_present": refresh_present,
         }))
     else:
+        expires_in = int(token_data.expires_at - time.time())
         click.echo(f"Status: Authenticated ({mode})")
         if token_data.organization_id:
             click.echo(f"Organization: {token_data.organization_id}")
+        if expires_in <= 0:
+            click.echo("Token: expired (run: upscaler refresh)")
+        else:
+            click.echo(f"Expires in: {_format_duration(expires_in)}")
+        if refresh_present:
+            click.echo("Refresh token: present")
+        else:
+            click.echo("Refresh token: missing (re-login required on expiry)")
 
 
 @click.command()

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/src/cli/get.py

@@ -6,7 +6,7 @@ import sys
 import click
 
 from src.cli.context import pass_context
-from src.cli.helpers import handle_error
+from src.cli.helpers import handle_error, raise_on_envelope_error
 
 # Prefix → (type, endpoint)
 # NOTE: longer prefixes must come before shorter ones (e.g. "to_" before "t_")
@@ -133,6 +133,8 @@ def _get_asset(ctx, client, asset_id, fmt, format_json, draft=False):
         handle_error(ctx, e)
         return
 
+    raise_on_envelope_error(ctx, result)
+
     data = result.get("data", {})
 
     if ctx.json_mode:
@@ -161,6 +163,8 @@ def _get_simple(ctx, client, endpoint, format_json):
         handle_error(ctx, e)
         return
 
+    raise_on_envelope_error(ctx, result)
+
     data = result.get("data", {})
 
     if ctx.json_mode:

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/src/cli/helpers.py

@@ -142,6 +142,21 @@ def handle_error(ctx, e) -> None:
     sys.exit(exit_code)
 
 
+def raise_on_envelope_error(ctx, result) -> None:
+    """Exit with the server's error when a read returns a failure envelope.
+
+    The REST API returns HTTP 200 with {"success": false, "error": {...},
+    "data": []} for failures the native tools catch internally (e.g. missing
+    organization context). `client.request` only raises on HTTP >= 400, so these
+    slip through to read commands that look only at `data` and render the empty
+    result as "No results". Mirror the write-path guard (emit_action_result) so
+    reads fail loudly and exit non-zero too. Only an explicit `success: false`
+    triggers this; success responses (success true or absent) pass through.
+    """
+    if isinstance(result, dict) and result.get("success") is False:
+        handle_error(ctx, CLIError(_envelope_error_message(result.get("error"))))
+
+
 def _resolve_id(data: dict, id_keys) -> str:
     """Return the first non-empty id value among id_keys, or ''."""
     for key in id_keys:
@@ -307,6 +322,8 @@ def execute_rest_action(ctx, payload: dict, endpoint: str, render=None, dry_run:
         handle_error(ctx, e)
         return
 
+    raise_on_envelope_error(ctx, result)
+
     if ctx.json_mode:
         click.echo(format_json(result, compact=True))
         return

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/src/cli/hierarchy.py

@@ -5,7 +5,7 @@ import asyncio
 import click
 
 from src.cli.context import pass_context
-from src.cli.helpers import handle_error
+from src.cli.helpers import handle_error, raise_on_envelope_error
 
 
 @click.command()
@@ -37,6 +37,8 @@ def hierarchy(ctx, asset_id, depth, include_siblings):
         handle_error(ctx, e)
         return
 
+    raise_on_envelope_error(ctx, result)
+
     if ctx.json_mode:
         click.echo(format_json(result, compact=True))
     else:

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/src/cli/list_cmd.py

@@ -7,7 +7,7 @@ import re
 import click
 
 from src.cli.context import pass_context
-from src.cli.helpers import handle_error
+from src.cli.helpers import handle_error, raise_on_envelope_error
 
 # Top-level filter keys that are not asset value fields. Anything else passed
 # via --filter without a `values.` prefix gets auto-prefixed for ergonomics.
@@ -265,6 +265,7 @@ def _fetch_schema_fields(ctx, definition_id):
     except Exception as e:
         handle_error(ctx, e)
         raise click.Abort()
+    raise_on_envelope_error(ctx, result)
     schema = result.get("data", {}).get("schema") or {}
     return schema.get("fields") or []
 
@@ -365,6 +366,8 @@ def _do_list(
         handle_error(ctx, e)
         return
 
+    raise_on_envelope_error(ctx, result)
+
     if schema_fields:
         _rewrite_values_to_labels(result, schema_fields)
 

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/src/cli/search.py

@@ -5,7 +5,7 @@ import asyncio
 import click
 
 from src.cli.context import pass_context
-from src.cli.helpers import handle_error
+from src.cli.helpers import handle_error, raise_on_envelope_error
 
 
 @click.command()
@@ -116,6 +116,8 @@ def search(
         handle_error(ctx, e)
         return
 
+    raise_on_envelope_error(ctx, result)
+
     if ctx.json_mode:
         click.echo(format_json(result, compact=True))
     else:

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/src/cli/todo.py

@@ -5,7 +5,7 @@ import asyncio
 import click
 
 from src.cli.context import pass_context
-from src.cli.helpers import handle_error
+from src.cli.helpers import handle_error, raise_on_envelope_error
 
 
 @click.group("todo")
@@ -115,6 +115,8 @@ def _execute_todo(ctx, operation, todo_id=None, data=None, dry_run=False):
         handle_error(ctx, e)
         return
 
+    raise_on_envelope_error(ctx, result)
+
     if ctx.json_mode:
         click.echo(format_json(result, compact=True))
     else:

{upscaler_cli-0.2.3.dev6697 → upscaler_cli-0.2.3.dev6699}/upscaler_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: upscaler-cli
-Version: 0.2.3.dev6697
+Version: 0.2.3.dev6699
 Summary: Upscaler CLI - search, retrieve, and manage documents, records, and workflows
 Requires-Python: >=3.10
 Requires-Dist: click>=8.0