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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-cmd-billing
-Version: 0.0.2
+Version: 0.1.0
 Summary: Billing 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_billing-0.0.2 → deepctl_cmd_billing-0.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deepctl-cmd-billing"
-version = "0.0.2" # x-release-please-version
+version = "0.1.0" # x-release-please-version
 description = "Billing command for deepctl"
 readme = "README.md"
 license = "MIT"
@@ -21,7 +21,7 @@ classifiers = [
 keywords = ["deepgram", "cli", "billing", "usage"]
 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_billing-0.0.2 → deepctl_cmd_billing-0.1.0}/src/deepctl_cmd_billing/command.py

@@ -10,6 +10,8 @@ from deepctl_core import (
     BaseResult,
     Config,
     DeepgramClient,
+    get_output_format,
+    get_status_console,
 )
 from rich.console import Console
 from rich.table import Table
@@ -17,6 +19,9 @@ from rich.table import Table
 from .models import BalanceInfo, BillingResult
 
 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 BillingCommand(BaseCommand):
@@ -116,7 +121,7 @@ class BillingCommand(BaseCommand):
             return result
 
         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 _show_balances(
@@ -125,21 +130,16 @@ class BillingCommand(BaseCommand):
         project_id: str | None,
         result: BillingResult,
     ) -> None:
-        console.print("[blue]Fetching balances...[/blue]")
+        status_console.print("[blue]Fetching balances...[/blue]")
         data = client.get_balances(project_id=project_id)
 
         balances_raw = data.get("balances", [])
         if not balances_raw:
-            console.print("[yellow]No balances found[/yellow]")
+            status_console.print("[yellow]No balances found[/yellow]")
             return
 
-        table = Table(
-            title="Account Balances", show_header=True, header_style="bold blue"
-        )
-        table.add_column("Balance ID", style="dim")
-        table.add_column("Amount", justify="right", style="green")
-        table.add_column("Units")
-
+        # Always populate the returned result; only the human table render
+        # is gated on default mode (json/yaml/csv are emitted by the framework).
         for b in balances_raw:
             b_data = (
                 b
@@ -152,9 +152,19 @@ class BillingCommand(BaseCommand):
                 units=b_data.get("units", ""),
             )
             result.balances.append(info)
-            table.add_row(info.balance_id, f"{info.amount:,.2f}", info.units)
 
-        console.print(table)
+        if get_output_format() == "default":
+            table = Table(
+                title="Account Balances", show_header=True, header_style="bold blue"
+            )
+            table.add_column("Balance ID", style="dim")
+            table.add_column("Amount", justify="right", style="green")
+            table.add_column("Units")
+
+            for info in result.balances:
+                table.add_row(info.balance_id, f"{info.amount:,.2f}", info.units)
+
+            console.print(table)
 
     def _show_breakdown(
         self,
@@ -166,7 +176,7 @@ class BillingCommand(BaseCommand):
         grouping: str | None = None,
     ) -> None:
 
-        console.print("[blue]Fetching billing breakdown...[/blue]")
+        status_console.print("[blue]Fetching billing breakdown...[/blue]")
         data = client.get_billing_breakdown(
             project_id=project_id,
             start=start,
@@ -176,6 +186,11 @@ class BillingCommand(BaseCommand):
 
         result.breakdown = data
 
+        # Human display only in default mode; json/yaml/csv are emitted by the
+        # framework from result.breakdown.
+        if get_output_format() != "default":
+            return
+
         # Display breakdown summary
         resolution = data.get("resolution", {})
         if resolution:
@@ -205,6 +220,6 @@ class BillingCommand(BaseCommand):
 
             console.print(table)
         else:
-            console.print(
+            status_console.print(
                 "[dim]No breakdown data available for the specified period[/dim]"
             )

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-cmd-billing
-Version: 0.0.2
+Version: 0.1.0
 Summary: Billing 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_billing-0.0.2 → deepctl_cmd_billing-0.1.0}/src/deepctl_cmd_billing.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