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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-core
-Version: 0.2.16
+Version: 0.2.17
 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.17}/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.17" # x-release-please-version
 description = "Core components for deepctl"
 readme = "README.md"
 license = "MIT"

{deepctl_core-0.2.16 → deepctl_core-0.2.17}/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.17}/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.17}/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.17}/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.17
 Summary: Core components for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>