deepctl-shared-utils 0.1.12__tar.gz → 0.1.14__tar.gz

{deepctl_shared_utils-0.1.12 → deepctl_shared_utils-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-shared-utils
-Version: 0.1.12
+Version: 0.1.14
 Summary: Shared utilities for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>

{deepctl_shared_utils-0.1.12 → deepctl_shared_utils-0.1.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deepctl-shared-utils"
-version = "0.1.12" # x-release-please-version
+version = "0.1.14" # x-release-please-version
 description = "Shared utilities for deepctl"
 readme = "README.md"
 license = "MIT"

{deepctl_shared_utils-0.1.12 → deepctl_shared_utils-0.1.14}/src/deepctl_shared_utils/__init__.py

@@ -28,4 +28,4 @@ __all__ = [
     "validate_url",
 ]
 
-__version__ = "0.1.12"  # x-release-please-version
+__version__ = "0.1.14"  # x-release-please-version

deepctl_shared_utils-0.1.14/src/deepctl_shared_utils/diagnostics.py

@@ -0,0 +1,52 @@
+"""Plain-text diagnostic output shared by utilities outside deepctl-core."""
+
+import os
+import sys
+from typing import TextIO
+
+from rich.console import Console
+
+
+def is_non_interactive() -> bool:
+    """Mirror deepctl-core's agent and non-interactive output policy.
+
+    Shared utilities intentionally do not depend on deepctl-core, so keep this
+    lightweight detection aligned with ``deepctl_core.output.is_agentic``.
+    """
+    env = os.environ
+
+    if "--non-interactive" in sys.argv or "--agent-friendly" in sys.argv:
+        return True
+    if env.get("CI") in ("true", "1"):
+        return True
+    if env.get("CLAUDECODE") or env.get("CLAUDE_CODE_ENTRYPOINT"):
+        return True
+    if env.get("CODEX_SANDBOX") or env.get("CODEX_SANDBOX_NETWORK_DISABLED"):
+        return True
+    if env.get("OR_APP_NAME") == "Aider" or "aider" in env.get("OR_SITE_URL", ""):
+        return True
+
+    score = 0
+    if not sys.stdin.isatty():
+        score += 1
+    if not sys.stdout.isatty():
+        score += 1
+    if not env.get("TERM") or env.get("TERM") == "dumb":
+        score += 1
+    if "NO_COLOR" in env:
+        score += 1
+
+    return score >= 3
+
+
+def create_diagnostic_console(
+    *, file: TextIO | None = None, force_terminal: bool | None = None
+) -> Console:
+    """Create a stderr diagnostic console with the shared plain-text policy."""
+    non_interactive = is_non_interactive()
+    return Console(
+        file=file or sys.stderr,
+        force_terminal=force_terminal,
+        no_color=non_interactive,
+        highlight=not non_interactive,
+    )

{deepctl_shared_utils-0.1.12 → deepctl_shared_utils-0.1.14}/src/deepctl_shared_utils/ffprobe.py

@@ -5,38 +5,81 @@ from __future__ import annotations
 import json
 import os
 import platform
-import shutil
 import subprocess
 import tempfile
 from typing import TYPE_CHECKING
 
-from rich.console import Console
 from rich.panel import Panel
 
+from .diagnostics import create_diagnostic_console
 from .ffprobe_models import AudioFormatInfo, AudioProbeResult, AudioStreamInfo
 
 if TYPE_CHECKING:
     from deepctl_core import Config
 
-console = Console()
+# Diagnostics only: every console.print below is an error, a warning or a
+# progress line -- never a payload -- so it goes to stderr and can never
+# corrupt the machine-readable result a command writes to stdout (#104).
+# deepctl-shared-utils does not depend on deepctl-core, so this local factory
+# mirrors core's agentic/no-color policy instead of importing `stderr_console`.
+console = create_diagnostic_console()
+
+
+def ffprobe_input(file_path: str | os.PathLike[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(os.fspath(file_path))
 
 
 def get_ffprobe_path(config: Config | None = None) -> str | None:
     """Get the ffprobe binary path.
 
-    Checks stored config path first, then falls back to auto-detection
-    via shutil.which().
+    Checks the stored config path first, then falls back to a PATH lookup.
+    A stored path is used only when it is absolute, and the PATH lookup
+    skips relative and empty entries and the current directory itself (on
+    every OS), so a binary inside the current directory is never picked up
+    implicitly. The result is always an absolute path.
     """
     if config is not None:
         stored_path = config.get("tools.ffprobe_path")
         if (
-            stored_path
+            isinstance(stored_path, str)
+            and os.path.isabs(stored_path)
             and os.path.isfile(stored_path)
             and os.access(stored_path, os.X_OK)
         ):
-            return str(stored_path)
+            return stored_path
+    return _find_on_path("ffprobe")
 
-    return shutil.which("ffprobe")
+
+def _find_on_path(name: str) -> str | None:
+    """Absolute path of ``name`` from PATH, never from the current directory.
+
+    Mirrors ``deepctl_core.tools.find_executable`` (this package does not
+    depend on deepctl-core).
+    """
+    try:
+        cwd: str | None = os.path.realpath(os.getcwd())
+    except OSError:
+        cwd = None
+    names = [name]
+    if platform.system() == "Windows" and not os.path.splitext(name)[1]:
+        exts = os.environ.get("PATHEXT", ".COM;.EXE;.BAT;.CMD").split(os.pathsep)
+        names = [name + ext for ext in exts if ext]
+    for entry in os.environ.get("PATH", os.defpath).split(os.pathsep):
+        if not entry or not os.path.isabs(entry):
+            continue
+        if cwd is not None and os.path.realpath(entry) == cwd:
+            continue
+        for candidate in names:
+            path = os.path.join(entry, candidate)
+            if os.path.isfile(path) and os.access(path, os.X_OK):
+                return path
+    return None
 
 
 def check_ffprobe(config: Config | None = None) -> bool:
@@ -157,7 +200,7 @@ def probe_file(file_path: str, config: Config | None = None) -> AudioProbeResult
             "json",
             "-show_format",
             "-show_streams",
-            file_path,
+            ffprobe_input(file_path),
         ]
 
         result = subprocess.run(cmd, capture_output=True, text=True, timeout=30)
@@ -204,7 +247,7 @@ def probe_buffer(
             "json",
             "-show_format",
             "-show_streams",
-            tmp_name,
+            ffprobe_input(tmp_name),
         ]
 
         result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)

{deepctl_shared_utils-0.1.12 → deepctl_shared_utils-0.1.14}/src/deepctl_shared_utils/validation.py

@@ -6,11 +6,16 @@ from pathlib import Path
 from urllib.parse import urlparse
 
 import httpx
-from rich.console import Console
 
+from .diagnostics import create_diagnostic_console
 from .models import FileInfo
 
-console = Console()
+# Diagnostics only: every console.print below is an error, a warning or a
+# progress line -- never a payload -- so it goes to stderr and can never
+# corrupt the machine-readable result a command writes to stdout (#104).
+# deepctl-shared-utils does not depend on deepctl-core, so this local factory
+# mirrors core's agentic/no-color policy instead of importing `stderr_console`.
+console = create_diagnostic_console()
 
 # Supported audio file extensions
 SUPPORTED_AUDIO_EXTENSIONS = {

{deepctl_shared_utils-0.1.12 → deepctl_shared_utils-0.1.14}/src/deepctl_shared_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-shared-utils
-Version: 0.1.12
+Version: 0.1.14
 Summary: Shared utilities for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>

{deepctl_shared_utils-0.1.12 → deepctl_shared_utils-0.1.14}/src/deepctl_shared_utils.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 README.md
 pyproject.toml
 src/deepctl_shared_utils/__init__.py
+src/deepctl_shared_utils/diagnostics.py
 src/deepctl_shared_utils/ffprobe.py
 src/deepctl_shared_utils/ffprobe_models.py
 src/deepctl_shared_utils/models.py