deepctl-cmd-debug-audio 0.1.13__tar.gz → 0.1.15__tar.gz

{deepctl_cmd_debug_audio-0.1.13 → deepctl_cmd_debug_audio-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-cmd-debug-audio
-Version: 0.1.13
+Version: 0.1.15
 Summary: Audio debug subcommand for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>

{deepctl_cmd_debug_audio-0.1.13 → deepctl_cmd_debug_audio-0.1.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deepctl-cmd-debug-audio"
-version = "0.1.13" # x-release-please-version
+version = "0.1.15" # x-release-please-version
 description = "Audio debug subcommand for deepctl"
 readme = "README.md"
 license = "MIT"

{deepctl_cmd_debug_audio-0.1.13 → deepctl_cmd_debug_audio-0.1.15}/src/deepctl_cmd_debug_audio/command.py

@@ -2,7 +2,7 @@
 
 import json
 import os
-import shutil
+import shlex
 import subprocess
 import tempfile
 from typing import Any
@@ -10,15 +10,46 @@ from urllib.parse import urlparse
 
 import ffmpeg  # type: ignore[import-untyped]
 import httpx
-from deepctl_core import AuthManager, BaseCommand, Config, DeepgramClient
+from deepctl_core import (
+    AuthManager,
+    BaseCommand,
+    Config,
+    DeepgramClient,
+    get_console,
+    get_output_format,
+    get_status_console,
+)
+from deepctl_core.tools import resolve_tool
 from rich import box
-from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
 
 from .models import AudioDebugResult, AudioFormat, AudioInfo, AudioStream
 
-console = Console()
+
+def _ffprobe_input(file_path: str) -> str:
+    """Name ``file_path`` for ffprobe as an input file, never as an option.
+
+    ffprobe has no ``--`` end-of-options marker, so a file named ``-f lavfi``
+    would be read as options. The ``file:`` protocol prefix with an absolute
+    path makes ffprobe treat it as a plain file, whatever it is called.
+    """
+    return "file:" + os.path.abspath(file_path)
+
+
+# Two channels, deliberately (#104):
+#   console        -> stdout, the human rendering of the analysis. Only
+#                     written in default (human) output mode; in json/yaml/
+#                     csv/table mode the serialized AudioDebugResult is the
+#                     whole of stdout, so `dg -o json debug audio | jq` parses.
+#   status_console -> stderr, always: progress lines and failure panels.
+console = get_console()
+status_console = get_status_console()
+
+
+def _human_output() -> bool:
+    """True when stdout is for a person, not a parser."""
+    return get_output_format() == "default"
 
 
 class AudioCommand(BaseCommand):
@@ -78,7 +109,14 @@ class AudioCommand(BaseCommand):
 
     def check_ffmpeg_installed(self) -> bool:
         """Check if ffmpeg/ffprobe is installed."""
-        return shutil.which("ffprobe") is not None
+        return self._ffprobe_bin() is not None
+
+    def _ffprobe_bin(self) -> str | None:
+        """Absolute ffprobe path: the user config's, or one found on PATH
+        (never in the current directory)."""
+        return resolve_tool(
+            getattr(self, "_config", None), "ffprobe", "tools.ffprobe_path"
+        )
 
     def _is_url(self, path: str) -> bool:
         """Check if the path is a URL."""
@@ -87,7 +125,7 @@ class AudioCommand(BaseCommand):
 
     def _download_url(self, url: str) -> str:
         """Download a URL to a temporary file and return the path."""
-        console.print(f"[blue]Downloading:[/blue] {url}")
+        status_console.print(f"[blue]Downloading:[/blue] {url}")
 
         parsed = urlparse(url)
         ext = os.path.splitext(parsed.path)[1] or ".audio"
@@ -107,7 +145,7 @@ class AudioCommand(BaseCommand):
                         tmp.write(chunk)
                         total += len(chunk)
                 size_mb = total / (1024 * 1024)
-                console.print(
+                status_console.print(
                     f"[green]Downloaded[/green] {size_mb:.2f} MB → {tmp_name}"
                 )
                 return tmp_name
@@ -191,12 +229,16 @@ class AudioCommand(BaseCommand):
         self, file_path: str, custom_args: str | None = None
     ) -> dict[str, Any]:
         """Run ffprobe on the given file."""
+        ffprobe_bin = self._ffprobe_bin()
+        if ffprobe_bin is None:
+            raise Exception("Failed to probe file: ffprobe not found")
         try:
             if custom_args:
-                # Parse custom arguments and run ffprobe directly
-                cmd = ["ffprobe", "-v", "quiet", "-print_format", "json"]
-                cmd.extend(custom_args.split())
-                cmd.append(file_path)
+                # Split custom arguments like a POSIX shell on every OS, so a quoted
+                # value stays one argument, and run ffprobe directly
+                cmd = [ffprobe_bin, "-v", "quiet", "-print_format", "json"]
+                cmd.extend(shlex.split(custom_args))
+                cmd.append(_ffprobe_input(file_path))
 
                 result = subprocess.run(cmd, capture_output=True, text=True)
                 if result.returncode != 0:
@@ -205,7 +247,7 @@ class AudioCommand(BaseCommand):
                 return dict(json.loads(result.stdout))
             else:
                 # Use python-ffmpeg for standard probe
-                probe = ffmpeg.probe(file_path)
+                probe = ffmpeg.probe(_ffprobe_input(file_path), cmd=ffprobe_bin)
                 return dict(probe)
         except Exception as e:
             raise Exception(f"Failed to probe file: {e!s}")
@@ -390,6 +432,7 @@ class AudioCommand(BaseCommand):
         **kwargs: Any,
     ) -> Any:
         """Handle audio debug command execution."""
+        self._config = config
         audio_file = kwargs.get("file")
         verbose = kwargs.get("verbose", False)
         extra_verbose = kwargs.get("extra_verbose", False)
@@ -406,7 +449,7 @@ class AudioCommand(BaseCommand):
 
         # Check if ffmpeg is installed
         if not self.check_ffmpeg_installed():
-            console.print(
+            status_console.print(
                 Panel(
                     "[red]✗ FFmpeg not found![/red]\n\n"
                     "The audio debug command requires FFmpeg to be installed "
@@ -438,7 +481,7 @@ class AudioCommand(BaseCommand):
                 downloaded_file = self._download_url(audio_file)
                 file_to_analyze = downloaded_file
             except Exception as e:
-                console.print(
+                status_console.print(
                     Panel(
                         f"[red]✗ Failed to download URL[/red]\n\n[dim]{e!s}[/dim]",
                         title="Download Failed",
@@ -454,7 +497,9 @@ class AudioCommand(BaseCommand):
 
         # Process the audio file
         try:
-            console.print(f"[blue]Analyzing audio file:[/blue] {file_to_analyze}")
+            status_console.print(
+                f"[blue]Analyzing audio file:[/blue] {file_to_analyze}"
+            )
 
             # Run ffprobe
             probe_data = self.run_ffprobe(file_to_analyze, ffprobe_args)
@@ -462,45 +507,52 @@ class AudioCommand(BaseCommand):
             # Parse the data
             audio_info = self.parse_audio_info(probe_data)
 
-            # Display results based on verbosity
-            if extra_verbose or ffprobe_args:
-                self.display_extra_verbose_info(audio_info)
-            elif verbose:
-                self.display_verbose_info(audio_info)
-            else:
-                self.display_basic_info(audio_info)
-
-            # Check for Deepgram compatibility
-            console.print("\n[bold]Deepgram Compatibility Check:[/bold]")
-            compatibility_issues = []
-
-            if audio_info.streams:
-                for stream in audio_info.streams:
-                    # Check sample rate
-                    if stream.sample_rate and int(stream.sample_rate) < 8000:
-                        compatibility_issues.append(
-                            f"⚠️  Low sample rate ({stream.sample_rate} Hz) - "
-                            f"Deepgram works best with 8kHz or higher"
-                        )
-
-                    # Check channels
-                    if stream.channels and stream.channels > 2:
-                        compatibility_issues.append(
-                            f"⚠️  Multi-channel audio ({stream.channels} "
-                            f"channels) - Consider converting to mono or "
-                            f"stereo"
-                        )
-
-            if compatibility_issues:
-                for issue in compatibility_issues:
-                    console.print(f"  {issue}")
-            else:
-                console.print(
-                    "  [green]✓[/green] Audio appears to be compatible with Deepgram"
-                )
+            # Everything below is the human rendering of the analysis. It is
+            # the same information the returned AudioDebugResult carries, so
+            # in a machine-readable format it would be duplicate prose sitting
+            # in front of the payload -- exactly the #104 break. Print it only
+            # when stdout is for a person.
+            if _human_output():
+                # Display results based on verbosity
+                if extra_verbose or ffprobe_args:
+                    self.display_extra_verbose_info(audio_info)
+                elif verbose:
+                    self.display_verbose_info(audio_info)
+                else:
+                    self.display_basic_info(audio_info)
+
+                # Check for Deepgram compatibility
+                console.print("\n[bold]Deepgram Compatibility Check:[/bold]")
+                compatibility_issues = []
+
+                if audio_info.streams:
+                    for stream in audio_info.streams:
+                        # Check sample rate
+                        if stream.sample_rate and int(stream.sample_rate) < 8000:
+                            compatibility_issues.append(
+                                f"⚠️  Low sample rate ({stream.sample_rate} Hz) - "
+                                f"Deepgram works best with 8kHz or higher"
+                            )
+
+                        # Check channels
+                        if stream.channels and stream.channels > 2:
+                            compatibility_issues.append(
+                                f"⚠️  Multi-channel audio ({stream.channels} "
+                                f"channels) - Consider converting to mono or "
+                                f"stereo"
+                            )
+
+                if compatibility_issues:
+                    for issue in compatibility_issues:
+                        console.print(f"  {issue}")
+                else:
+                    console.print(
+                        "  [green]✓[/green] Audio appears to be compatible "
+                        "with Deepgram"
+                    )
 
-            # Encoding suggestions
-            self._suggest_encoding(audio_info)
+                # Encoding suggestions
+                self._suggest_encoding(audio_info)
 
             return AudioDebugResult(
                 status="success",
@@ -510,7 +562,7 @@ class AudioCommand(BaseCommand):
             )
 
         except Exception as e:
-            console.print(
+            status_console.print(
                 Panel(
                     f"[red]✗ Error analyzing audio file[/red]\n\n[dim]{e!s}[/dim]",
                     title="Analysis Failed",

{deepctl_cmd_debug_audio-0.1.13 → deepctl_cmd_debug_audio-0.1.15}/src/deepctl_cmd_debug_audio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-cmd-debug-audio
-Version: 0.1.13
+Version: 0.1.15
 Summary: Audio debug subcommand for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>