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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-core
-Version: 0.2.14
+Version: 0.2.17
 Summary: Core components for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>
@@ -16,7 +16,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: click>=8.0.0
-Requires-Dist: deepgram-sdk>=7.5.0
+Requires-Dist: deepgram-sdk<8,>=7.7.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: httpx>=0.24.0
@@ -63,7 +63,7 @@ pipx run deepctl --help
 ## Dependencies
 
 - `click>=8.0.0`
-- `deepgram-sdk>=6.0.0rc2`
+- `deepgram-sdk>=7.7.0,<8`
 - `pydantic>=2.0.0`
 - `rich>=13.0.0`
 - `httpx>=0.24.0`

{deepctl_core-0.2.14 → deepctl_core-0.2.17}/README.md

@@ -30,7 +30,7 @@ pipx run deepctl --help
 ## Dependencies
 
 - `click>=8.0.0`
-- `deepgram-sdk>=6.0.0rc2`
+- `deepgram-sdk>=7.7.0,<8`
 - `pydantic>=2.0.0`
 - `rich>=13.0.0`
 - `httpx>=0.24.0`

{deepctl_core-0.2.14 → deepctl_core-0.2.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deepctl-core"
-version = "0.2.14" # x-release-please-version
+version = "0.2.17" # x-release-please-version
 description = "Core components for deepctl"
 readme = "README.md"
 license = "MIT"
@@ -23,7 +23,7 @@ keywords = ["deepgram", "core", "auth", "config", "client"]
 requires-python = ">=3.10"
 dependencies = [
     "click>=8.0.0",
-    "deepgram-sdk>=7.5.0",
+    "deepgram-sdk>=7.7.0,<8",
     "pydantic>=2.0.0",
     "rich>=13.0.0",
     "httpx>=0.24.0",

{deepctl_core-0.2.14 → deepctl_core-0.2.17}/src/deepctl_core/__init__.py

@@ -16,6 +16,7 @@ from .output import (
     OutputFormatter,
     get_console,
     get_output_format,
+    get_status_console,
     is_agentic,
     print_error,
     print_info,
@@ -23,6 +24,7 @@ from .output import (
     print_success,
     print_warning,
     setup_output,
+    update_output,
 )
 from .plugin_manager import PluginManager
 from .timing import (
@@ -50,6 +52,8 @@ __all__ = [
     "TimingContext",
     "enable_timing",
     "get_console",
+    "get_output_format",
+    "get_status_console",
     "get_timing_summary",
     "is_agentic",
     "is_timing_enabled",
@@ -60,4 +64,5 @@ __all__ = [
     "print_timing_summary",
     "print_warning",
     "setup_output",
+    "update_output",
 ]

{deepctl_core-0.2.14 → deepctl_core-0.2.17}/src/deepctl_core/base_command.py

@@ -29,6 +29,19 @@ class BaseCommand(ABC):
     requires_project: bool = False
     ci_friendly: bool = True
 
+    # Result status -> process exit code, per the contract published in
+    # llms-full.txt: 0 = success, 1 = error, 2 = user interrupt. A command that
+    # reports failure must not exit 0 -- scripts and CI branch on the exit code,
+    # not on the "status" field inside the payload. "cancelled" is 2 rather than
+    # the shell's 130 to match that contract and main.py's own KeyboardInterrupt
+    # handler; `dg mcp` in particular returns cancelled straight out of its
+    # KeyboardInterrupt path. Any status not listed here exits 0
+    # (success, succeeded, info, dry_run, warning).
+    EXIT_CODES: ClassVar[dict[str, int]] = {
+        "error": 1,
+        "cancelled": 2,
+    }
+
     # Agent-oriented metadata
     examples: ClassVar[list[str]] = []
     agent_help: str = ""
@@ -147,6 +160,23 @@ class BaseCommand(ABC):
                     stderr_console.print_exception()
                 raise click.ClickException(str(e))
 
+            # Payload is already on stdout; now make the exit code agree with it.
+            exit_code = self.exit_code_for(result)
+            if exit_code:
+                raise SystemExit(exit_code)
+
+    def exit_code_for(self, result: Any) -> int:
+        """Map a command result to a process exit code.
+
+        Args:
+            result: Command result (may be None)
+
+        Returns:
+            Exit code for this result's status; 0 when it reported no failure
+        """
+        status = str(getattr(result, "status", "") or "")
+        return self.EXIT_CODES.get(status, 0)
+
     def is_guided(self, ctx: click.Context) -> bool:
         """True only when the user invoked this command with no input at all.
 
@@ -285,9 +315,25 @@ class BaseCommand(ABC):
             elif output_format == "csv":
                 self._output_csv(result)
             else:
-                console.print(f"[red]Unknown output format:[/red] {output_format}")
+                # Diagnostics belong on stderr even here, or the complaint about
+                # the format corrupts the payload we fall back to.
+                stderr_console.print(
+                    f"[red]Unknown output format:[/red] {output_format}"
+                )
                 self._output_json(result)
 
+    def _write_payload(self, text: str) -> None:
+        """Write already-serialised machine-readable text to stdout verbatim.
+
+        Rich's default print would treat square brackets as style markup and
+        silently delete them, so a key comment of "[ci] runner" would lose the
+        "[ci]". It would also hard-wrap at the console width, injecting newlines
+        into the middle of a value. Both corrupt the payload, so markup,
+        highlighting and wrapping are all off. Routed through `console` rather
+        than `sys.stdout` so `--quiet` still suppresses output.
+        """
+        console.print(text, markup=False, highlight=False, soft_wrap=True)
+
     def _output_json(self, result: Any) -> None:
         """Output result as JSON."""
         import json
@@ -310,9 +356,11 @@ class BaseCommand(ABC):
         import yaml
 
         if isinstance(result, dict | list):
-            console.print(yaml.dump(result, default_flow_style=False))
+            self._write_payload(yaml.dump(result, default_flow_style=False))
         else:
-            console.print(yaml.dump({"result": str(result)}, default_flow_style=False))
+            self._write_payload(
+                yaml.dump({"result": str(result)}, default_flow_style=False)
+            )
 
     def _output_table(self, result: Any) -> None:
         """Output result as table."""
@@ -359,7 +407,7 @@ class BaseCommand(ABC):
             dict_writer = csv.DictWriter(output, fieldnames=result[0].keys())
             dict_writer.writeheader()
             dict_writer.writerows(result)
-            console.print(output.getvalue())
+            self._write_payload(output.getvalue())
 
         elif isinstance(result, dict):
             # Dictionary
@@ -368,7 +416,7 @@ class BaseCommand(ABC):
             writer.writerow(["Key", "Value"])
             for key, value in result.items():
                 writer.writerow([key, value])
-            console.print(output.getvalue())
+            self._write_payload(output.getvalue())
 
         else:
             # Fallback to JSON

{deepctl_core-0.2.14 → deepctl_core-0.2.17}/src/deepctl_core/client.py

@@ -189,12 +189,17 @@ class DeepgramClient:
         model: str,
         encoding: str | None = None,
         sample_rate: float | None = None,
+        speed: float | None = None,
+        expressivity: int | None = None,
     ) -> Iterator[bytes]:
         """Stream TTS audio over the Flux v2 WebSocket (speak.v2.connect).
 
         Yields raw audio chunks as they arrive. The streaming transport emits
         raw (non-containerized) audio, so only linear16/mulaw/alaw encodings
         apply and sample_rate is sent as the string the streaming API expects.
+
+        ``speed`` (0.85-1.15) and beta ``expressivity`` (-2..2, default 0) are
+        Flux connect query parameters; they are only sent when set.
         """
         from deepgram.speak.v2.types.speak_v2speak import SpeakV2Speak
 
@@ -203,6 +208,10 @@ class DeepgramClient:
             connect_kwargs["encoding"] = encoding
         if sample_rate:
             connect_kwargs["sample_rate"] = str(int(sample_rate))
+        if speed is not None:
+            connect_kwargs["speed"] = speed
+        if expressivity is not None:
+            connect_kwargs["expressivity"] = expressivity
 
         try:
             with self.client.speak.v2.connect(**connect_kwargs) as conn:

{deepctl_core-0.2.14 → 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."""
 
@@ -505,3 +529,19 @@ def get_console() -> Console:
         Console instance
     """
     return console
+
+
+def get_status_console() -> Console:
+    """Get the console for status/progress chrome.
+
+    Always writes to stderr, so anything printed through it can never corrupt
+    the machine-readable payload a command writes to stdout. Commands should
+    use this rather than declaring their own ``Console(stderr=True)`` — a
+    per-command console silently misses the agentic no-color settings, and a
+    command that reaches for a bare ``Console()`` reintroduces the stdout
+    pollution this exists to prevent.
+
+    Returns:
+        Console instance writing to stderr
+    """
+    return stderr_console

{deepctl_core-0.2.14 → 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.14 → deepctl_core-0.2.17}/src/deepctl_core/skill_generator.py

@@ -417,7 +417,8 @@ def render_developer_guide(
     lines.append("## Text-to-Speech (TTS)")
     lines.append("")
     lines.append(
-        "Generate natural-sounding speech from text using Deepgram's Aura voices."
+        "Generate natural-sounding speech from text using Deepgram's Aura and "
+        "Flux voices."
     )
     lines.append("")
     lines.append("### Models")
@@ -463,6 +464,10 @@ def render_developer_guide(
     lines.append("")
     lines.append("### Flux TTS — Speak v2, WebSocket streaming (Python)")
     lines.append("")
+    lines.append(
+        "`expressivity` is beta and defaults to `0` (nominal delivery) when omitted."
+    )
+    lines.append("")
     lines.append("```python")
     lines.append("from deepgram import DeepgramClient")
     lines.append("from deepgram.speak.v2.types.speak_v2speak import SpeakV2Speak")
@@ -470,7 +475,11 @@ def render_developer_guide(
     lines.append('client = DeepgramClient(api_key="DEEPGRAM_API_KEY")')
     lines.append("")
     lines.append("with client.speak.v2.connect(")
-    lines.append('    model="flux-alexis-en", encoding="linear16", sample_rate="24000"')
+    lines.append('    model="flux-alexis-en",')
+    lines.append('    encoding="linear16",')
+    lines.append('    sample_rate="24000",')
+    lines.append("    speed=1.0,  # 0.85–1.15 in 0.05 steps (optional)")
+    lines.append("    expressivity=0,  # beta; -2..2, default 0 = nominal (optional)")
     lines.append(") as conn:")
     lines.append(
         '    conn.send_speak(SpeakV2Speak(type="Speak", text="Hello from Flux!"))'

{deepctl_core-0.2.14 → 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.14
+Version: 0.2.17
 Summary: Core components for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>
@@ -16,7 +16,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: click>=8.0.0
-Requires-Dist: deepgram-sdk>=7.5.0
+Requires-Dist: deepgram-sdk<8,>=7.7.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: httpx>=0.24.0
@@ -63,7 +63,7 @@ pipx run deepctl --help
 ## Dependencies
 
 - `click>=8.0.0`
-- `deepgram-sdk>=6.0.0rc2`
+- `deepgram-sdk>=7.7.0,<8`
 - `pydantic>=2.0.0`
 - `rich>=13.0.0`
 - `httpx>=0.24.0`

{deepctl_core-0.2.14 → deepctl_core-0.2.17}/src/deepctl_core.egg-info/requires.txt

@@ -1,5 +1,5 @@
 click>=8.0.0
-deepgram-sdk>=7.5.0
+deepgram-sdk<8,>=7.7.0
 pydantic>=2.0.0
 rich>=13.0.0
 httpx>=0.24.0