deepctl-cmd-requests 0.0.2__tar.gz → 0.1.0__tar.gz

{deepctl_cmd_requests-0.0.2 → deepctl_cmd_requests-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-cmd-requests
-Version: 0.0.2
+Version: 0.1.0
 Summary: Requests history command for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: deepctl-core>=0.1.10
+Requires-Dist: deepctl-core>=0.2.16
 Requires-Dist: click>=8.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: pydantic>=2.0.0

{deepctl_cmd_requests-0.0.2 → deepctl_cmd_requests-0.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deepctl-cmd-requests"
-version = "0.0.2" # x-release-please-version
+version = "0.1.0" # x-release-please-version
 description = "Requests history command for deepctl"
 readme = "README.md"
 license = "MIT"
@@ -21,7 +21,7 @@ classifiers = [
 keywords = ["deepgram", "cli", "requests", "history"]
 requires-python = ">=3.10"
 dependencies = [
-    "deepctl-core>=0.1.10",
+    "deepctl-core>=0.2.16",
     "click>=8.0.0",
     "rich>=13.0.0",
     "pydantic>=2.0.0",

{deepctl_cmd_requests-0.0.2 → deepctl_cmd_requests-0.1.0}/src/deepctl_cmd_requests/command.py

@@ -11,13 +11,18 @@ from deepctl_core import (
     BaseResult,
     Config,
     DeepgramClient,
+    get_output_format,
+    get_status_console,
 )
 from rich.console import Console
 from rich.table import Table
 
-from .models import RequestInfo, RequestsResult
+from .models import RequestDetailResult, RequestInfo, RequestsResult
 
 console = Console()
+# Status/progress chrome must never touch stdout, or it corrupts JSON/CSV
+# output that callers pipe into jq and friends.
+status_console = get_status_console()
 
 
 class RequestsCommand(BaseCommand):
@@ -144,7 +149,7 @@ class RequestsCommand(BaseCommand):
                     last_day=kwargs.get("last_day", False),
                 )
         except Exception as e:
-            console.print(f"[red]Error:[/red] {e}")
+            status_console.print(f"[red]Error:[/red] {e}")
             return BaseResult(status="error", message=str(e))
 
     def _list_requests(
@@ -176,7 +181,7 @@ class RequestsCommand(BaseCommand):
             start_dt = datetime.fromisoformat(start_date)
             end_dt = datetime.fromisoformat(end_date) if end_date else datetime.now()
 
-        console.print("[blue]Fetching request history...[/blue]")
+        status_console.print("[blue]Fetching request history...[/blue]")
 
         result = client.list_requests(
             project_id=project_id,
@@ -191,18 +196,10 @@ class RequestsCommand(BaseCommand):
 
         requests_raw = result.get("requests", [])
         if not requests_raw:
-            console.print("[yellow]No requests found[/yellow]")
+            status_console.print("[yellow]No requests found[/yellow]")
             return RequestsResult(status="info", message="No requests found")
 
         req_models: list[RequestInfo] = []
-        table = Table(title="API Requests", show_header=True, header_style="bold blue")
-        table.add_column("Time", style="dim")
-        table.add_column("Endpoint", style="cyan")
-        table.add_column("Method")
-        table.add_column("Status")
-        table.add_column("Duration")
-        table.add_column("Request ID", style="dim")
-
         for r in requests_raw:
             req_data = (
                 r
@@ -222,20 +219,35 @@ class RequestsCommand(BaseCommand):
             )
             req_models.append(info)
 
-            status_style = "green" if info.status == "succeeded" else "red"
-            table.add_row(
-                info.created[:19] if info.created else "-",
-                info.path or "-",
-                info.method or "-",
-                f"[{status_style}]{info.status}[/{status_style}]",
-                f"{info.duration:.2f}s" if info.duration else "-",
-                info.request_id[:12] + "..."
-                if len(info.request_id) > 12
-                else info.request_id,
+        # Render the human table only in default mode. For json/yaml/csv the
+        # framework serialises the returned result to stdout, so printing the
+        # table here would prepend non-parseable text to that output.
+        if get_output_format() == "default":
+            table = Table(
+                title="API Requests", show_header=True, header_style="bold blue"
             )
+            table.add_column("Time", style="dim")
+            table.add_column("Endpoint", style="cyan")
+            table.add_column("Method")
+            table.add_column("Status")
+            table.add_column("Duration")
+            table.add_column("Request ID", style="dim")
+
+            for info in req_models:
+                status_style = "green" if info.status == "succeeded" else "red"
+                table.add_row(
+                    info.created[:19] if info.created else "-",
+                    info.path or "-",
+                    info.method or "-",
+                    f"[{status_style}]{info.status}[/{status_style}]",
+                    f"{info.duration:.2f}s" if info.duration else "-",
+                    info.request_id[:12] + "..."
+                    if len(info.request_id) > 12
+                    else info.request_id,
+                )
 
-        console.print(table)
-        console.print(f"\n[dim]{len(req_models)} request(s) shown[/dim]")
+            console.print(table)
+            console.print(f"\n[dim]{len(req_models)} request(s) shown[/dim]")
 
         return RequestsResult(
             status="success", requests=req_models, count=len(req_models)
@@ -247,16 +259,20 @@ class RequestsCommand(BaseCommand):
         request_id: str,
         project_id: str | None,
     ) -> BaseResult:
-        console.print(f"[blue]Fetching request details:[/blue] {request_id}")
+        status_console.print(f"[blue]Fetching request details:[/blue] {request_id}")
         result = client.get_request(request_id, project_id=project_id)
 
-        console.print("[green]Request Details:[/green]")
-        for key, value in result.items():
-            if isinstance(value, dict):
-                console.print(f"  {key}:")
-                for k, v in value.items():
-                    console.print(f"    {k}: {v}")
-            else:
-                console.print(f"  {key}: {value}")
+        if get_output_format() == "default":
+            console.print("[green]Request Details:[/green]")
+            for key, value in result.items():
+                if isinstance(value, dict):
+                    console.print(f"  {key}:")
+                    for k, v in value.items():
+                        console.print(f"    {k}: {v}")
+                else:
+                    console.print(f"  {key}: {value}")
 
-        return BaseResult(status="success", message="Request details displayed")
+        return RequestDetailResult(
+            status="success",
+            detail=dict(result) if isinstance(result, dict) else {"value": result},
+        )

{deepctl_cmd_requests-0.0.2 → deepctl_cmd_requests-0.1.0}/src/deepctl_cmd_requests/models.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 from deepctl_core import BaseResult
 from pydantic import BaseModel, Field
 
@@ -18,3 +20,11 @@ class RequestInfo(BaseModel):
 class RequestsResult(BaseResult):
     requests: list[RequestInfo] = Field(default_factory=list)
     count: int = 0
+
+
+class RequestDetailResult(BaseResult):
+    # Returned by `--show`; carries the full request detail so json/yaml
+    # output is useful instead of a bare success message. Kept separate from
+    # RequestsResult so single-request output doesn't emit an empty
+    # `requests: []` / `count: 0` alongside the detail.
+    detail: dict[str, Any] = Field(default_factory=dict)

{deepctl_cmd_requests-0.0.2 → deepctl_cmd_requests-0.1.0}/src/deepctl_cmd_requests.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-cmd-requests
-Version: 0.0.2
+Version: 0.1.0
 Summary: Requests history command for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: deepctl-core>=0.1.10
+Requires-Dist: deepctl-core>=0.2.16
 Requires-Dist: click>=8.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: pydantic>=2.0.0

{deepctl_cmd_requests-0.0.2 → deepctl_cmd_requests-0.1.0}/src/deepctl_cmd_requests.egg-info/requires.txt

@@ -1,4 +1,4 @@
-deepctl-core>=0.1.10
+deepctl-core>=0.2.16
 click>=8.0.0
 rich>=13.0.0
 pydantic>=2.0.0