talks-reducer 0.5.5__py3-none-any.whl → 0.6.1__py3-none-any.whl

talks_reducer/service_client.py

@@ -3,12 +3,16 @@
 from __future__ import annotations
 
 import argparse
+import asyncio
 import shutil
+import time
+from contextlib import suppress
 from pathlib import Path
-from typing import Optional, Sequence, Tuple
+from typing import Callable, Optional, Sequence, Tuple
 
 from gradio_client import Client
 from gradio_client import file as gradio_file
+from gradio_client.client import Status, StatusUpdate
 
 
 def send_video(
@@ -16,6 +20,12 @@ def send_video(
     output_path: Optional[Path],
     server_url: str,
     small: bool = False,
+    *,
+    log_callback: Optional[Callable[[str], None]] = None,
+    stream_updates: bool = False,
+    progress_callback: Optional[
+        Callable[[str, Optional[int], Optional[int], str], None]
+    ] = None,
 ) -> Tuple[Path, str, str]:
     """Upload *input_path* to the Gradio server and download the processed video."""
 
@@ -23,17 +33,56 @@ def send_video(
         raise FileNotFoundError(f"Input file does not exist: {input_path}")
 
     client = Client(server_url)
-    prediction = client.predict(
+    job = client.submit(
         gradio_file(str(input_path)),
         bool(small),
         api_name="/process_video",
     )
 
+    printed_lines = 0
+
+    def _emit_new_lines(log_text: str) -> None:
+        nonlocal printed_lines
+        if log_callback is None or not log_text:
+            return
+        lines = log_text.splitlines()
+        if printed_lines < len(lines):
+            for line in lines[printed_lines:]:
+                log_callback(line)
+            printed_lines = len(lines)
+
+    consumed_stream = False
+
+    if stream_updates:
+        consumed_stream = _stream_job_updates(
+            job,
+            _emit_new_lines,
+            progress_callback=progress_callback,
+        )
+
+    if not consumed_stream:
+        for output in job:
+            if not isinstance(output, (list, tuple)) or len(output) != 4:
+                continue
+            log_text_candidate = output[1] or ""
+            if isinstance(log_text_candidate, str):
+                _emit_new_lines(log_text_candidate)
+
+    prediction = job.result()
+
     try:
-        _, log_text, summary, download_path = prediction
+        video_path, log_text, summary, download_path = prediction
     except (TypeError, ValueError) as exc:  # pragma: no cover - defensive
         raise RuntimeError("Unexpected response from server") from exc
 
+    if isinstance(log_text, str):
+        _emit_new_lines(log_text)
+    else:
+        log_text = ""
+
+    if not download_path:
+        download_path = video_path
+
     if not download_path:
         raise RuntimeError("Server did not return a processed file")
 
@@ -49,9 +98,174 @@ def send_video(
     if download_source.resolve() != destination.resolve():
         shutil.copy2(download_source, destination)
 
+    if not isinstance(summary, str):
+        summary = ""
+    if not isinstance(log_text, str):
+        log_text = ""
+
     return destination, summary, log_text
 
 
+def _coerce_int(value: object) -> Optional[int]:
+    """Return *value* as an ``int`` when possible."""
+
+    try:
+        if value is None:
+            return None
+        return int(value)
+    except (TypeError, ValueError):
+        return None
+
+
+def _emit_progress_update(
+    callback: Callable[[str, Optional[int], Optional[int], str], None],
+    unit: object,
+) -> None:
+    """Normalize a progress unit and forward it to *callback*."""
+
+    if unit is None:
+        return
+
+    if hasattr(unit, "__dict__"):
+        data = unit
+        desc = getattr(data, "desc", None)
+        length = getattr(data, "length", None)
+        index = getattr(data, "index", None)
+        progress = getattr(data, "progress", None)
+        unit_name = getattr(data, "unit", None)
+    elif isinstance(unit, dict):
+        desc = unit.get("desc")
+        length = unit.get("length")
+        index = unit.get("index")
+        progress = unit.get("progress")
+        unit_name = unit.get("unit")
+    else:
+        return
+
+    total = _coerce_int(length)
+    current = _coerce_int(index)
+    if current is None and isinstance(progress, (int, float)) and total:
+        current = int(progress / total)
+
+    callback(desc or "Processing", progress, total, str(unit_name or ""))
+
+
+async def _pump_job_updates(
+    job,
+    emit_log: Callable[[str], None],
+    progress_callback: Optional[
+        Callable[[str, Optional[int], Optional[int], str], None]
+    ],
+) -> None:
+    """Consume asynchronous updates from *job* and emit logs and progress."""
+
+    async for update in job:  # type: ignore[async-for]
+        update_type = getattr(update, "type", "status")
+        if update_type == "output":
+            outputs = getattr(update, "outputs", None) or []
+            if isinstance(outputs, (list, tuple)) and len(outputs) == 4:
+                log_text_candidate = outputs[1] or ""
+                if isinstance(log_text_candidate, str):
+                    emit_log(log_text_candidate)
+            if getattr(update, "final", False):
+                break
+            continue
+
+        status_update: StatusUpdate = update  # type: ignore[assignment]
+        log_entry = getattr(status_update, "log", None)
+        if log_entry:
+            message = (
+                log_entry[0] if isinstance(log_entry, (list, tuple)) else log_entry
+            )
+            if isinstance(message, str):
+                emit_log(message)
+
+        if progress_callback and status_update.progress_data:
+            for unit in status_update.progress_data:
+                _emit_progress_update(progress_callback, unit)
+
+        if status_update.code in {Status.FINISHED, Status.CANCELLED}:
+            break
+
+
+def _poll_job_updates(
+    job,
+    emit_log: Callable[[str], None],
+    progress_callback: Optional[
+        Callable[[str, Optional[int], Optional[int], str], None]
+    ],
+    *,
+    interval: float = 0.25,
+) -> None:
+    """Poll *job* for outputs and status updates when async streaming is unavailable."""
+
+    while True:
+        if job.done():
+            break
+
+        status: Optional[StatusUpdate] = None
+        with suppress(Exception):
+            status = job.status()  # type: ignore[assignment]
+
+        if status is not None:
+            if progress_callback:
+                progress_data = getattr(status, "progress_data", None)
+                if progress_data:
+                    for unit in progress_data:
+                        _emit_progress_update(progress_callback, unit)
+            log_entry = getattr(status, "log", None)
+            if log_entry:
+                message = (
+                    log_entry[0] if isinstance(log_entry, (list, tuple)) else log_entry
+                )
+                if isinstance(message, str):
+                    emit_log(message)
+
+        outputs = []
+        with suppress(Exception):
+            outputs = job.outputs()
+        if outputs:
+            latest = outputs[-1]
+            if isinstance(latest, (list, tuple)) and len(latest) == 4:
+                log_text_candidate = latest[1] or ""
+                if isinstance(log_text_candidate, str):
+                    emit_log(log_text_candidate)
+
+        time.sleep(interval)
+
+
+def _stream_job_updates(
+    job,
+    emit_log: Callable[[str], None],
+    *,
+    progress_callback: Optional[
+        Callable[[str, Optional[int], Optional[int], str], None]
+    ] = None,
+) -> bool:
+    """Attempt to stream updates directly from *job*.
+
+    Returns ``True`` when streaming occurred, ``False`` when the legacy
+    generator-based fallback should be used.
+    """
+
+    communicator = getattr(job, "communicator", None)
+    if communicator is None:
+        return False
+
+    try:
+        asyncio.run(
+            _pump_job_updates(
+                job,
+                emit_log,
+                progress_callback,
+            )
+        )
+    except RuntimeError:
+        _poll_job_updates(job, emit_log, progress_callback)
+
+    return True
+
+
 def _build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         description="Send a video to a running talks-reducer server and download the result.",
@@ -78,6 +292,11 @@ def _build_parser() -> argparse.ArgumentParser:
         action="store_true",
         help="Print the server log after processing completes.",
     )
+    parser.add_argument(
+        "--stream",
+        action="store_true",
+        help="Stream remote progress updates while waiting for the result.",
+    )
     return parser
 
 
@@ -85,16 +304,51 @@ def main(argv: Optional[Sequence[str]] = None) -> None:
     parser = _build_parser()
     args = parser.parse_args(argv)
 
+    printed_log_header = False
+
+    def _stream(line: str) -> None:
+        nonlocal printed_log_header
+        if not printed_log_header:
+            print("\nServer log:", flush=True)
+            printed_log_header = True
+        print(line, flush=True)
+
+    progress_state: dict[str, tuple[Optional[int], Optional[int], str]] = {}
+
+    def _progress(
+        desc: str, current: Optional[int], total: Optional[int], unit: str
+    ) -> None:
+        key = desc or "Processing"
+        state = (current, total, unit)
+        if progress_state.get(key) == state:
+            return
+        progress_state[key] = state
+
+        parts: list[str] = []
+        if current is not None and total and total > 0:
+            percent = (current / total) * 100
+            parts.append(f"{current}/{total}")
+            parts.append(f"{percent:.1f}%")
+        elif current is not None:
+            parts.append(str(current))
+        if unit:
+            parts.append(unit)
+        message = " ".join(parts).strip()
+        print(f"{key}: {message or 'update'}", flush=True)
+
     destination, summary, log_text = send_video(
         input_path=args.input.expanduser(),
         output_path=args.output.expanduser() if args.output else None,
         server_url=args.server,
         small=args.small,
+        log_callback=_stream if args.print_log else None,
+        stream_updates=args.stream,
+        progress_callback=_progress if args.stream else None,
     )
 
     print(summary)
     print(f"Saved processed video to {destination}")
-    if args.print_log:
+    if args.print_log and log_text.strip() and not printed_log_header:
         print("\nServer log:\n" + log_text)
 
 

talks_reducer/version_utils.py

@@ -0,0 +1,22 @@
+"""Utilities for retrieving the Talks Reducer version across environments."""
+
+from __future__ import annotations
+
+from importlib.metadata import PackageNotFoundError, version as metadata_version
+
+try:  # pragma: no cover - defensive fallback when metadata module missing
+    from .__about__ import __version__ as _about_version
+except Exception:  # pragma: no cover - runtime fallback in frozen apps
+    _about_version = ""
+
+
+def resolve_version(package_name: str = "talks-reducer") -> str:
+    """Return the package version, preferring bundled metadata when available."""
+
+    if _about_version:
+        return _about_version
+
+    try:
+        return metadata_version(package_name)
+    except (PackageNotFoundError, Exception):
+        return "unknown"

{talks_reducer-0.5.5.dist-info → talks_reducer-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: talks-reducer
-Version: 0.5.5
+Version: 0.6.1
 Summary: CLI for speeding up long-form talks by removing silence
 Author: Talks Reducer Maintainers
 License-Expression: MIT
@@ -72,12 +72,17 @@ talks-reducer --small input.mp4
 
 Need to offload work to a remote Talks Reducer server? Pass `--url` with the
 server address and the CLI will upload the input, wait for processing to finish,
-and download the rendered video:
+and download the rendered video. You can also provide `--host` to expand to the
+default Talks Reducer port (`http://<host>:9005`):
 
 ```sh
 talks-reducer --url http://localhost:9005 demo.mp4
+talks-reducer --host 192.168.1.42 demo.mp4
 ```
 
+Want to see progress as the remote server works? Add `--server-stream` so the
+CLI prints live progress bars and log lines while you wait for the download.
+
 ### Speech detection
 
 Talks Reducer now relies on its built-in volume thresholding to detect speech. Adjust `--silent_threshold` if you need to fine-tune when segments count as silence. Dropping the optional Silero VAD integration keeps the install lightweight and avoids pulling in PyTorch.
@@ -106,7 +111,8 @@ desktop shortcut without opening the GUI first.
 Pass `--debug` to print verbose logs about the tray icon lifecycle, and
 `--tray-mode pystray-detached` to try pystray's alternate detached runner. If
 the icon backend refuses to appear, fall back to `--tray-mode headless` to keep
-the web server running without a tray process. The tray menu includes an **Open GUI**
+the web server running without a tray process. The tray menu highlights the
+running Talks Reducer version and includes an **Open GUI**
 item (also triggered by double-clicking the icon) that launches the desktop
 Talks Reducer interface alongside an **Open WebUI** entry that opens the Gradio
 page in your browser. Close the GUI window to return to the tray without
@@ -120,13 +126,18 @@ browser automatically—pass `--open-browser` if you prefer the web page to
 launch as soon as the server is ready.
 
 This opens a local web page featuring a drag-and-drop upload zone, a **Small video** checkbox that mirrors the CLI preset, a live
-progress indicator, and automatic previews of the processed output. Once the job completes you can inspect the resulting compression
-ratio and download the rendered video directly from the page.
+progress indicator, and automatic previews of the processed output. The page header and browser tab title include the current
+Talks Reducer version so you can confirm which build the server is running. Once the job completes you can inspect the resulting
+compression ratio and download the rendered video directly from the page.
 
 The desktop GUI mirrors this behaviour. Open **Advanced** settings to provide a
 server URL and click **Discover** to scan your local network for Talks Reducer
-instances listening on port `9005`. Leaving the field blank keeps processing
-local; selecting a discovered server delegates rendering to that machine while
+instances listening on port `9005`. The button now updates with the discovery
+progress, showing the scanned/total host count as `scanned / total`. A new
+**Processing mode** toggle lets you decide whether work stays local or uploads
+to the configured server—the **Remote** option becomes available as soon as a
+URL is supplied. Leave the toggle on **Local** to keep rendering on this
+machine even if a server is saved; switch to **Remote** to hand jobs off while
 the GUI downloads the finished files automatically.
 
 ### Uploading and retrieving a processed video

talks_reducer-0.6.1.dist-info/RECORD

@@ -0,0 +1,22 @@
+talks_reducer/__about__.py,sha256=KW-viuoc2AcVVTHYXfURFg9xsicuBA_X9n4tgL9p2ag,92
+talks_reducer/__init__.py,sha256=Kzh1hXaw6Vq3DyTqrnJGOq8pn0P8lvaDcsg1bFUjFKk,208
+talks_reducer/__main__.py,sha256=azR_vh8HFPLaOnh-L6gUFWsL67I6iHtbeH5rQhsipGY,299
+talks_reducer/audio.py,sha256=sjHMeY0H9ESG-Gn5BX0wFRBX7sXjWwsgS8u9Vb0bJ88,4396
+talks_reducer/chunks.py,sha256=IpdZxRFPURSG5wP-OQ_p09CVP8wcKwIFysV29zOTSWI,2959
+talks_reducer/cli.py,sha256=JH8lvPUyk6jWGcnNRIGJeIh2ZcOvC5CORvj5GLuqq0c,16075
+talks_reducer/discovery.py,sha256=BJ-iMir65cJMs0u-_EYdknBQT_grvCZaJNOx1xGi2PU,4590
+talks_reducer/ffmpeg.py,sha256=dsHBOBcr5XCSg0q3xmzLOcibBiEdyrXdEQa-ze5vQsM,12551
+talks_reducer/gui.py,sha256=mTB4m9LxqqTAaHoNf1QZZ4KfHiSMk0C7SJ5BDhqNR3Q,89777
+talks_reducer/models.py,sha256=6Q_8rmHLyImXp88D4B7ptTbFaH_xXa_yxs8A2dypz2Y,2004
+talks_reducer/pipeline.py,sha256=naAP8gli9MahoxVdla2tRn2vdDuBBU5ywWkYfZLkMcE,12211
+talks_reducer/progress.py,sha256=Mh43M6VWhjjUv9CI22xfD2EJ_7Aq3PCueqefQ9Bd5-o,4565
+talks_reducer/server.py,sha256=IzPe0qkZTs8kqoc9gtGDSWtwN2CTWHVcsYzQah-W3cU,13977
+talks_reducer/server_tray.py,sha256=9jqYfjBpXj7_V_ZlVc7oSDKYRPpG7sOGoxuKvSGEQGM,23373
+talks_reducer/service_client.py,sha256=JnhQhRxVwrGo9eUlduoZ6f_YYyXvjU7hF8UTNprH7TM,10984
+talks_reducer/version_utils.py,sha256=TkYrTznVb2JqxFXzVzPd6PEnYP2MH7dxKl1J4-3DjMA,755
+talks_reducer-0.6.1.dist-info/licenses/LICENSE,sha256=jN17mHNR3e84awmH3AbpWBcBDBzPxEH0rcOFoj1s7sQ,1124
+talks_reducer-0.6.1.dist-info/METADATA,sha256=iTbxOTuZMnT2UG5KmwKDpKuy555CtsTSps7KSPAfJc0,8326
+talks_reducer-0.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+talks_reducer-0.6.1.dist-info/entry_points.txt,sha256=X2pjoh2vWBXXExVWorv1mbA1aTEVP3fyuZH4AixqZK4,208
+talks_reducer-0.6.1.dist-info/top_level.txt,sha256=pJWGcy__LR9JIEKH3QJyFmk9XrIsiFtqvuMNxFdIzDU,14
+talks_reducer-0.6.1.dist-info/RECORD,,

talks_reducer-0.5.5.dist-info/RECORD

@@ -1,21 +0,0 @@
-talks_reducer/__about__.py,sha256=yezjPkWreEY8UO-8bak-0saMNb0oEtJ9FAirgiDvr-Q,92
-talks_reducer/__init__.py,sha256=Kzh1hXaw6Vq3DyTqrnJGOq8pn0P8lvaDcsg1bFUjFKk,208
-talks_reducer/__main__.py,sha256=azR_vh8HFPLaOnh-L6gUFWsL67I6iHtbeH5rQhsipGY,299
-talks_reducer/audio.py,sha256=sjHMeY0H9ESG-Gn5BX0wFRBX7sXjWwsgS8u9Vb0bJ88,4396
-talks_reducer/chunks.py,sha256=IpdZxRFPURSG5wP-OQ_p09CVP8wcKwIFysV29zOTSWI,2959
-talks_reducer/cli.py,sha256=3QSvfX6y6t9XxRa0DSYvsx8SZ5SHSuTlqjp2GMaTSLo,10820
-talks_reducer/discovery.py,sha256=vuQ74YyqTp0y4qabWU6d1NPRst5-Ae7gJ7-KSkNgQNM,3659
-talks_reducer/ffmpeg.py,sha256=dsHBOBcr5XCSg0q3xmzLOcibBiEdyrXdEQa-ze5vQsM,12551
-talks_reducer/gui.py,sha256=BkbrzzUFOAT_7bJzkZCjvNn6TavDFQhnG3VnLgYq60M,69716
-talks_reducer/models.py,sha256=6Q_8rmHLyImXp88D4B7ptTbFaH_xXa_yxs8A2dypz2Y,2004
-talks_reducer/pipeline.py,sha256=JnWa84sMwYncGv7crhGLZu0cW1Xx0eGQyFP-nLp-DHk,12222
-talks_reducer/progress.py,sha256=Mh43M6VWhjjUv9CI22xfD2EJ_7Aq3PCueqefQ9Bd5-o,4565
-talks_reducer/server.py,sha256=R3RORNaZZMGHUNYV6J6IQkFjoR_UJb4y1hmh1tONl60,11240
-talks_reducer/server_tray.py,sha256=lC0D-3yWn_RJjwVtemJ-QzObjWLjH01HMrNibPlw84I,13375
-talks_reducer/service_client.py,sha256=Hv3hKBUn2n7M5hLUVHamNphUdMt9bCXUrJaJMZHlE0Q,3088
-talks_reducer-0.5.5.dist-info/licenses/LICENSE,sha256=jN17mHNR3e84awmH3AbpWBcBDBzPxEH0rcOFoj1s7sQ,1124
-talks_reducer-0.5.5.dist-info/METADATA,sha256=1FS759rqbikGdBrY9pqcllenA9diuVgN1xeQXNC-ics,7527
-talks_reducer-0.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-talks_reducer-0.5.5.dist-info/entry_points.txt,sha256=X2pjoh2vWBXXExVWorv1mbA1aTEVP3fyuZH4AixqZK4,208
-talks_reducer-0.5.5.dist-info/top_level.txt,sha256=pJWGcy__LR9JIEKH3QJyFmk9XrIsiFtqvuMNxFdIzDU,14
-talks_reducer-0.5.5.dist-info/RECORD,,