Skip to content

Speakr is a personal, self-hosted web application designed for transcribing audio recordings

Python

Transcription resolver: admin default hotwords and initial prompt are its last level; language "auto" forces auto-detection past tag, folder and account defaults (#412 audit S6, S9)

Murtaza Nasir1fc997aa7e9c
diff --git a/src/services/transcription_defaults.py b/src/services/transcription_defaults.py
index 762d8531..393fb094 100644
--- a/src/services/transcription_defaults.py
+++ b/src/services/transcription_defaults.py
@@ -142,13 +142,17 @@ def resolve_transcription_params(recording=None, overrides=None, *, tags=None, f
initial_prompt = _override_str('initial_prompt')
transcription_model = _override_str('transcription_model')
# language behaves like every other field: a real override wins; an empty or
- # blank value falls through the tag -> folder -> owner chain.
+ # blank value falls through the tag -> folder -> owner chain. The explicit
+ # value "auto" forces auto-detection and skips the chain (#412 audit S9).
language = _override_str('language')
+ force_auto_language = isinstance(language, str) and language.strip().lower() == 'auto'
+ if force_auto_language:
+ language = None
# Tag defaults — first tag (by order) that supplies each value.
first_tag = tags[0] if tags else None
for tag in tags:
- if not language and tag.default_language:
+ if not language and not force_auto_language and tag.default_language:
language = tag.default_language
if min_speakers is None and tag.default_min_speakers:
min_speakers = tag.default_min_speakers
@@ -163,7 +167,7 @@ def resolve_transcription_params(recording=None, overrides=None, *, tags=None, f
# Folder defaults.
if folder:
- if not language and folder.default_language:
+ if not language and not force_auto_language and folder.default_language:
language = folder.default_language
if min_speakers is None and folder.default_min_speakers:
min_speakers = folder.default_min_speakers
@@ -184,13 +188,24 @@ def resolve_transcription_params(recording=None, overrides=None, *, tags=None, f
# Owner (account-level) defaults.
if owner:
- if not language and owner.transcription_language:
+ if not language and not force_auto_language and owner.transcription_language:
language = owner.transcription_language
if not hotwords and owner.transcription_hotwords:
hotwords = owner.transcription_hotwords
if not initial_prompt and owner.transcription_initial_prompt:
initial_prompt = owner.transcription_initial_prompt
+ # Admin defaults are the last level (#412 audit S6). They used to be
+ # applied only inside the transcription task, so callers that read these
+ # resolved values (upload pre-fill, parity checks) missed them; the task
+ # keeps its fallback for jobs queued before this change.
+ if not hotwords or not initial_prompt:
+ from src.models import SystemSetting
+ if not hotwords:
+ hotwords = (SystemSetting.get_setting('admin_default_hotwords', '') or '').strip() or None
+ if not initial_prompt:
+ initial_prompt = (SystemSetting.get_setting('admin_default_initial_prompt', '') or '').strip() or None
+
# Admin-curated validation / default for the model.
transcription_model = resolve_transcription_model(transcription_model)
diff --git a/tests/test_transcription_resolution_412.py b/tests/test_transcription_resolution_412.py
new file mode 100644
index 00000000..50f4683e
--- /dev/null
+++ b/tests/test_transcription_resolution_412.py
@@ -0,0 +1,73 @@
+"""Transcription settings resolver (#412 audit S6, S9).
+
+S6: the admin default hotwords and initial prompt are the resolver's last
+level, so every caller that reads the resolved values sees them.
+S9: language "auto" forces auto-detection past tag, folder and account
+defaults; an empty value still falls through to them (the rule since f37469d6).
+
+SHARED-DB: the user and admin settings are restored afterwards.
+"""
+
+import os
+import sys
+import uuid
+
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from src.app import app, db
+from src.models import SystemSetting, User
+from src.services.transcription_defaults import resolve_transcription_params
+
+KEYS = ("admin_default_hotwords", "admin_default_initial_prompt")
+
+
+def owner():
+ with app.app_context():
+ old = {k: SystemSetting.get_setting(k, None) for k in KEYS}
+ SystemSetting.set_setting("admin_default_hotwords", "Speakr, WhisperX", setting_type="string")
+ SystemSetting.set_setting("admin_default_initial_prompt", "A business meeting.", setting_type="string")
+ s = uuid.uuid4().hex[:8]
+ u = User(username=f"tr_{s}", email=f"tr_{s}@local.test", password="x", transcription_language="en")
+ db.session.add(u)
+ db.session.commit()
+ uid = u.id
+ yield uid
+ with app.app_context():
+ for k, v in old.items():
+ if v is None:
+ SystemSetting.query.filter_by(key=k).delete()
+ else:
+ SystemSetting.set_setting(k, v, setting_type="string")
+ db.session.delete(db.session.get(User, uid))
+ db.session.commit()
+
+
+def _resolve(uid, **overrides):
+ return resolve_transcription_params(None, overrides, tags=[], folder=None, owner=db.session.get(User, uid))
+
+
+def test_admin_defaults_are_the_last_level(owner):
+ with app.app_context():
+ p = _resolve(owner)
+ assert p["hotwords"] == "Speakr, WhisperX"
+ assert p["initial_prompt"] == "A business meeting."
+
+
+def test_user_values_beat_admin_defaults(owner):
+ with app.app_context():
+ u = db.session.get(User, owner)
+ u.transcription_hotwords = "Quarterly"
+ db.session.commit()
+ assert _resolve(owner)["hotwords"] == "Quarterly"
+ assert _resolve(owner, hotwords="Override")["hotwords"] == "Override"
+
+
+def test_auto_forces_auto_detection_and_empty_falls_through(owner):
+ with app.app_context():
+ assert _resolve(owner, language="auto")["language"] is None
+ assert _resolve(owner, language="")["language"] == "en"
+ assert _resolve(owner)["language"] == "en"
+ assert _resolve(owner, language="de")["language"] == "de"