deepctl-core 0.2.16__tar.gz → 0.2.18__tar.gz

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-core
-Version: 0.2.16
+Version: 0.2.18
 Summary: Core components for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deepctl-core"
-version = "0.2.16" # x-release-please-version
+version = "0.2.18" # x-release-please-version
 description = "Core components for deepctl"
 readme = "README.md"
 license = "MIT"

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/src/deepctl_core/__init__.py

@@ -24,6 +24,7 @@ from .output import (
     print_success,
     print_warning,
     setup_output,
+    update_output,
 )
 from .plugin_manager import PluginManager
 from .timing import (
@@ -63,4 +64,5 @@ __all__ = [
     "print_timing_summary",
     "print_warning",
     "setup_output",
+    "update_output",
 ]

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/src/deepctl_core/auth.py

@@ -9,14 +9,17 @@ from urllib.parse import urlencode
 import httpx
 import keyring
 from pydantic import BaseModel
-from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
 from .client import _split_base_url
 from .config import Config
 from .models import ProfileInfo, ProfilesResult
+from .output import stderr_console
 
-console = Console()
+# Diagnostics only: everything printed here is status or error chrome, so
+# it goes to stderr and can never corrupt the machine-readable payload a
+# command writes to stdout. See get_status_console() in output.py.
+console = stderr_console
 
 # Auth provider base URL (dx-id OIDC provider)
 AUTH_BASE_URL = os.getenv("DEEPGRAM_CLI_BASE_URL", "https://id.dx.deepgram.com")

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/src/deepctl_core/base_command.py

@@ -4,15 +4,20 @@ from abc import ABC, abstractmethod
 from typing import Any, ClassVar
 
 import click
-from rich.console import Console
 
 from .auth import AuthManager
 from .client import DeepgramClient
 from .config import Config
-from .output import _agentic, print_error, print_info, print_warning, stderr_console
+from .models import ErrorResult
+from .output import _agentic, print_error, stderr_console
+from .output import console as stdout_console
 from .timing import TimingContext
 
-console = Console()
+# The PAYLOAD console -- stdout, deliberately. Tables, JSON and raw text
+# written by _output_* are the machine-readable result and belong there.
+# Shared instance rather than a bare Console() so it honours the agentic
+# no-color/highlight settings; diagnostics use stderr_console instead.
+console = stdout_console
 
 
 class BaseCommand(ABC):
@@ -99,16 +104,52 @@ class BaseCommand(ABC):
                                 "explicit flags",
                                 "environment variables",
                             ]:
-                                print_info(f"Using credentials from {source}")
+                                # Diagnostics, not the result. print_info /
+                                # print_warning still write to stdout outside
+                                # agentic mode, so with an explicit `-o json`
+                                # these three lines landed in front of the
+                                # payload and broke `| jq` (#104, success
+                                # path). Route them straight to stderr; the
+                                # prefixes mirror output.py so the rendering
+                                # is unchanged in both modes.
+                                info = "INFO:" if _agentic else "[blue]ℹ[/blue]"
+                                stderr_console.print(
+                                    f"{info} Using credentials from {source}"
+                                )
                                 if project_id:
-                                    print_info(f"Affecting project: {project_id}")
+                                    stderr_console.print(
+                                        f"{info} Affecting project: {project_id}"
+                                    )
                                 else:
-                                    print_warning("No project ID specified")
-
-                    except Exception:
-                        # guard() already printed helpful error messages;
-                        # exit without duplicating them.
-                        raise SystemExit(1)
+                                    warn = "WARN:" if _agentic else "[yellow]⚠[/yellow]"
+                                    stderr_console.print(
+                                        f"{warn} No project ID specified"
+                                    )
+
+                    except Exception as auth_error:
+                        # guard() already wrote the human-readable diagnosis to
+                        # stderr, so don't duplicate it -- but stdout must still
+                        # carry a parseable payload in a machine-readable
+                        # format. A CI step doing `dg -o json ... > out.json`
+                        # and parsing the result should get a structured error,
+                        # not an empty file. output_result is a no-op in
+                        # default mode, so this adds nothing for humans.
+                        self._tag_telemetry_status("error")
+                        try:
+                            self.output_result(
+                                ErrorResult(error=str(auth_error)), config
+                            )
+                        except OSError:
+                            # Downstream stream closed. BrokenPipeError is an
+                            # OSError, so one clause covers both.
+                            pass
+                        except ValueError as exc:
+                            # Rich raises ValueError("I/O operation on closed
+                            # file") when the stream went away mid-write; any
+                            # other ValueError is a real bug.
+                            if "closed file" not in str(exc):
+                                raise
+                        raise SystemExit(1) from auth_error
 
             # Check project ID if required
             if self.requires_project:
@@ -139,10 +180,11 @@ class BaseCommand(ABC):
                     with TimingContext("output_processing"):
                         try:
                             self.output_result(result, config)
-                        except (BrokenPipeError, OSError):
+                        except OSError:
                             # Downstream stream closed (e.g. an MCP host disconnected
                             # stdio after `dg mcp` finished). Nothing useful to log
                             # here because the logger writes to the same closed stream.
+                            # BrokenPipeError is an OSError, so one clause covers both.
                             pass
                         except ValueError as exc:
                             if "closed file" not in str(exc):

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/src/deepctl_core/base_group_command.py

@@ -3,14 +3,17 @@
 from typing import Any
 
 import click
-from rich.console import Console
 
 from .auth import AuthManager
 from .base_command import BaseCommand
 from .client import DeepgramClient
 from .config import Config
+from .output import stderr_console
 
-console = Console()
+# Diagnostics only: everything printed here is status or error chrome, so
+# it goes to stderr and can never corrupt the machine-readable payload a
+# command writes to stdout. See get_status_console() in output.py.
+console = stderr_console
 
 
 class BaseGroupCommand(BaseCommand):

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/src/deepctl_core/client.py

@@ -9,7 +9,8 @@ from typing import TYPE_CHECKING, Any, cast
 from deepgram import DeepgramClient as DGClient
 from deepgram import DeepgramClientEnvironment
 from deepgram.core.api_error import ApiError
-from rich.console import Console
+
+from .output import stderr_console
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
@@ -18,7 +19,10 @@ if TYPE_CHECKING:
     from .auth import AuthManager
     from .config import Config
 
-console = Console()
+# Diagnostics only: everything printed here is status or error chrome, so
+# it goes to stderr and can never corrupt the machine-readable payload a
+# command writes to stdout. See get_status_console() in output.py.
+console = stderr_console
 
 
 def _split_base_url(base_url: str) -> tuple[str, str, str]:

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/src/deepctl_core/output.py

@@ -103,6 +103,30 @@ def setup_output(
     console.quiet = quiet
 
 
+def update_output(
+    format_type: str | None = None,
+    quiet: bool | None = None,
+    verbose: bool | None = None,
+) -> None:
+    """Update parts of the global output configuration in place.
+
+    Unlike setup_output(), only the arguments actually provided change;
+    every other setting keeps its current value. The per-command
+    pass-through options use this so that ``dg models -o json`` has the
+    same effect as ``dg -o json models`` without resetting the quiet or
+    verbose state the root group already applied.
+    """
+    if format_type is not None:
+        if format_type == "default" and _output_config["agentic"]:
+            format_type = "json"
+        _output_config["format"] = format_type
+    if quiet is not None:
+        _output_config["quiet"] = quiet
+        console.quiet = quiet
+    if verbose is not None:
+        _output_config["verbose"] = verbose
+
+
 class OutputFormatter:
     """Formatter for different output types."""
 

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/src/deepctl_core/plugin_manager.py

@@ -7,12 +7,11 @@ from pathlib import Path
 from typing import Any, cast
 
 import click
-from rich.console import Console
 
 from .base_command import BaseCommand
 from .base_group_command import BaseGroupCommand
 from .models import ErrorResult, PluginInfo
-from .output import print_warning
+from .output import print_warning, stderr_console
 from .plugin_env import (
     PLUGIN_VENV,
     get_plugin_state,
@@ -21,7 +20,9 @@ from .plugin_env import (
 )
 from .timing import TimingContext
 
-console = Console()
+# Load errors are diagnostics: they go to stderr so a broken plugin can't
+# corrupt `dg ... -o json` payloads on stdout.
+console = stderr_console
 
 
 class PluginManager:
@@ -293,6 +294,80 @@ class PluginManager:
             help="Skip interactive prompts; use defaults for any optional features.",
         )(cmd)
 
+        # Accept the global output options after the subcommand as well.
+        cmd = self._add_global_passthrough_options(cmd)
+
+        return cmd
+
+    def _add_global_passthrough_options(self, cmd: click.Command) -> click.Command:
+        """Let the global output options work after the subcommand too.
+
+        The root group defines -o/--output, -q/--quiet and -v/--verbose, but
+        Click only parses group options that appear *before* the subcommand
+        name — so ``dg models -o json`` used to fail with "No such option
+        '-o'" while ``dg -o json models`` worked, and the error gave no hint.
+        These pass-through copies apply the same effect from the subcommand
+        position. A copy is only added when the command does not already
+        define the option name itself (for example, ``dg speak --output``
+        names an audio file and keeps its own meaning).
+        """
+        from .output import update_output
+
+        taken: set[str] = set()
+        for param in cmd.params:
+            taken.update(param.opts)
+            taken.update(param.secondary_opts)
+
+        def _apply_format(
+            _ctx: click.Context, _param: click.Parameter, value: str | None
+        ) -> None:
+            if value is not None:
+                update_output(format_type=value)
+
+        def _apply_quiet(
+            _ctx: click.Context, _param: click.Parameter, value: bool
+        ) -> None:
+            if value:
+                update_output(quiet=True)
+
+        def _apply_verbose(
+            _ctx: click.Context, _param: click.Parameter, value: bool
+        ) -> None:
+            if value:
+                update_output(verbose=True)
+
+        if not {"--output", "-o"} & taken:
+            cmd = click.option(
+                "--output",
+                "-o",
+                type=click.Choice(
+                    ["json", "yaml", "table", "csv"], case_sensitive=False
+                ),
+                expose_value=False,
+                callback=_apply_format,
+                help="Output format (same as the global -o before the command).",
+            )(cmd)
+
+        if not {"--quiet", "-q"} & taken:
+            cmd = click.option(
+                "--quiet",
+                "-q",
+                is_flag=True,
+                expose_value=False,
+                callback=_apply_quiet,
+                help="Suppress non-essential output.",
+            )(cmd)
+
+        if not {"--verbose", "-v"} & taken:
+            cmd = click.option(
+                "--verbose",
+                "-v",
+                is_flag=True,
+                expose_value=False,
+                callback=_apply_verbose,
+                help="Enable verbose output.",
+            )(cmd)
+
         return cmd
 
     def _build_help_text(self, instance: Any) -> str:

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/src/deepctl_core/timing.py

@@ -7,9 +7,12 @@ from dataclasses import dataclass, field
 from threading import local
 from typing import Any
 
-from rich.console import Console
+from .output import stderr_console
 
-console = Console()
+# Diagnostics only: everything printed here is status or error chrome, so
+# it goes to stderr and can never corrupt the machine-readable payload a
+# command writes to stdout. See get_status_console() in output.py.
+console = stderr_console
 
 # Thread-local storage for timing data
 _timing_data = local()

{deepctl_core-0.2.16 → deepctl_core-0.2.18}/src/deepctl_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-core
-Version: 0.2.16
+Version: 0.2.18
 Summary: Core components for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>