s2t 0.1.8__tar.gz → 0.1.10__tar.gz

{s2t-0.1.8 → s2t-0.1.10}/AGENTS.md

@@ -18,7 +18,7 @@ Prefer Make targets when available:
 If no Makefile: `python -m venv .venv && source .venv/bin/activate && pip install -e .[dev]`, then `pytest -q`, `ruff check .`, `black --check .`.
 
 ## Coding Style & Naming Conventions
-- Python 3.11+, 4-space indentation, type hints required.
+- Python 3.11–3.12, 4-space indentation, type hints required.
 - Naming: `snake_case` for modules/functions/vars, `PascalCase` for classes.
 - Docstrings: concise, Google-style; include argument/return types when helpful.
 - Tools: `black` (format), `ruff` (lint), `mypy` (types). Keep imports sorted.

s2t-0.1.10/CONTRIBUTING.md

@@ -0,0 +1,36 @@
+# Contributing
+
+Thanks for contributing! This guide summarizes the setup and common development commands.
+
+## Requirements
+- Python 3.11–3.12
+- Recommended: project virtualenv via Makefile
+
+## Setup
+```
+make setup
+```
+
+## Common Commands
+- Format (auto-fix): `make format` (Ruff fixes + Ruff formatter)
+- Lint + type check: `make lint` (Ruff + mypy)
+- Tests: `make test`
+- Full gate (pre-release): `make check`
+
+## Pre-commit Hooks
+Install optional Git hooks locally:
+```
+make precommit-install
+```
+Hooks include Ruff (`--fix`), Ruff formatter, mypy, and basic checks.
+
+## Style & Typing
+- Formatter: Ruff formatter (Black is not used)
+- Linting: Ruff (including import sorting and quality rules)
+- Types: mypy; please use type hints consistently
+
+## Project Structure
+- App code: `src/s2t/` (CLI, modules, utils)
+- Tests: `tests/`
+- Scripts: `scripts/`
+- Docs: `docs/`

{s2t-0.1.8 → s2t-0.1.10}/Makefile

@@ -47,7 +47,7 @@ format: guard-venv ensure-dev
 	$(PYTHON) -m ruff format .
 
 test: guard-venv ensure-dev
-	$(PYTHON) -m pytest -q
+	@$(PYTHON) -m pytest -q || { code=$$?; if [ $$code -eq 5 ]; then echo "No tests collected; treating as success."; exit 0; else exit $$code; fi; }
 
 check: guard-venv ensure-dev lint test
 
@@ -113,5 +113,6 @@ guard-venv:
 #   make tag TAG_PREFIX=v              # default prefix 'v'
 #   make tag REMOTE=origin             # default remote 'origin'
 #   make tag                           # auto-bump patch from latest tag
-tag:
+# Create and push a git tag only after checks pass
+tag: check
 	@VERSION="$(VERSION)" scripts/tag.sh

{s2t-0.1.8/src/s2t.egg-info → s2t-0.1.10}/PKG-INFO

@@ -1,15 +1,16 @@
 Metadata-Version: 2.4
 Name: s2t
-Version: 0.1.8
+Version: 0.1.10
 Summary: Speech to Text (s2t): Record audio, run Whisper, export formats, and copy transcript to clipboard.
 Author: Maintainers
 License-Expression: LicenseRef-Proprietary
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Environment :: Console
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.11
+Requires-Python: <3.13,>=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: sounddevice>=0.4.6
 Requires-Dist: soundfile>=0.12.1
@@ -36,7 +37,7 @@ Record audio from your microphone, run Whisper to transcribe it, export common f
   - Editable: `pip install -e .`
   - Standard: `pip install .`
 
-Requirements: Python 3.11+. No mandatory external binaries. ffmpeg is optional (only for MP3 encoding/decoding).
+Requirements: Python 3.11–3.12. No mandatory external binaries. ffmpeg is optional (only for MP3 encoding/decoding).
 
 System requirements (Linux)
 - Some environments need system libraries for audio I/O:
@@ -91,5 +92,5 @@ Notes on models
 - The name `turbo` refers to OpenAI’s hosted model family and is not provided by the local `whisper` CLI. If you pass `-m turbo`, the command may fail; choose a supported local model instead.
 
 ## Development & Release
-- Für Entwickler-Setup und Beitragshinweise siehe `CONTRIBUTING.md`.
-- Für den Release-Prozess siehe `docs/RELEASING.md`.
+- For developer setup and contribution guidelines, see `CONTRIBUTING.md`.
+- For the release process, see `docs/RELEASING.md`.

{s2t-0.1.8 → s2t-0.1.10}/README.md

@@ -7,7 +7,7 @@ Record audio from your microphone, run Whisper to transcribe it, export common f
   - Editable: `pip install -e .`
   - Standard: `pip install .`
 
-Requirements: Python 3.11+. No mandatory external binaries. ffmpeg is optional (only for MP3 encoding/decoding).
+Requirements: Python 3.11–3.12. No mandatory external binaries. ffmpeg is optional (only for MP3 encoding/decoding).
 
 System requirements (Linux)
 - Some environments need system libraries for audio I/O:
@@ -62,5 +62,5 @@ Notes on models
 - The name `turbo` refers to OpenAI’s hosted model family and is not provided by the local `whisper` CLI. If you pass `-m turbo`, the command may fail; choose a supported local model instead.
 
 ## Development & Release
-- Für Entwickler-Setup und Beitragshinweise siehe `CONTRIBUTING.md`.
-- Für den Release-Prozess siehe `docs/RELEASING.md`.
+- For developer setup and contribution guidelines, see `CONTRIBUTING.md`.
+- For the release process, see `docs/RELEASING.md`.

s2t-0.1.10/docs/RELEASING.md

@@ -0,0 +1,18 @@
+# Releasing
+
+Versioning and releases are powered by `setuptools-scm` (PEP 621 dynamic version):
+
+- Versions are derived from Git tags (e.g., `v0.1.0`).
+- During development (without a tag) a fallback version is used; with a tag the package gets the exact version.
+
+## Steps
+1. Create and push a tag, for example:
+   - `git tag v0.1.1`
+   - `git push --tags`
+2. Publish to TestPyPI or PyPI:
+   - `make publish-test` or `make publish`
+   - These targets build artifacts first (`make build`) and run checks (`make check`).
+
+## Build Details
+- `make check` runs formatting/linting/type checking and tests.
+- `make build` creates the sdist and wheel.

s2t-0.1.10/docs/SESSION_STATE.md

@@ -0,0 +1,35 @@
+# Session State
+
+Status: Preparing deployment; the package builds and passes type checks. Upload to TestPyPI is pending.
+
+## Changes This Session (Summary)
+- Switched to Ruff-only formatting (removed Black); `make format`/`make lint` perform auto-fixes.
+- Fixed mypy issues strictly (TypedDicts in `src/s2t/types.py`).
+- Moved third‑party stubs to `stubs/` (`sounddevice`, `soundfile`, `pyperclip`, `whisper`).
+- Marked package as typed (`src/s2t/py.typed`) and excluded stubs from the sdist via `MANIFEST.in`.
+- Updated pyproject: Ruff configuration and license field to SPDX style (`LicenseRef-Proprietary`).
+- Docs: streamlined README; added `CONTRIBUTING.md` and `docs/RELEASING.md`. Added Linux system library notes.
+- Build verified: `make build` produces a valid wheel + sdist; `twine check dist/*` passes.
+
+## Open Steps (for TestPyPI/PyPI)
+1) Provide TestPyPI credentials (one of):
+   - Project-local `.env.twine` (gitignored) with:
+     - `TWINE_USERNAME=__token__`
+     - `TWINE_PASSWORD=your_testpypi_api_token`
+   - or configure `~/.pypirc` (testpypi section).
+2) Trigger upload:
+   - `make publish-test`
+3) Validate installation in a fresh venv:
+   - `python -m venv .venv-test && source .venv-test/bin/activate`
+   - `pip install --index-url https://test.pypi.org/simple --extra-index-url https://pypi.org/simple s2t`
+   - Smoke test: `s2t -h`, optionally `s2t -L`
+4) If OK: upload to PyPI
+   - `make publish` (with PyPI token analogous to TestPyPI)
+
+## Notes
+- Linux: install `libportaudio2` and `libsndfile1` if needed; ffmpeg is optional for MP3.
+- No secrets in the repo: `.env.twine` is excluded via `.gitignore`.
+
+## Re-entry
+- If `.env.twine` already exists: run `make publish-test` directly.
+- Then test the installation as above; if successful, run `make publish`.

{s2t-0.1.8 → s2t-0.1.10}/pyproject.toml

@@ -11,7 +11,7 @@ name = "s2t"
 dynamic = ["version"]
 description = "Speech to Text (s2t): Record audio, run Whisper, export formats, and copy transcript to clipboard."
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.11,<3.13"
 license = "LicenseRef-Proprietary"
 authors = [
   { name = "Maintainers" }
@@ -27,6 +27,7 @@ classifiers = [
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Environment :: Console",
   "Operating System :: OS Independent",
 ]
@@ -72,7 +73,7 @@ select = ["E", "F", "I", "B", "UP"]
 ignore = ["E501"]
 
 [tool.ruff.format]
-# Ruff-Formatter übernimmt die Formatierung (Black ersetzt)
+# Ruff formatter handles formatting (replaces Black)
 quote-style = "preserve"
 
 [tool.pytest.ini_options]

{s2t-0.1.8 → s2t-0.1.10}/scripts/tag.sh

@@ -34,6 +34,13 @@ fi
 TAG="${TAG_PREFIX}${VER}"
 echo "Preparing tag ${TAG} (remote ${REMOTE})"
 
+# Ensure clean working tree (no uncommitted changes or untracked files)
+if [[ -n "$(git status --porcelain)" ]]; then
+  echo "Error: working tree is not clean. Commit, stash, or remove changes before tagging." >&2
+  git status --porcelain
+  exit 1
+fi
+
 # Remove existing tag locally/remote if present
 git tag -d "${TAG}" >/dev/null 2>&1 || true
 git push "${REMOTE}" --delete "${TAG}" >/dev/null 2>&1 || true
@@ -42,4 +49,3 @@ git push "${REMOTE}" --delete "${TAG}" >/dev/null 2>&1 || true
 git tag -a "${TAG}" -m "Release ${TAG}"
 git push "${REMOTE}" "${TAG}"
 echo "Tag ${TAG} pushed to ${REMOTE}"
-

{s2t-0.1.8 → s2t-0.1.10}/src/s2t/cli.py

@@ -99,7 +99,8 @@ def run_session(opts: SessionOptions) -> int:
             detected_lang_holder=detected_lang,
         )
 
-    tx_q: queue.Queue[tuple[int, Path, int, float]] = queue.Queue()
+    # Include split cause per chunk: "space" (manual), "pause" (auto), "finish" (final)
+    tx_q: queue.Queue[tuple[int, Path, int, float, str]] = queue.Queue()
     cumulative_text = ""
     next_to_emit = 1
     pending: dict[int, str] = {}
@@ -150,8 +151,9 @@ def run_session(opts: SessionOptions) -> int:
         model = engine.resolve_model(fut)
         nonlocal cumulative_text, next_to_emit
         finished_texts: dict[int, str] = {}
+        causes: dict[int, str] = {}
         while True:
-            idx, path, frames, offset = tx_q.get()
+            idx, path, frames, offset, cause = tx_q.get()
             if idx == -1:
                 break
             # If in spoken-prompt mode, ensure we don't process payload chunks before prompt is done
@@ -174,12 +176,21 @@ def run_session(opts: SessionOptions) -> int:
                 results.append(res)
                 offsets.append(offset)
                 pending[idx] = text_i
+                # Track cause for formatting when emitting in-order
+                # cause is one of: "space", "pause", "finish" (or empty for sentinel)
+                # Default to "pause" if unknown to avoid extra blank lines.
+                causes[idx] = cause or "pause"
                 while next_to_emit in pending:
                     out = pending.pop(next_to_emit)
                     if out:
+                        # Determine separator based on split cause
+                        sep = "\n\n" if causes.get(next_to_emit) == "space" else "\n"
                         print(out)
-                        print("")
-                        cumulative_text += out if not cumulative_text else ("\n\n" + out)
+                        if causes.get(next_to_emit) == "space":
+                            # Space -> insert a blank line after the chunk
+                            print("")
+                        # Build cumulative text with matching separators
+                        cumulative_text += out if not cumulative_text else (sep + out)
                         try:
                             copy_to_clipboard(cumulative_text)
                         except Exception:
@@ -446,7 +457,7 @@ def main(argv: list[str] | None = None) -> int:
     parser.add_argument(
         "--silence-sec",
         type=float,
-        default=1.0,
+        default=2.0,
         help="Auto-split when continuous silence >= this many seconds (0 disables)",
     )
     parser.add_argument(

{s2t-0.1.8 → s2t-0.1.10}/src/s2t/recorder.py

@@ -41,7 +41,7 @@ class Recorder:
 
     def run(
         self,
-        tx_queue: queue.Queue[tuple[int, Path, int, float]],
+        tx_queue: queue.Queue[tuple[int, Path, int, float, str]],
     ) -> tuple[list[Path], list[int], list[float]]:
         import platform
         import termios
@@ -224,7 +224,7 @@ class Recorder:
             threshold_rms = 0.015  # conservative RMS threshold for float32 [-1,1]
             split_cooldown_sec = 0.2
 
-            def _do_split() -> None:
+            def _do_split(cause: str) -> None:
                 nonlocal fh, frames_written, cur_path, chunk_index, offset_seconds_total
                 fh.flush()
                 fh.close()
@@ -239,7 +239,9 @@ class Recorder:
                             f"Saved chunk: {cur_path.name} ({dur:.2f}s)",
                             file=sys.stderr,
                         )
-                    tx_queue.put((chunk_index, cur_path, frames_written, chunk_offsets[-1]))
+                    # Include split cause so downstream can format output accordingly
+                    # cause: "space" (manual split) or "pause" (auto-split)
+                    tx_queue.put((chunk_index, cur_path, frames_written, chunk_offsets[-1], cause))
                 else:
                     try:
                         cur_path.unlink(missing_ok=True)
@@ -270,8 +272,13 @@ class Recorder:
                 try:
                     while True:
                         cmd = ctrl_q.get_nowait()
-                        if cmd == "split":
-                            _do_split()
+                        if cmd == "split_manual":
+                            _do_split("space")
+                            # Reset silence tracking on manual split
+                            silent_frames_run = 0
+                            seen_non_silent = False
+                        elif cmd == "split_auto":
+                            _do_split("pause")
                             # Reset silence tracking on manual split
                             silent_frames_run = 0
                             seen_non_silent = False
@@ -289,15 +296,22 @@ class Recorder:
                                         f"Saved chunk: {cur_path.name} ({dur:.2f}s)",
                                         file=sys.stderr,
                                     )
+                                # Final chunk – mark cause as "finish" so downstream can avoid extra blank spacing
                                 tx_queue.put(
-                                    (chunk_index, cur_path, frames_written, chunk_offsets[-1])
+                                    (
+                                        chunk_index,
+                                        cur_path,
+                                        frames_written,
+                                        chunk_offsets[-1],
+                                        "finish",
+                                    )
                                 )
                             else:
                                 try:
                                     cur_path.unlink(missing_ok=True)
                                 except Exception:
                                     pass
-                            tx_queue.put((-1, Path(), 0, 0.0))
+                            tx_queue.put((-1, Path(), 0, 0.0, ""))
                             return
                 except queue.Empty:
                     pass
@@ -348,12 +362,12 @@ class Recorder:
                                     file=sys.stderr,
                                 )
                             last_split_time = time.perf_counter()
-                            # Queue a split for the next control phase
-                            ctrl_q.put("split")
+                            # Queue an auto split for the next control phase
+                            ctrl_q.put("split_auto")
                             # Reset silence tracking now to avoid cascaded triggers
                             silent_frames_run = 0
                             seen_non_silent = False
-            tx_queue.put((-1, Path(), 0, 0.0))
+            tx_queue.put((-1, Path(), 0, 0.0, ""))
 
         def cb(indata: Any, frames: int, time_info: Any, status: Any) -> None:
             if status:
@@ -384,7 +398,7 @@ class Recorder:
                 except queue.Empty:
                     continue
                 if evt == "SPACE":
-                    ctrl_q.put("split")
+                    ctrl_q.put("split_manual")
                 elif evt == "ENTER":
                     ctrl_q.put("finish")
                     break

{s2t-0.1.8 → s2t-0.1.10/src/s2t.egg-info}/PKG-INFO

@@ -1,15 +1,16 @@
 Metadata-Version: 2.4
 Name: s2t
-Version: 0.1.8
+Version: 0.1.10
 Summary: Speech to Text (s2t): Record audio, run Whisper, export formats, and copy transcript to clipboard.
 Author: Maintainers
 License-Expression: LicenseRef-Proprietary
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Environment :: Console
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.11
+Requires-Python: <3.13,>=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: sounddevice>=0.4.6
 Requires-Dist: soundfile>=0.12.1
@@ -36,7 +37,7 @@ Record audio from your microphone, run Whisper to transcribe it, export common f
   - Editable: `pip install -e .`
   - Standard: `pip install .`
 
-Requirements: Python 3.11+. No mandatory external binaries. ffmpeg is optional (only for MP3 encoding/decoding).
+Requirements: Python 3.11–3.12. No mandatory external binaries. ffmpeg is optional (only for MP3 encoding/decoding).
 
 System requirements (Linux)
 - Some environments need system libraries for audio I/O:
@@ -91,5 +92,5 @@ Notes on models
 - The name `turbo` refers to OpenAI’s hosted model family and is not provided by the local `whisper` CLI. If you pass `-m turbo`, the command may fail; choose a supported local model instead.
 
 ## Development & Release
-- Für Entwickler-Setup und Beitragshinweise siehe `CONTRIBUTING.md`.
-- Für den Release-Prozess siehe `docs/RELEASING.md`.
+- For developer setup and contribution guidelines, see `CONTRIBUTING.md`.
+- For the release process, see `docs/RELEASING.md`.

s2t-0.1.8/CONTRIBUTING.md

@@ -1,37 +0,0 @@
-# Contributing
-
-Danke für deinen Beitrag! Hier findest du die wichtigsten Hinweise für Entwicklung und Checks.
-
-## Voraussetzungen
-- Python 3.11+
-- Empfohlen: Projekt-venv via Makefile
-
-## Setup
-```
-make setup
-```
-
-## Wichtige Befehle
-- Formatieren (auto-fix): `make format`  (Ruff Lint-Fixes + Ruff Formatter)
-- Lint + Typprüfung (auto-fix + mypy): `make lint`
-- Tests: `make test`
-- Kombiniert (Gate vor Build/Release): `make check`
-
-## Pre-commit Hooks
-Installiere optionale Git-Hooks lokal:
-```
-make precommit-install
-```
-Aktive Hooks: Ruff (`--fix`), Ruff Formatter, mypy und Basis-Hooks.
-
-## Stil & Typen
-- Formatter: Ruff Formatter (Black wurde entfernt)
-- Linting: Ruff (Importsortierung, Qualitätsregeln)
-- Typen: mypy; bitte durchgängig Typannotationen nutzen
-
-## Struktur
-- App-Code: `src/transcriber/` (CLI, Module)
-- Tests: `tests/`
-- Scripts: `scripts/`
-- Docs: `docs/`
-

s2t-0.1.8/docs/RELEASING.md

@@ -1,19 +0,0 @@
-# Releasing
-
-Versionierung und Releases basieren auf `setuptools-scm` (PEP 621, dynamische Version):
-
-- Versionen werden über Git-Tags abgeleitet (z. B. `v0.1.0`).
-- Während der Entwicklung (ohne Tag) wird eine Fallback-Version genutzt; mit Tag erhält das Paket die exakte Version.
-
-## Schritte
-1. Tag erstellen und pushen, z. B.:
-   - `git tag v0.1.1`
-   - `git push --tags`
-2. Optional TestPyPI, sonst direkt PyPI:
-   - `make publish-test` oder `make publish`
-   - Diese Targets bauen zuvor (`make build`) und führen Checks aus (`make check`).
-
-## Build-Details
-- `make check` führt Format/Lint/Typprüfung und Tests aus.
-- `make build` erzeugt sdist und Wheel.
-

s2t-0.1.8/docs/SESSION_STATE.md

@@ -1,35 +0,0 @@
-# Session State
-
-Stand: Deployment vorbereiten, Paket ist baubar und typgeprüft. Upload zu TestPyPI steht aus.
-
-## Änderungen dieser Session (Kurzfassung)
-- Formatter auf nur Ruff umgestellt (Black entfernt); Makefile `format`/`lint` fixen automatisch.
-- mypy-Fehler streng behoben (TypedDicts in `src/s2t/types.py`).
-- Drittanbieter-Stubs nach `stubs/` verschoben (`sounddevice`, `soundfile`, `pyperclip`, `whisper`).
-- Paket als "typed" markiert (`src/s2t/py.typed`) und Stubs via `MANIFEST.in` vom sdist ausgeschlossen.
-- pyproject: Ruff-Konfig aktualisiert, Lizenzfeld auf SPDX-Form (`LicenseRef-Proprietary`).
-- Doku: README verschlankt; `CONTRIBUTING.md`, `docs/RELEASING.md` hinzugefügt. Linux Systemlibs-Hinweis ergänzt.
-- Build geprüft: `make build` erzeugt gültiges Wheel + sdist; `twine check dist/*` ist grün.
-
-## Offene Schritte (für TestPyPI/PyPI)
-1) TestPyPI-Creds bereitstellen (eine der Optionen):
-   - `.env.twine` im Projekt (gitignored) mit:
-     - `TWINE_USERNAME=__token__`
-     - `TWINE_PASSWORD=dein_testpypi_api_token`
-   - oder `~/.pypirc` konfigurieren (testpypi Sektion).
-2) Upload anstoßen:
-   - `make publish-test`
-3) Installation validieren in frischem venv:
-   - `python -m venv .venv-test && source .venv-test/bin/activate`
-   - `pip install --index-url https://test.pypi.org/simple --extra-index-url https://pypi.org/simple s2t`
-   - Smoke: `s2t -h`, optional `s2t -L`
-4) Wenn ok: PyPI-Upload
-   - `make publish` (mit PyPI-Token analog zu TestPyPI)
-
-## Hinweise
-- Linux: ggf. `libportaudio2` und `libsndfile1` installieren; ffmpeg optional für MP3.
-- Keine Secrets im Repo: `.env.twine` ist per `.gitignore` ausgeschlossen.
-
-## Wiedereinstieg
-- Falls `.env.twine` schon existiert: direkt `make publish-test` ausführen.
-- Danach Installation wie oben testen; bei Erfolg `make publish`.