s2t 0.1.0.post1.dev2__tar.gz → 0.1.2__tar.gz

{s2t-0.1.0.post1.dev2 → s2t-0.1.2}/.gitignore

@@ -33,3 +33,5 @@ runs/
 output/
 out/
 data/
+
+.env.twine.example

{s2t-0.1.0.post1.dev2 → s2t-0.1.2}/Makefile

@@ -66,18 +66,26 @@ publish: guard-venv build
 	$(PYTHON) -c 'import importlib.util,sys; sys.exit(0) if importlib.util.find_spec("twine") else sys.exit(1)' || $(PIP) install twine ; \
 	[ -f .env.twine ] && set -a && . ./.env.twine && set +a || true; \
 	if [ "$$ALLOW_CUSTOM_TWINE_USERNAME" = "1" ]; then TWINE_USERNAME="$${TWINE_USERNAME:-__token__}"; else TWINE_USERNAME="__token__"; fi; \
+	# Prefer prod-specific secrets first
+	if [ -n "$$TWINE_PROD_PASSWORD_CMD" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(sh -c "$$TWINE_PROD_PASSWORD_CMD" | head -n1 | tr -d '\r\n')"; fi; \
+	if [ -n "$$PASS_PROD_TWINE_ENTRY" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(pass show "$$PASS_PROD_TWINE_ENTRY" | head -n1 | tr -d '\r\n')"; fi; \
+	# Fallback to generic secrets
 	if [ -n "$$TWINE_PASSWORD_CMD" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(sh -c "$$TWINE_PASSWORD_CMD" | head -n1 | tr -d '\r\n')"; fi; \
 	if [ -n "$$PASS_TWINE_ENTRY" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(pass show "$$PASS_TWINE_ENTRY" | head -n1 | tr -d '\r\n')"; fi; \
-	if [ -z "$$TWINE_PASSWORD" ]; then echo "Error: TWINE_PASSWORD is empty. Provide via .env.twine, TWINE_PASSWORD_CMD, or PASS_TWINE_ENTRY." >&2; exit 2; fi; \
+	if [ -z "$$TWINE_PASSWORD" ]; then echo "Error: TWINE_PASSWORD is empty. Provide via .env.twine, TWINE_*_PASSWORD_CMD, or PASS_*_TWINE_ENTRY." >&2; exit 2; fi; \
 	env TWINE_USERNAME="$$TWINE_USERNAME" TWINE_PASSWORD="$$TWINE_PASSWORD" twine upload --non-interactive $$TWINE_EXTRA_FLAGS dist/*
 
 publish-test: guard-venv build
 	$(PYTHON) -c 'import importlib.util,sys; sys.exit(0) if importlib.util.find_spec("twine") else sys.exit(1)' || $(PIP) install twine ; \
 	[ -f .env.twine ] && set -a && . ./.env.twine && set +a || true; \
 	if [ "$$ALLOW_CUSTOM_TWINE_USERNAME" = "1" ]; then TWINE_USERNAME="$${TWINE_USERNAME:-__token__}"; else TWINE_USERNAME="__token__"; fi; \
+	# Prefer test-specific secrets first
+	if [ -n "$$TWINE_TEST_PASSWORD_CMD" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(sh -c "$$TWINE_TEST_PASSWORD_CMD" | head -n1 | tr -d '\r\n')"; fi; \
+	if [ -n "$$PASS_TEST_TWINE_ENTRY" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(pass show "$$PASS_TEST_TWINE_ENTRY" | head -n1 | tr -d '\r\n')"; fi; \
+	# Fallback to generic secrets
 	if [ -n "$$TWINE_PASSWORD_CMD" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(sh -c "$$TWINE_PASSWORD_CMD" | head -n1 | tr -d '\r\n')"; fi; \
 	if [ -n "$$PASS_TWINE_ENTRY" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(pass show "$$PASS_TWINE_ENTRY" | head -n1 | tr -d '\r\n')"; fi; \
-	if [ -z "$$TWINE_PASSWORD" ]; then echo "Error: TWINE_PASSWORD is empty. Provide via .env.twine, TWINE_PASSWORD_CMD, or PASS_TWINE_ENTRY." >&2; exit 2; fi; \
+	if [ -z "$$TWINE_PASSWORD" ]; then echo "Error: TWINE_PASSWORD is empty. Provide via .env.twine, TWINE_*_PASSWORD_CMD, or PASS_*_TWINE_ENTRY." >&2; exit 2; fi; \
 	env TWINE_USERNAME="$$TWINE_USERNAME" TWINE_PASSWORD="$$TWINE_PASSWORD" twine upload --non-interactive --repository testpypi $$TWINE_EXTRA_FLAGS dist/*
 
 record: guard-venv

{s2t-0.1.0.post1.dev2 → s2t-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s2t
-Version: 0.1.0.post1.dev2
+Version: 0.1.2
 Summary: Speech to Text (s2t): Record audio, run Whisper, export formats, and copy transcript to clipboard.
 Author: Maintainers
 License-Expression: LicenseRef-Proprietary

s2t-0.1.2/docs/SESSION_STATE.md

@@ -0,0 +1,35 @@
+# 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`.

{s2t-0.1.0.post1.dev2 → s2t-0.1.2}/src/s2t/cli.py

@@ -256,6 +256,8 @@ def run_session(opts: SessionOptions) -> int:
     else:
         print("—" * 60)
         print("Transcript (clipboard text):")
+        # Visual separator before the actual transcript text
+        print("=" * 60)
         print(text_final.rstrip("\n"))
 
     if opts.profile:

{s2t-0.1.0.post1.dev2 → s2t-0.1.2}/src/s2t/whisper_engine.py

@@ -29,7 +29,10 @@ class WhisperEngine:
         self.samplerate = samplerate
         self.channels = channels
         self.verbose = verbose
-        self.profile = profile or {}
+        # Use the provided profile dict even if it's empty.
+        # Using `or {}` would create a new dict when an empty one is passed,
+        # breaking shared accumulation with the caller (CLI).
+        self.profile = profile if profile is not None else {}
         self._executor: ThreadPoolExecutor | None = None
 
     def preload(self) -> tuple[ThreadPoolExecutor | None, Future | None]:
@@ -75,10 +78,31 @@ class WhisperEngine:
         frames: int,
         initial_prompt: str | None = None,
     ) -> TranscriptionResult:
+        # Load audio without ffmpeg by reading via soundfile and passing a numpy array
+        # to Whisper. We ensure mono float32 at 16 kHz as expected by Whisper's API.
         task = "translate" if self.translate else "transcribe"
+        import numpy as np
+
+        try:
+            import soundfile as sf
+        except Exception as e:
+            raise RuntimeError("soundfile is required to read recorded audio.") from e
+
+        from .utils import resample_linear
+
+        # Read audio from file (supports WAV/FLAC via libsndfile), convert to mono
+        data, sr = sf.read(str(audio_path), dtype="float32", always_2d=True)
+        # data shape: (n_frames, n_channels). Convert to mono by averaging if needed
+        if data.ndim == 2 and data.shape[1] > 1:
+            mono = data.mean(axis=1)
+        else:
+            mono = data.reshape(-1)
+        # Resample to 16k expected by Whisper when passing arrays
+        mono_16k: np.ndarray = resample_linear(mono, int(sr), 16000)
+
         t0 = time.perf_counter()
         res: dict[str, Any] = model.transcribe(
-            str(audio_path),
+            mono_16k,
             task=task,
             language=self.language,
             fp16=False,

{s2t-0.1.0.post1.dev2 → s2t-0.1.2}/src/s2t.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s2t
-Version: 0.1.0.post1.dev2
+Version: 0.1.2
 Summary: Speech to Text (s2t): Record audio, run Whisper, export formats, and copy transcript to clipboard.
 Author: Maintainers
 License-Expression: LicenseRef-Proprietary

{s2t-0.1.0.post1.dev2 → s2t-0.1.2}/src/s2t.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ Makefile
 README.md
 pyproject.toml
 docs/RELEASING.md
+docs/SESSION_STATE.md
 scripts/bench_transcribe.py
 src/s2t/__init__.py
 src/s2t/cli.py