refactor(server): plumb Arc<Settings> through workers and routes
Config sheds its 14 Bucket-B fields (retention, whisper, ollama, llm) and gains a sibling Arc<Settings> in AppState, loaded from settings.toml at startup via Settings::load_or_default. Workers (transcribe, analyze, recovery, auto_trigger) and routes (health, bulk, case_actions, user_web) take settings as a separate parameter or State<> extractor; Config::llm_configured moves to Settings::llm_configured. TestConfig::build_pair() returns (Arc<Config>, Arc<Settings>); the new create_router_with_settings / create_router_and_session_store_with_settings helpers wire both into integration tests that exercise LLM/Whisper/Ollama. The legacy single-Arc create_router falls back to Settings::default() so the 17 non-LLM tests stay untouched. Verified: cargo build clean, clippy --all-targets clean, 318 tests pass.
This commit is contained in:
@@ -19,10 +19,10 @@ use tokio::io::AsyncWriteExt;
|
|||||||
use tracing::warn;
|
use tracing::warn;
|
||||||
|
|
||||||
use super::{ANALYSIS_INPUT_FILE, AnalysisInput, AnalyzeJob, AnalyzeSender, DOCUMENT_FILE};
|
use super::{ANALYSIS_INPUT_FILE, AnalysisInput, AnalyzeJob, AnalyzeSender, DOCUMENT_FILE};
|
||||||
use crate::config::Config;
|
|
||||||
use crate::events::{self, CaseEventKind, EventSender};
|
use crate::events::{self, CaseEventKind, EventSender};
|
||||||
use crate::paths;
|
use crate::paths;
|
||||||
use crate::routes::case_actions::build_analysis_input;
|
use crate::routes::case_actions::build_analysis_input;
|
||||||
|
use crate::settings::Settings;
|
||||||
|
|
||||||
/// Filename of the per-case failure marker. Written by the worker on
|
/// Filename of the per-case failure marker. Written by the worker on
|
||||||
/// error, deleted on success. Presence with a matching
|
/// error, deleted on success. Presence with a matching
|
||||||
@@ -99,10 +99,10 @@ pub async fn evaluate_case(case_dir: &Path) -> AutoDecision {
|
|||||||
pub async fn try_enqueue(
|
pub async fn try_enqueue(
|
||||||
case_dir: &Path,
|
case_dir: &Path,
|
||||||
tx: &AnalyzeSender,
|
tx: &AnalyzeSender,
|
||||||
config: &Arc<Config>,
|
settings: &Arc<Settings>,
|
||||||
events_tx: &EventSender,
|
events_tx: &EventSender,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
if !config.llm_configured() {
|
if !settings.llm_configured() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,7 +159,7 @@ pub async fn try_enqueue(
|
|||||||
pub async fn try_enqueue_all_for_user(
|
pub async fn try_enqueue_all_for_user(
|
||||||
user_root: &Path,
|
user_root: &Path,
|
||||||
tx: &AnalyzeSender,
|
tx: &AnalyzeSender,
|
||||||
config: &Arc<Config>,
|
settings: &Arc<Settings>,
|
||||||
events_tx: &EventSender,
|
events_tx: &EventSender,
|
||||||
) {
|
) {
|
||||||
let Ok(mut entries) = tokio::fs::read_dir(user_root).await else {
|
let Ok(mut entries) = tokio::fs::read_dir(user_root).await else {
|
||||||
@@ -179,7 +179,7 @@ pub async fn try_enqueue_all_for_user(
|
|||||||
if crate::paths::is_closed(&case_path).await {
|
if crate::paths::is_closed(&case_path).await {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
try_enqueue(&case_path, tx, config, events_tx).await;
|
try_enqueue(&case_path, tx, settings, events_tx).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -466,8 +466,8 @@ mod tests {
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn try_enqueue_all_sends_only_eligible_cases() {
|
async fn try_enqueue_all_sends_only_eligible_cases() {
|
||||||
use crate::analyze::channel as analyze_channel;
|
use crate::analyze::channel as analyze_channel;
|
||||||
use crate::config::Config;
|
|
||||||
use crate::events::channel as events_channel;
|
use crate::events::channel as events_channel;
|
||||||
|
use crate::settings::Settings;
|
||||||
|
|
||||||
let user_root = TempDir::new().unwrap();
|
let user_root = TempDir::new().unwrap();
|
||||||
|
|
||||||
@@ -515,12 +515,12 @@ mod tests {
|
|||||||
|
|
||||||
let (tx, mut rx) = analyze_channel();
|
let (tx, mut rx) = analyze_channel();
|
||||||
let events_tx = events_channel();
|
let events_tx = events_channel();
|
||||||
let mut cfg = Config::test_default();
|
let mut settings = Settings::default();
|
||||||
cfg.llm_url = "http://localhost:9999".into();
|
settings.llm.url = "http://localhost:9999".into();
|
||||||
cfg.llm_model = "test".into();
|
settings.llm.model = "test".into();
|
||||||
let cfg = Arc::new(cfg);
|
let settings = Arc::new(settings);
|
||||||
|
|
||||||
try_enqueue_all_for_user(user_root.path(), &tx, &cfg, &events_tx).await;
|
try_enqueue_all_for_user(user_root.path(), &tx, &settings, &events_tx).await;
|
||||||
|
|
||||||
// Drop the sender half so recv closes after draining.
|
// Drop the sender half so recv closes after draining.
|
||||||
drop(tx);
|
drop(tx);
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ use tracing::{error, info, warn};
|
|||||||
use super::{
|
use super::{
|
||||||
ANALYSIS_INPUT_FILE, AnalysisInput, AnalyzeReceiver, DOCUMENT_FILE, auto_trigger, llm, prompt,
|
ANALYSIS_INPUT_FILE, AnalysisInput, AnalyzeReceiver, DOCUMENT_FILE, auto_trigger, llm, prompt,
|
||||||
};
|
};
|
||||||
use crate::config::Config;
|
|
||||||
use crate::events::{self, CaseEventKind, EventSender};
|
use crate::events::{self, CaseEventKind, EventSender};
|
||||||
use crate::gazetteer::Gazetteer;
|
use crate::gazetteer::Gazetteer;
|
||||||
|
use crate::settings::Settings;
|
||||||
use crate::{BusyGuard, WorkerBusy};
|
use crate::{BusyGuard, WorkerBusy};
|
||||||
|
|
||||||
/// Consume analyze jobs sequentially. The external LLM tolerates parallelism,
|
/// Consume analyze jobs sequentially. The external LLM tolerates parallelism,
|
||||||
@@ -18,18 +18,26 @@ use crate::{BusyGuard, WorkerBusy};
|
|||||||
/// provider from bursts. Trivial to lift later via `tokio::spawn(process(..))`.
|
/// provider from bursts. Trivial to lift later via `tokio::spawn(process(..))`.
|
||||||
pub async fn run(
|
pub async fn run(
|
||||||
mut rx: AnalyzeReceiver,
|
mut rx: AnalyzeReceiver,
|
||||||
config: Arc<Config>,
|
settings: Arc<Settings>,
|
||||||
client: reqwest::Client,
|
client: reqwest::Client,
|
||||||
worker_busy: WorkerBusy,
|
worker_busy: WorkerBusy,
|
||||||
vocab: Arc<Gazetteer>,
|
vocab: Arc<Gazetteer>,
|
||||||
events_tx: EventSender,
|
events_tx: EventSender,
|
||||||
) {
|
) {
|
||||||
info!(vocab_entries = vocab.len(), "Analyze worker started");
|
info!(vocab_entries = vocab.len(), "Analyze worker started");
|
||||||
let timeout = Duration::from_secs(config.llm_timeout_seconds);
|
let timeout = Duration::from_secs(settings.llm.timeout_seconds);
|
||||||
|
|
||||||
while let Some(job) = rx.recv().await {
|
while let Some(job) = rx.recv().await {
|
||||||
let _guard = BusyGuard::new(worker_busy.clone());
|
let _guard = BusyGuard::new(worker_busy.clone());
|
||||||
process(&job.case_dir, &config, &client, &vocab, timeout, &events_tx).await;
|
process(
|
||||||
|
&job.case_dir,
|
||||||
|
&settings,
|
||||||
|
&client,
|
||||||
|
&vocab,
|
||||||
|
timeout,
|
||||||
|
&events_tx,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
|
|
||||||
warn!("Analyze worker stopped (channel closed)");
|
warn!("Analyze worker stopped (channel closed)");
|
||||||
@@ -37,7 +45,7 @@ pub async fn run(
|
|||||||
|
|
||||||
async fn process(
|
async fn process(
|
||||||
case_dir: &Path,
|
case_dir: &Path,
|
||||||
config: &Config,
|
settings: &Settings,
|
||||||
client: &reqwest::Client,
|
client: &reqwest::Client,
|
||||||
vocab: &Gazetteer,
|
vocab: &Gazetteer,
|
||||||
timeout: Duration,
|
timeout: Duration,
|
||||||
@@ -106,16 +114,16 @@ async fn process(
|
|||||||
// document write below, the recovery scan will re-enqueue this job and
|
// document write below, the recovery scan will re-enqueue this job and
|
||||||
// the call will be made again. Accepted cost — rare event, small
|
// the call will be made again. Accepted cost — rare event, small
|
||||||
// per-call price. Response-caching in a `.tmp` file would prevent it.
|
// per-call price. Response-caching in a `.tmp` file would prevent it.
|
||||||
let settings = llm::LlmSettings {
|
let llm_settings = llm::LlmSettings {
|
||||||
base_url: &config.llm_url,
|
base_url: &settings.llm.url,
|
||||||
api_key: &config.llm_api_key,
|
api_key: &settings.llm.api_key,
|
||||||
model: &config.llm_model,
|
model: &settings.llm.model,
|
||||||
temperature: config.llm_temperature,
|
temperature: settings.llm.temperature,
|
||||||
};
|
};
|
||||||
let document = match llm::chat_once(
|
let document = match llm::chat_once(
|
||||||
client,
|
client,
|
||||||
&settings,
|
&llm_settings,
|
||||||
&config.llm_system_prompt,
|
&settings.llm.system_prompt,
|
||||||
&user_content,
|
&user_content,
|
||||||
timeout,
|
timeout,
|
||||||
)
|
)
|
||||||
|
|||||||
+3
-63
@@ -75,6 +75,9 @@ struct UsersFile {
|
|||||||
user: Vec<User>,
|
user: Vec<User>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Bootstrap config loaded once from `.env` at startup. Runtime-tunable
|
||||||
|
/// values (retention, whisper/ollama/llm endpoints, prompts) live in
|
||||||
|
/// `Settings` (loaded from `settings.toml`).
|
||||||
pub struct Config {
|
pub struct Config {
|
||||||
// Phase 1 — required
|
// Phase 1 — required
|
||||||
pub server_port: u16,
|
pub server_port: u16,
|
||||||
@@ -86,24 +89,6 @@ pub struct Config {
|
|||||||
pub api_keys: HashMap<String, String>, // api_key_value → slug
|
pub api_keys: HashMap<String, String>, // api_key_value → slug
|
||||||
|
|
||||||
// Phase 2+ — optional with defaults
|
// Phase 2+ — optional with defaults
|
||||||
pub retention_audio_days: u32,
|
|
||||||
pub retention_transcript_days: u32,
|
|
||||||
pub retention_document_days: u32,
|
|
||||||
pub whisper_url: String,
|
|
||||||
pub whisper_timeout_seconds: u64,
|
|
||||||
pub ollama_url: String,
|
|
||||||
pub ollama_model: String,
|
|
||||||
pub ollama_keep_alive: u32,
|
|
||||||
pub llm_url: String,
|
|
||||||
pub llm_api_key: String,
|
|
||||||
pub llm_model: String,
|
|
||||||
pub llm_temperature: f32,
|
|
||||||
pub llm_timeout_seconds: u64,
|
|
||||||
/// System prompt sent to the analysis LLM. Defaults to
|
|
||||||
/// `crate::analyze::prompt::SYSTEM_PROMPT` if `LLM_SYSTEM_PROMPT` is unset
|
|
||||||
/// or empty. Runtime-configurable so admins can iterate and use the
|
|
||||||
/// "Neu analysieren" button to re-run cases.
|
|
||||||
pub llm_system_prompt: String,
|
|
||||||
/// Directory containing gazetteer `*.txt` files (anatomy, substances,
|
/// Directory containing gazetteer `*.txt` files (anatomy, substances,
|
||||||
/// medications). Loaded once at startup; a missing directory is a
|
/// medications). Loaded once at startup; a missing directory is a
|
||||||
/// non-fatal WARN — analysis runs without proper-name correction.
|
/// non-fatal WARN — analysis runs without proper-name correction.
|
||||||
@@ -135,27 +120,6 @@ impl Config {
|
|||||||
users,
|
users,
|
||||||
api_keys,
|
api_keys,
|
||||||
|
|
||||||
retention_audio_days: optional_env_parsed("RETENTION_AUDIO_DAYS", 30),
|
|
||||||
retention_transcript_days: optional_env_parsed("RETENTION_TRANSCRIPT_DAYS", 30),
|
|
||||||
retention_document_days: optional_env_parsed("RETENTION_DOCUMENT_DAYS", 0),
|
|
||||||
whisper_url: optional_env("WHISPER_URL", "http://localhost:10300"),
|
|
||||||
whisper_timeout_seconds: optional_env_parsed("WHISPER_TIMEOUT_SECONDS", 120),
|
|
||||||
ollama_url: optional_env("OLLAMA_URL", "http://localhost:11434"),
|
|
||||||
ollama_model: optional_env("OLLAMA_MODEL", "gemma3:4b"),
|
|
||||||
ollama_keep_alive: optional_env_parsed("OLLAMA_KEEP_ALIVE", 0),
|
|
||||||
llm_url: optional_env("LLM_URL", ""),
|
|
||||||
llm_api_key: optional_env("LLM_API_KEY", ""),
|
|
||||||
llm_model: optional_env("LLM_MODEL", ""),
|
|
||||||
llm_temperature: optional_env_parsed("LLM_TEMPERATURE", 0.0),
|
|
||||||
llm_timeout_seconds: optional_env_parsed("LLM_TIMEOUT_SECONDS", 180),
|
|
||||||
llm_system_prompt: {
|
|
||||||
let v = optional_env("LLM_SYSTEM_PROMPT", "");
|
|
||||||
if v.is_empty() {
|
|
||||||
crate::analyze::prompt::SYSTEM_PROMPT.to_string()
|
|
||||||
} else {
|
|
||||||
v
|
|
||||||
}
|
|
||||||
},
|
|
||||||
vocab_dir: PathBuf::from(optional_env("VOCAB_DIR", "./vocab")),
|
vocab_dir: PathBuf::from(optional_env("VOCAB_DIR", "./vocab")),
|
||||||
hunspell_dict_path: PathBuf::from(optional_env(
|
hunspell_dict_path: PathBuf::from(optional_env(
|
||||||
"HUNSPELL_DICT",
|
"HUNSPELL_DICT",
|
||||||
@@ -166,16 +130,6 @@ impl Config {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// True iff the external analysis LLM is configured. `llm_api_key` is
|
|
||||||
/// intentionally **not** required — Ollama's OpenAI-compatible endpoint
|
|
||||||
/// at `/v1/chat/completions` accepts unauthenticated requests and is a
|
|
||||||
/// supported deployment target. For hosted providers (Ionos, OpenAI) the
|
|
||||||
/// key remains necessary in practice; the provider will reject with 401
|
|
||||||
/// if it is missing, which is correct feedback.
|
|
||||||
pub fn llm_configured(&self) -> bool {
|
|
||||||
!self.llm_url.is_empty() && !self.llm_model.is_empty()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Sane defaults for integration tests. Not a `Default` impl on purpose:
|
/// Sane defaults for integration tests. Not a `Default` impl on purpose:
|
||||||
/// production code must go through `from_env()`, and `Default::default()`
|
/// production code must go through `from_env()`, and `Default::default()`
|
||||||
/// carries an implicit "safe fallback" connotation this value does not
|
/// carries an implicit "safe fallback" connotation this value does not
|
||||||
@@ -199,20 +153,6 @@ impl Config {
|
|||||||
log_max_days: 90,
|
log_max_days: 90,
|
||||||
users: Vec::new(),
|
users: Vec::new(),
|
||||||
api_keys: HashMap::new(),
|
api_keys: HashMap::new(),
|
||||||
retention_audio_days: 30,
|
|
||||||
retention_transcript_days: 30,
|
|
||||||
retention_document_days: 0,
|
|
||||||
whisper_url: "http://localhost:10300".into(),
|
|
||||||
whisper_timeout_seconds: 120,
|
|
||||||
ollama_url: "http://localhost:11434".into(),
|
|
||||||
ollama_model: "gemma3:4b".into(),
|
|
||||||
ollama_keep_alive: 0,
|
|
||||||
llm_url: String::new(),
|
|
||||||
llm_api_key: String::new(),
|
|
||||||
llm_model: String::new(),
|
|
||||||
llm_temperature: 0.0,
|
|
||||||
llm_timeout_seconds: 180,
|
|
||||||
llm_system_prompt: crate::analyze::prompt::SYSTEM_PROMPT.to_string(),
|
|
||||||
vocab_dir: PathBuf::new(),
|
vocab_dir: PathBuf::new(),
|
||||||
hunspell_dict_path: PathBuf::new(),
|
hunspell_dict_path: PathBuf::new(),
|
||||||
session_timeout_hours: 8,
|
session_timeout_hours: 8,
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ pub mod oneliner_locks;
|
|||||||
pub mod paths;
|
pub mod paths;
|
||||||
pub mod retention;
|
pub mod retention;
|
||||||
pub mod routes;
|
pub mod routes;
|
||||||
|
pub mod settings;
|
||||||
pub mod transcribe;
|
pub mod transcribe;
|
||||||
pub mod web_session;
|
pub mod web_session;
|
||||||
|
|
||||||
@@ -28,6 +29,7 @@ use config::Config;
|
|||||||
use gazetteer::Gazetteer;
|
use gazetteer::Gazetteer;
|
||||||
use magic_link::MagicLinkStore;
|
use magic_link::MagicLinkStore;
|
||||||
use oneliner_locks::OnelinerLocks;
|
use oneliner_locks::OnelinerLocks;
|
||||||
|
use settings::Settings;
|
||||||
use transcribe::TranscribeSender;
|
use transcribe::TranscribeSender;
|
||||||
use web_session::SessionStore;
|
use web_session::SessionStore;
|
||||||
|
|
||||||
@@ -88,6 +90,7 @@ pub struct PipelineState {
|
|||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct AppState {
|
pub struct AppState {
|
||||||
pub config: Arc<Config>,
|
pub config: Arc<Config>,
|
||||||
|
pub settings: Arc<Settings>,
|
||||||
pub transcribe_tx: TranscribeSender,
|
pub transcribe_tx: TranscribeSender,
|
||||||
pub analyze_tx: AnalyzeSender,
|
pub analyze_tx: AnalyzeSender,
|
||||||
pub session_store: SessionStore,
|
pub session_store: SessionStore,
|
||||||
@@ -107,6 +110,12 @@ impl FromRef<AppState> for Arc<Config> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl FromRef<AppState> for Arc<Settings> {
|
||||||
|
fn from_ref(state: &AppState) -> Self {
|
||||||
|
state.settings.clone()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl FromRef<AppState> for TranscribeSender {
|
impl FromRef<AppState> for TranscribeSender {
|
||||||
fn from_ref(state: &AppState) -> Self {
|
fn from_ref(state: &AppState) -> Self {
|
||||||
state.transcribe_tx.clone()
|
state.transcribe_tx.clone()
|
||||||
@@ -199,11 +208,27 @@ pub fn create_router(config: Arc<Config>) -> Router {
|
|||||||
/// shared with the router (`Arc`), so any session created via `/web/login`
|
/// shared with the router (`Arc`), so any session created via `/web/login`
|
||||||
/// or `/web/magic` becomes observable through it.
|
/// or `/web/magic` becomes observable through it.
|
||||||
pub fn create_router_and_session_store(config: Arc<Config>) -> (Router, SessionStore) {
|
pub fn create_router_and_session_store(config: Arc<Config>) -> (Router, SessionStore) {
|
||||||
|
create_router_and_session_store_with_settings(config, Arc::new(Settings::default()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Variant of [`create_router`] that takes both `Config` and `Settings`.
|
||||||
|
/// Use from tests that exercise Bucket-B paths (LLM, Whisper, Ollama URLs);
|
||||||
|
/// otherwise the [`create_router`] convenience with default Settings is enough.
|
||||||
|
pub fn create_router_with_settings(config: Arc<Config>, settings: Arc<Settings>) -> Router {
|
||||||
|
create_router_and_session_store_with_settings(config, settings).0
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Variant of [`create_router_and_session_store`] that takes both `Config` and `Settings`.
|
||||||
|
pub fn create_router_and_session_store_with_settings(
|
||||||
|
config: Arc<Config>,
|
||||||
|
settings: Arc<Settings>,
|
||||||
|
) -> (Router, SessionStore) {
|
||||||
let (transcribe_tx, _transcribe_rx) = transcribe::channel();
|
let (transcribe_tx, _transcribe_rx) = transcribe::channel();
|
||||||
let (analyze_tx, _analyze_rx) = analyze::channel();
|
let (analyze_tx, _analyze_rx) = analyze::channel();
|
||||||
let session_store = web_session::new_store();
|
let session_store = web_session::new_store();
|
||||||
let router = create_router_with_state(AppState {
|
let router = create_router_with_state(AppState {
|
||||||
config,
|
config,
|
||||||
|
settings,
|
||||||
transcribe_tx,
|
transcribe_tx,
|
||||||
analyze_tx,
|
analyze_tx,
|
||||||
session_store: session_store.clone(),
|
session_store: session_store.clone(),
|
||||||
|
|||||||
+15
-15
@@ -13,6 +13,7 @@ use doctate_server::analyze;
|
|||||||
use doctate_server::config::Config;
|
use doctate_server::config::Config;
|
||||||
use doctate_server::events;
|
use doctate_server::events;
|
||||||
use doctate_server::gazetteer::{Gazetteer, SpellbookDict};
|
use doctate_server::gazetteer::{Gazetteer, SpellbookDict};
|
||||||
|
use doctate_server::settings::Settings;
|
||||||
use doctate_server::transcribe;
|
use doctate_server::transcribe;
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
@@ -20,6 +21,9 @@ async fn main() {
|
|||||||
dotenvy::dotenv().ok();
|
dotenvy::dotenv().ok();
|
||||||
let config = Arc::new(Config::from_env());
|
let config = Arc::new(Config::from_env());
|
||||||
|
|
||||||
|
let settings_path = std::env::var("SETTINGS_FILE").unwrap_or_else(|_| "settings.toml".into());
|
||||||
|
let settings = Arc::new(Settings::load_or_default(&settings_path));
|
||||||
|
|
||||||
// Logging: stdout + daily rotating log files.
|
// Logging: stdout + daily rotating log files.
|
||||||
let env_filter =
|
let env_filter =
|
||||||
EnvFilter::try_new(&config.log_level).unwrap_or_else(|_| EnvFilter::new("info"));
|
EnvFilter::try_new(&config.log_level).unwrap_or_else(|_| EnvFilter::new("info"));
|
||||||
@@ -43,23 +47,17 @@ async fn main() {
|
|||||||
.init();
|
.init();
|
||||||
|
|
||||||
// Surface configuration gaps that silently disable features.
|
// Surface configuration gaps that silently disable features.
|
||||||
if !config.llm_configured() {
|
if !settings.llm_configured() {
|
||||||
warn!(
|
warn!(
|
||||||
"LLM not configured — 'Fall abschließen' is disabled. \
|
"LLM not configured — 'Fall abschließen' is disabled. \
|
||||||
Set LLM_URL, LLM_API_KEY and LLM_MODEL in .env to enable."
|
Set [llm].url and [llm].model in settings.toml to enable."
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
info!(
|
||||||
let custom = std::env::var("LLM_SYSTEM_PROMPT")
|
prompt_chars = settings.llm.system_prompt.chars().count(),
|
||||||
.map(|v| !v.is_empty())
|
"system prompt loaded"
|
||||||
.unwrap_or(false);
|
);
|
||||||
info!(
|
|
||||||
prompt_source = if custom { "env" } else { "default" },
|
|
||||||
prompt_chars = config.llm_system_prompt.chars().count(),
|
|
||||||
"system prompt loaded"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Shared HTTP client for both downstream pipelines.
|
// Shared HTTP client for both downstream pipelines.
|
||||||
let http_client = reqwest::Client::builder()
|
let http_client = reqwest::Client::builder()
|
||||||
@@ -135,6 +133,7 @@ async fn main() {
|
|||||||
tokio::spawn(transcribe::worker::run(
|
tokio::spawn(transcribe::worker::run(
|
||||||
transcribe_rx,
|
transcribe_rx,
|
||||||
config.clone(),
|
config.clone(),
|
||||||
|
settings.clone(),
|
||||||
http_client.clone(),
|
http_client.clone(),
|
||||||
transcribe_busy.clone(),
|
transcribe_busy.clone(),
|
||||||
vocab.clone(),
|
vocab.clone(),
|
||||||
@@ -145,7 +144,7 @@ async fn main() {
|
|||||||
let tx = transcribe_tx.clone();
|
let tx = transcribe_tx.clone();
|
||||||
let data_path = config.data_path.clone();
|
let data_path = config.data_path.clone();
|
||||||
let client = http_client.clone();
|
let client = http_client.clone();
|
||||||
let cfg = config.clone();
|
let settings = settings.clone();
|
||||||
let vocab = vocab.clone();
|
let vocab = vocab.clone();
|
||||||
let events = events_tx.clone();
|
let events = events_tx.clone();
|
||||||
let heal_busy = oneliner_heal_busy.clone();
|
let heal_busy = oneliner_heal_busy.clone();
|
||||||
@@ -158,7 +157,7 @@ async fn main() {
|
|||||||
// page-load does not spawn a second parallel regen loop.
|
// page-load does not spawn a second parallel regen loop.
|
||||||
let _guard = doctate_server::BusyGuard::new(heal_busy);
|
let _guard = doctate_server::BusyGuard::new(heal_busy);
|
||||||
transcribe::recovery::regenerate_missing_oneliners(
|
transcribe::recovery::regenerate_missing_oneliners(
|
||||||
&data_path, &client, &cfg, &vocab, &events, &locks,
|
&data_path, &client, &settings, &vocab, &events, &locks,
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
});
|
});
|
||||||
@@ -170,7 +169,7 @@ async fn main() {
|
|||||||
std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
|
std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
|
||||||
tokio::spawn(analyze::worker::run(
|
tokio::spawn(analyze::worker::run(
|
||||||
analyze_rx,
|
analyze_rx,
|
||||||
config.clone(),
|
settings.clone(),
|
||||||
http_client.clone(),
|
http_client.clone(),
|
||||||
analyze_busy.clone(),
|
analyze_busy.clone(),
|
||||||
vocab.clone(),
|
vocab.clone(),
|
||||||
@@ -186,6 +185,7 @@ async fn main() {
|
|||||||
|
|
||||||
let state = AppState {
|
let state = AppState {
|
||||||
config: config.clone(),
|
config: config.clone(),
|
||||||
|
settings: settings.clone(),
|
||||||
transcribe_tx,
|
transcribe_tx,
|
||||||
analyze_tx,
|
analyze_tx,
|
||||||
session_store: doctate_server::web_session::new_store(),
|
session_store: doctate_server::web_session::new_store(),
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ use crate::routes::case_actions::{
|
|||||||
build_analysis_input, reset_case_artefacts, write_input_create_new,
|
build_analysis_input, reset_case_artefacts, write_input_create_new,
|
||||||
};
|
};
|
||||||
use crate::routes::user_web::locate_case;
|
use crate::routes::user_web::locate_case;
|
||||||
|
use crate::settings::Settings;
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
pub struct BulkForm {
|
pub struct BulkForm {
|
||||||
@@ -44,6 +45,7 @@ impl HasCsrfToken for BulkForm {
|
|||||||
pub async fn handle_bulk_action(
|
pub async fn handle_bulk_action(
|
||||||
user: AuthenticatedWebUser,
|
user: AuthenticatedWebUser,
|
||||||
State(config): State<Arc<Config>>,
|
State(config): State<Arc<Config>>,
|
||||||
|
State(settings): State<Arc<Settings>>,
|
||||||
State(analyze_tx): State<AnalyzeSender>,
|
State(analyze_tx): State<AnalyzeSender>,
|
||||||
State(events_tx): State<EventSender>,
|
State(events_tx): State<EventSender>,
|
||||||
State(locks): State<OnelinerLocks>,
|
State(locks): State<OnelinerLocks>,
|
||||||
@@ -70,7 +72,7 @@ pub async fn handle_bulk_action(
|
|||||||
match action {
|
match action {
|
||||||
BulkAction::Analyze => {
|
BulkAction::Analyze => {
|
||||||
bulk_analyze(
|
bulk_analyze(
|
||||||
&config,
|
&settings,
|
||||||
&analyze_tx,
|
&analyze_tx,
|
||||||
&events_tx,
|
&events_tx,
|
||||||
&user.slug,
|
&user.slug,
|
||||||
@@ -89,14 +91,14 @@ pub async fn handle_bulk_action(
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn bulk_analyze(
|
async fn bulk_analyze(
|
||||||
config: &Config,
|
settings: &Settings,
|
||||||
analyze_tx: &AnalyzeSender,
|
analyze_tx: &AnalyzeSender,
|
||||||
events_tx: &EventSender,
|
events_tx: &EventSender,
|
||||||
slug: &str,
|
slug: &str,
|
||||||
user_root: &std::path::Path,
|
user_root: &std::path::Path,
|
||||||
case_ids: &[String],
|
case_ids: &[String],
|
||||||
) {
|
) {
|
||||||
if !config.llm_configured() {
|
if !settings.llm_configured() {
|
||||||
warn!(slug = %slug, "bulk-analyze: LLM not configured, skipping all");
|
warn!(slug = %slug, "bulk-analyze: LLM not configured, skipping all");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ use crate::paths::{
|
|||||||
};
|
};
|
||||||
use crate::routes::user_web::locate_case_or_404;
|
use crate::routes::user_web::locate_case_or_404;
|
||||||
use crate::routes::web::validate_filename;
|
use crate::routes::web::validate_filename;
|
||||||
|
use crate::settings::Settings;
|
||||||
|
|
||||||
/// POST /web/cases/{case_id}/analyze
|
/// POST /web/cases/{case_id}/analyze
|
||||||
///
|
///
|
||||||
@@ -41,12 +42,13 @@ use crate::routes::web::validate_filename;
|
|||||||
pub async fn handle_analyze_case(
|
pub async fn handle_analyze_case(
|
||||||
user: AuthenticatedWebUser,
|
user: AuthenticatedWebUser,
|
||||||
State(config): State<Arc<Config>>,
|
State(config): State<Arc<Config>>,
|
||||||
|
State(settings): State<Arc<Settings>>,
|
||||||
State(analyze_tx): State<AnalyzeSender>,
|
State(analyze_tx): State<AnalyzeSender>,
|
||||||
State(events_tx): State<EventSender>,
|
State(events_tx): State<EventSender>,
|
||||||
CaseIdPath(case_id): CaseIdPath,
|
CaseIdPath(case_id): CaseIdPath,
|
||||||
CsrfForm(form): CsrfForm<CsrfOnlyForm>,
|
CsrfForm(form): CsrfForm<CsrfOnlyForm>,
|
||||||
) -> Result<Redirect, AppError> {
|
) -> Result<Redirect, AppError> {
|
||||||
if !config.llm_configured() {
|
if !settings.llm_configured() {
|
||||||
return Err(AppError::ServiceUnavailable(
|
return Err(AppError::ServiceUnavailable(
|
||||||
"LLM-Analyse nicht konfiguriert".into(),
|
"LLM-Analyse nicht konfiguriert".into(),
|
||||||
));
|
));
|
||||||
|
|||||||
@@ -5,14 +5,18 @@ use axum::extract::State;
|
|||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
|
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
|
use crate::settings::Settings;
|
||||||
|
|
||||||
pub async fn handle_health(State(config): State<Arc<Config>>) -> Json<Value> {
|
pub async fn handle_health(
|
||||||
|
State(config): State<Arc<Config>>,
|
||||||
|
State(settings): State<Arc<Settings>>,
|
||||||
|
) -> Json<Value> {
|
||||||
Json(json!({
|
Json(json!({
|
||||||
"status": "ok",
|
"status": "ok",
|
||||||
"port": config.server_port,
|
"port": config.server_port,
|
||||||
"data_path": config.data_path.to_string_lossy(),
|
"data_path": config.data_path.to_string_lossy(),
|
||||||
"users": config.users.iter().map(|u| &u.slug).collect::<Vec<_>>(),
|
"users": config.users.iter().map(|u| &u.slug).collect::<Vec<_>>(),
|
||||||
"whisper_url": config.whisper_url,
|
"whisper_url": settings.whisper.url,
|
||||||
"ollama_url": config.ollama_url,
|
"ollama_url": settings.ollama.url,
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ use crate::gazetteer::Gazetteer;
|
|||||||
use crate::paths;
|
use crate::paths;
|
||||||
use crate::routes::case_actions::read_document;
|
use crate::routes::case_actions::read_document;
|
||||||
use crate::routes::web::{RecordingView, scan_recordings};
|
use crate::routes::web::{RecordingView, scan_recordings};
|
||||||
|
use crate::settings::Settings;
|
||||||
use crate::transcribe::recovery as transcribe_recovery;
|
use crate::transcribe::recovery as transcribe_recovery;
|
||||||
use crate::{BusyGuard, PipelineState};
|
use crate::{BusyGuard, PipelineState};
|
||||||
|
|
||||||
@@ -429,7 +430,7 @@ impl PipelineState {
|
|||||||
user_root: &Path,
|
user_root: &Path,
|
||||||
slug: &str,
|
slug: &str,
|
||||||
http_client: &reqwest::Client,
|
http_client: &reqwest::Client,
|
||||||
config: &Arc<Config>,
|
settings: &Arc<Settings>,
|
||||||
vocab: &Arc<Gazetteer>,
|
vocab: &Arc<Gazetteer>,
|
||||||
events_tx: &EventSender,
|
events_tx: &EventSender,
|
||||||
) {
|
) {
|
||||||
@@ -456,7 +457,7 @@ impl PipelineState {
|
|||||||
let user_root = user_root.to_path_buf();
|
let user_root = user_root.to_path_buf();
|
||||||
let slug_owned = slug.to_owned();
|
let slug_owned = slug.to_owned();
|
||||||
let http_client = http_client.clone();
|
let http_client = http_client.clone();
|
||||||
let config = Arc::clone(config);
|
let settings = Arc::clone(settings);
|
||||||
let vocab = Arc::clone(vocab);
|
let vocab = Arc::clone(vocab);
|
||||||
let events_tx = events_tx.clone();
|
let events_tx = events_tx.clone();
|
||||||
let busy = Arc::clone(&self.oneliner_heal_busy.0);
|
let busy = Arc::clone(&self.oneliner_heal_busy.0);
|
||||||
@@ -472,7 +473,7 @@ impl PipelineState {
|
|||||||
&user_root,
|
&user_root,
|
||||||
&slug_owned,
|
&slug_owned,
|
||||||
&http_client,
|
&http_client,
|
||||||
&config,
|
&settings,
|
||||||
&vocab,
|
&vocab,
|
||||||
&events_tx,
|
&events_tx,
|
||||||
&locks,
|
&locks,
|
||||||
@@ -484,9 +485,11 @@ impl PipelineState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
pub async fn handle_my_cases(
|
pub async fn handle_my_cases(
|
||||||
user: AuthenticatedWebUser,
|
user: AuthenticatedWebUser,
|
||||||
State(config): State<Arc<Config>>,
|
State(config): State<Arc<Config>>,
|
||||||
|
State(settings): State<Arc<Settings>>,
|
||||||
State(pipeline): State<PipelineState>,
|
State(pipeline): State<PipelineState>,
|
||||||
State(events_tx): State<EventSender>,
|
State(events_tx): State<EventSender>,
|
||||||
State(http_client): State<reqwest::Client>,
|
State(http_client): State<reqwest::Client>,
|
||||||
@@ -499,7 +502,7 @@ pub async fn handle_my_cases(
|
|||||||
&user_root,
|
&user_root,
|
||||||
&user.slug,
|
&user.slug,
|
||||||
&http_client,
|
&http_client,
|
||||||
&config,
|
&settings,
|
||||||
&vocab,
|
&vocab,
|
||||||
&events_tx,
|
&events_tx,
|
||||||
)
|
)
|
||||||
@@ -508,7 +511,7 @@ pub async fn handle_my_cases(
|
|||||||
// render. The common case is "nothing to do" and costs a handful of
|
// render. The common case is "nothing to do" and costs a handful of
|
||||||
// stat-calls per case; actual enqueues happen only when pre-conditions
|
// stat-calls per case; actual enqueues happen only when pre-conditions
|
||||||
// flip (new transcripts in, stale document, ...).
|
// flip (new transcripts in, stale document, ...).
|
||||||
auto_trigger::try_enqueue_all_for_user(&user_root, &pipeline.analyze_tx, &config, &events_tx)
|
auto_trigger::try_enqueue_all_for_user(&user_root, &pipeline.analyze_tx, &settings, &events_tx)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
// Lazy retention sweep: at most one disk scan per /web/cases visit,
|
// Lazy retention sweep: at most one disk scan per /web/cases visit,
|
||||||
@@ -531,6 +534,7 @@ pub async fn handle_my_cases(
|
|||||||
busy,
|
busy,
|
||||||
show_closed,
|
show_closed,
|
||||||
retention.auto_delete_days,
|
retention.auto_delete_days,
|
||||||
|
settings.llm_configured(),
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
let total = cases.len();
|
let total = cases.len();
|
||||||
@@ -579,6 +583,7 @@ pub async fn handle_my_cases(
|
|||||||
pub async fn handle_case_page(
|
pub async fn handle_case_page(
|
||||||
user: AuthenticatedWebUser,
|
user: AuthenticatedWebUser,
|
||||||
State(config): State<Arc<Config>>,
|
State(config): State<Arc<Config>>,
|
||||||
|
State(settings): State<Arc<Settings>>,
|
||||||
State(pipeline): State<PipelineState>,
|
State(pipeline): State<PipelineState>,
|
||||||
State(events_tx): State<EventSender>,
|
State(events_tx): State<EventSender>,
|
||||||
State(http_client): State<reqwest::Client>,
|
State(http_client): State<reqwest::Client>,
|
||||||
@@ -592,7 +597,7 @@ pub async fn handle_case_page(
|
|||||||
&user_root,
|
&user_root,
|
||||||
&user.slug,
|
&user.slug,
|
||||||
&http_client,
|
&http_client,
|
||||||
&config,
|
&settings,
|
||||||
&vocab,
|
&vocab,
|
||||||
&events_tx,
|
&events_tx,
|
||||||
)
|
)
|
||||||
@@ -619,7 +624,7 @@ pub async fn handle_case_page(
|
|||||||
// Auto-analysis trigger for deep-link navigation: same evaluation as
|
// Auto-analysis trigger for deep-link navigation: same evaluation as
|
||||||
// the list view. Document render below still wins the race if the
|
// the list view. Document render below still wins the race if the
|
||||||
// worker happens to finish synchronously.
|
// worker happens to finish synchronously.
|
||||||
auto_trigger::try_enqueue(&case_dir, &pipeline.analyze_tx, &config, &events_tx).await;
|
auto_trigger::try_enqueue(&case_dir, &pipeline.analyze_tx, &settings, &events_tx).await;
|
||||||
let case_id_str = case_id.to_string();
|
let case_id_str = case_id.to_string();
|
||||||
info!(slug = %user.slug, case_id = %case_id, "case page viewed");
|
info!(slug = %user.slug, case_id = %case_id, "case page viewed");
|
||||||
|
|
||||||
@@ -634,7 +639,7 @@ pub async fn handle_case_page(
|
|||||||
let (oneliner, oneliner_is_manual) = compute_oneliner_display(&case_dir, &recordings).await;
|
let (oneliner, oneliner_is_manual) = compute_oneliner_display(&case_dir, &recordings).await;
|
||||||
|
|
||||||
let a_busy = pipeline.analyze_busy.0.load(Ordering::Acquire);
|
let a_busy = pipeline.analyze_busy.0.load(Ordering::Acquire);
|
||||||
let flags = compute_flags(&case_dir, &recordings, config.llm_configured(), a_busy).await;
|
let flags = compute_flags(&case_dir, &recordings, settings.llm_configured(), a_busy).await;
|
||||||
|
|
||||||
let recordings_count = recordings.len();
|
let recordings_count = recordings.len();
|
||||||
let transcribed_count = recordings
|
let transcribed_count = recordings
|
||||||
@@ -681,9 +686,11 @@ pub async fn handle_case_page(
|
|||||||
///
|
///
|
||||||
/// Read-only sub-page showing all `.m4a` + transcript pairs for the case.
|
/// Read-only sub-page showing all `.m4a` + transcript pairs for the case.
|
||||||
/// Useful for power-users/admins; not part of the day-to-day workflow.
|
/// Useful for power-users/admins; not part of the day-to-day workflow.
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
pub async fn handle_case_recordings(
|
pub async fn handle_case_recordings(
|
||||||
user: AuthenticatedWebUser,
|
user: AuthenticatedWebUser,
|
||||||
State(config): State<Arc<Config>>,
|
State(config): State<Arc<Config>>,
|
||||||
|
State(settings): State<Arc<Settings>>,
|
||||||
State(pipeline): State<PipelineState>,
|
State(pipeline): State<PipelineState>,
|
||||||
State(events_tx): State<EventSender>,
|
State(events_tx): State<EventSender>,
|
||||||
State(http_client): State<reqwest::Client>,
|
State(http_client): State<reqwest::Client>,
|
||||||
@@ -696,7 +703,7 @@ pub async fn handle_case_recordings(
|
|||||||
&user_root,
|
&user_root,
|
||||||
&user.slug,
|
&user.slug,
|
||||||
&http_client,
|
&http_client,
|
||||||
&config,
|
&settings,
|
||||||
&vocab,
|
&vocab,
|
||||||
&events_tx,
|
&events_tx,
|
||||||
)
|
)
|
||||||
@@ -810,9 +817,9 @@ async fn scan_user_cases(
|
|||||||
worker_busy: bool,
|
worker_busy: bool,
|
||||||
include_closed: bool,
|
include_closed: bool,
|
||||||
auto_delete_days: u32,
|
auto_delete_days: u32,
|
||||||
|
llm_configured: bool,
|
||||||
) -> Vec<UserCaseView> {
|
) -> Vec<UserCaseView> {
|
||||||
let user_root = config.data_path.join(slug);
|
let user_root = config.data_path.join(slug);
|
||||||
let llm_configured = config.llm_configured();
|
|
||||||
let mut cases = Vec::new();
|
let mut cases = Vec::new();
|
||||||
let now = OffsetDateTime::now_utc();
|
let now = OffsetDateTime::now_utc();
|
||||||
|
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ use doctate_common::oneliners::OnelinerState;
|
|||||||
use tracing::{info, warn};
|
use tracing::{info, warn};
|
||||||
|
|
||||||
use super::{TranscribeJob, TranscribeSender};
|
use super::{TranscribeJob, TranscribeSender};
|
||||||
use crate::config::Config;
|
|
||||||
use crate::events::EventSender;
|
use crate::events::EventSender;
|
||||||
use crate::gazetteer::Gazetteer;
|
use crate::gazetteer::Gazetteer;
|
||||||
use crate::oneliner_locks::OnelinerLocks;
|
use crate::oneliner_locks::OnelinerLocks;
|
||||||
use crate::paths;
|
use crate::paths;
|
||||||
|
use crate::settings::Settings;
|
||||||
|
|
||||||
/// Walk `data_path/*/` and enqueue every recording pending transcription for
|
/// Walk `data_path/*/` and enqueue every recording pending transcription for
|
||||||
/// every user. Intended for startup; the same primitive backs the per-user
|
/// every user. Intended for startup; the same primitive backs the per-user
|
||||||
@@ -204,7 +204,7 @@ async fn has_any_transcript(case_dir: &Path) -> bool {
|
|||||||
pub async fn regenerate_missing_oneliners(
|
pub async fn regenerate_missing_oneliners(
|
||||||
data_path: &Path,
|
data_path: &Path,
|
||||||
client: &reqwest::Client,
|
client: &reqwest::Client,
|
||||||
config: &Config,
|
settings: &Settings,
|
||||||
vocab: &Gazetteer,
|
vocab: &Gazetteer,
|
||||||
events_tx: &EventSender,
|
events_tx: &EventSender,
|
||||||
locks: &OnelinerLocks,
|
locks: &OnelinerLocks,
|
||||||
@@ -215,7 +215,7 @@ pub async fn regenerate_missing_oneliners(
|
|||||||
}
|
}
|
||||||
info!(count = cases.len(), "Regenerating missing oneliners");
|
info!(count = cases.len(), "Regenerating missing oneliners");
|
||||||
for (case_dir, slug) in cases {
|
for (case_dir, slug) in cases {
|
||||||
super::worker::update_oneliner(&case_dir, &slug, client, config, vocab, events_tx, locks)
|
super::worker::update_oneliner(&case_dir, &slug, client, settings, vocab, events_tx, locks)
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -228,7 +228,7 @@ pub async fn regenerate_missing_oneliners_for_user(
|
|||||||
user_root: &Path,
|
user_root: &Path,
|
||||||
slug: &str,
|
slug: &str,
|
||||||
client: &reqwest::Client,
|
client: &reqwest::Client,
|
||||||
config: &Config,
|
settings: &Settings,
|
||||||
vocab: &Gazetteer,
|
vocab: &Gazetteer,
|
||||||
events_tx: &EventSender,
|
events_tx: &EventSender,
|
||||||
locks: &OnelinerLocks,
|
locks: &OnelinerLocks,
|
||||||
@@ -238,7 +238,7 @@ pub async fn regenerate_missing_oneliners_for_user(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for case_dir in cases {
|
for case_dir in cases {
|
||||||
super::worker::update_oneliner(&case_dir, slug, client, config, vocab, events_tx, locks)
|
super::worker::update_oneliner(&case_dir, slug, client, settings, vocab, events_tx, locks)
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,15 +14,18 @@ use crate::events::{self, CaseEventKind, EventSender};
|
|||||||
use crate::gazetteer::Gazetteer;
|
use crate::gazetteer::Gazetteer;
|
||||||
use crate::oneliner_locks::OnelinerLocks;
|
use crate::oneliner_locks::OnelinerLocks;
|
||||||
use crate::paths;
|
use crate::paths;
|
||||||
|
use crate::settings::Settings;
|
||||||
use crate::{BusyGuard, WorkerBusy};
|
use crate::{BusyGuard, WorkerBusy};
|
||||||
|
|
||||||
const ONELINER_TIMEOUT: Duration = Duration::from_secs(60);
|
const ONELINER_TIMEOUT: Duration = Duration::from_secs(60);
|
||||||
|
|
||||||
/// Consume transcription jobs sequentially. Whisper holds the GPU, so parallelism
|
/// Consume transcription jobs sequentially. Whisper holds the GPU, so parallelism
|
||||||
/// here would only cause contention. One job in flight at a time.
|
/// here would only cause contention. One job in flight at a time.
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
pub async fn run(
|
pub async fn run(
|
||||||
mut rx: TranscribeReceiver,
|
mut rx: TranscribeReceiver,
|
||||||
config: Arc<Config>,
|
config: Arc<Config>,
|
||||||
|
settings: Arc<Settings>,
|
||||||
client: reqwest::Client,
|
client: reqwest::Client,
|
||||||
worker_busy: WorkerBusy,
|
worker_busy: WorkerBusy,
|
||||||
vocab: Arc<Gazetteer>,
|
vocab: Arc<Gazetteer>,
|
||||||
@@ -30,7 +33,7 @@ pub async fn run(
|
|||||||
oneliner_locks: OnelinerLocks,
|
oneliner_locks: OnelinerLocks,
|
||||||
) {
|
) {
|
||||||
info!("Transcription worker started");
|
info!("Transcription worker started");
|
||||||
let timeout = Duration::from_secs(config.whisper_timeout_seconds);
|
let timeout = Duration::from_secs(settings.whisper.timeout_seconds);
|
||||||
|
|
||||||
while let Some(job) = rx.recv().await {
|
while let Some(job) = rx.recv().await {
|
||||||
let _guard = BusyGuard::new(worker_busy.clone());
|
let _guard = BusyGuard::new(worker_busy.clone());
|
||||||
@@ -44,7 +47,7 @@ pub async fn run(
|
|||||||
// Look up per-user Whisper settings live from the shared config so that
|
// Look up per-user Whisper settings live from the shared config so that
|
||||||
// edits to users.toml (on next restart) reach in-flight jobs naturally.
|
// edits to users.toml (on next restart) reach in-flight jobs naturally.
|
||||||
// Unknown slug → empty settings (service falls back to language=de).
|
// Unknown slug → empty settings (service falls back to language=de).
|
||||||
let settings: WhisperUserSettings = config
|
let user_whisper: WhisperUserSettings = config
|
||||||
.users
|
.users
|
||||||
.iter()
|
.iter()
|
||||||
.find(|u| u.slug == job.user_slug)
|
.find(|u| u.slug == job.user_slug)
|
||||||
@@ -70,10 +73,10 @@ pub async fn run(
|
|||||||
|
|
||||||
let text = match whisper::transcribe(
|
let text = match whisper::transcribe(
|
||||||
&client,
|
&client,
|
||||||
&config.whisper_url,
|
&settings.whisper.url,
|
||||||
remuxed.path(),
|
remuxed.path(),
|
||||||
timeout,
|
timeout,
|
||||||
&settings,
|
&user_whisper,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
@@ -139,7 +142,7 @@ pub async fn run(
|
|||||||
case_dir,
|
case_dir,
|
||||||
&job.user_slug,
|
&job.user_slug,
|
||||||
&client,
|
&client,
|
||||||
&config,
|
&settings,
|
||||||
&vocab,
|
&vocab,
|
||||||
&events_tx,
|
&events_tx,
|
||||||
&oneliner_locks,
|
&oneliner_locks,
|
||||||
@@ -220,7 +223,7 @@ pub async fn update_oneliner(
|
|||||||
case_dir: &Path,
|
case_dir: &Path,
|
||||||
user_slug: &str,
|
user_slug: &str,
|
||||||
client: &reqwest::Client,
|
client: &reqwest::Client,
|
||||||
config: &Config,
|
settings: &Settings,
|
||||||
vocab: &Gazetteer,
|
vocab: &Gazetteer,
|
||||||
events_tx: &EventSender,
|
events_tx: &EventSender,
|
||||||
locks: &OnelinerLocks,
|
locks: &OnelinerLocks,
|
||||||
@@ -302,9 +305,9 @@ pub async fn update_oneliner(
|
|||||||
// during the call.
|
// during the call.
|
||||||
let state = match ollama::generate_oneliner(
|
let state = match ollama::generate_oneliner(
|
||||||
client,
|
client,
|
||||||
&config.ollama_url,
|
&settings.ollama.url,
|
||||||
&config.ollama_model,
|
&settings.ollama.model,
|
||||||
config.ollama_keep_alive,
|
settings.ollama.keep_alive,
|
||||||
&transcript,
|
&transcript,
|
||||||
ONELINER_TIMEOUT,
|
ONELINER_TIMEOUT,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -23,27 +23,32 @@ use common::{
|
|||||||
// Fixture helpers
|
// Fixture helpers
|
||||||
// ---------------------------------------------------------------------
|
// ---------------------------------------------------------------------
|
||||||
|
|
||||||
fn cfg_llm(label: &'static str) -> std::sync::Arc<doctate_server::config::Config> {
|
type CfgPair = (
|
||||||
|
std::sync::Arc<doctate_server::config::Config>,
|
||||||
|
std::sync::Arc<doctate_server::settings::Settings>,
|
||||||
|
);
|
||||||
|
|
||||||
|
fn cfg_llm(label: &'static str) -> CfgPair {
|
||||||
TestConfig::new()
|
TestConfig::new()
|
||||||
.with_label(label)
|
.with_label(label)
|
||||||
.with_user(test_user("dr_a"))
|
.with_user(test_user("dr_a"))
|
||||||
.with_llm("http://unused")
|
.with_llm("http://unused")
|
||||||
.build()
|
.build_pair()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn cfg_llm_admin(label: &'static str) -> std::sync::Arc<doctate_server::config::Config> {
|
fn cfg_llm_admin(label: &'static str) -> CfgPair {
|
||||||
TestConfig::new()
|
TestConfig::new()
|
||||||
.with_label(label)
|
.with_label(label)
|
||||||
.with_user(test_admin("dr_a"))
|
.with_user(test_admin("dr_a"))
|
||||||
.with_llm("http://unused")
|
.with_llm("http://unused")
|
||||||
.build()
|
.build_pair()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn cfg_without_llm(label: &'static str) -> std::sync::Arc<doctate_server::config::Config> {
|
fn cfg_without_llm(label: &'static str) -> CfgPair {
|
||||||
TestConfig::new()
|
TestConfig::new()
|
||||||
.with_label(label)
|
.with_label(label)
|
||||||
.with_user(test_user("dr_a"))
|
.with_user(test_user("dr_a"))
|
||||||
.build()
|
.build_pair()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------
|
// ---------------------------------------------------------------------
|
||||||
@@ -52,8 +57,8 @@ fn cfg_without_llm(label: &'static str) -> std::sync::Arc<doctate_server::config
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn analyze_without_cookie_redirects_to_login() {
|
async fn analyze_without_cookie_redirects_to_login() {
|
||||||
let cfg = cfg_llm("a");
|
let (cfg, settings) = cfg_llm("a");
|
||||||
let app = doctate_server::create_router(cfg);
|
let app = doctate_server::create_router_with_settings(cfg, settings);
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let resp = app
|
let resp = app
|
||||||
.oneshot(
|
.oneshot(
|
||||||
@@ -70,14 +75,14 @@ async fn analyze_without_cookie_redirects_to_login() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn analyze_foreign_case_returns_404() {
|
async fn analyze_foreign_case_returns_404() {
|
||||||
let cfg = cfg_llm("b");
|
let (cfg, settings) = cfg_llm("b");
|
||||||
// Seed a case owned by someone else.
|
// Seed a case owned by someone else.
|
||||||
let foreign_case = "22222222-2222-2222-2222-222222222222";
|
let foreign_case = "22222222-2222-2222-2222-222222222222";
|
||||||
let foreign_dir = cfg.data_path.join("dr_other").join(foreign_case);
|
let foreign_dir = cfg.data_path.join("dr_other").join(foreign_case);
|
||||||
std::fs::create_dir_all(&foreign_dir).unwrap();
|
std::fs::create_dir_all(&foreign_dir).unwrap();
|
||||||
seed_recording(&foreign_dir, "2026-04-15T10-00-00Z", Some("text"));
|
seed_recording(&foreign_dir, "2026-04-15T10-00-00Z", Some("text"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -94,8 +99,8 @@ async fn analyze_foreign_case_returns_404() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn analyze_invalid_uuid_returns_400() {
|
async fn analyze_invalid_uuid_returns_400() {
|
||||||
let cfg = cfg_llm("c");
|
let (cfg, settings) = cfg_llm("c");
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -112,12 +117,12 @@ async fn analyze_invalid_uuid_returns_400() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn analyze_case_without_recordings_returns_400() {
|
async fn analyze_case_without_recordings_returns_400() {
|
||||||
let cfg = cfg_llm("d");
|
let (cfg, settings) = cfg_llm("d");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
seed_case(&cfg.data_path, "dr_a", case_id);
|
seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
// No .m4a files.
|
// No .m4a files.
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -134,13 +139,13 @@ async fn analyze_case_without_recordings_returns_400() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn analyze_case_with_missing_transcript_returns_400() {
|
async fn analyze_case_with_missing_transcript_returns_400() {
|
||||||
let cfg = cfg_llm("e");
|
let (cfg, settings) = cfg_llm("e");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
seed_recording(&case_dir, "2026-04-15T10-05-00Z", None); // still transcribing
|
seed_recording(&case_dir, "2026-04-15T10-05-00Z", None); // still transcribing
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -157,12 +162,12 @@ async fn analyze_case_with_missing_transcript_returns_400() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn analyze_case_without_llm_returns_503() {
|
async fn analyze_case_without_llm_returns_503() {
|
||||||
let cfg = cfg_without_llm("f");
|
let (cfg, settings) = cfg_without_llm("f");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -183,7 +188,7 @@ async fn analyze_case_without_llm_returns_503() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn analyze_case_happy_path_writes_input_and_redirects() {
|
async fn analyze_case_happy_path_writes_input_and_redirects() {
|
||||||
let cfg = cfg_llm("g");
|
let (cfg, settings) = cfg_llm("g");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(
|
seed_recording(
|
||||||
@@ -197,7 +202,7 @@ async fn analyze_case_happy_path_writes_input_and_redirects() {
|
|||||||
Some("Korrektur: links, nicht rechts."),
|
Some("Korrektur: links, nicht rechts."),
|
||||||
);
|
);
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -234,12 +239,12 @@ async fn analyze_case_happy_path_writes_input_and_redirects() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn analyze_case_second_time_returns_409() {
|
async fn analyze_case_second_time_returns_409() {
|
||||||
let cfg = cfg_llm("h");
|
let (cfg, settings) = cfg_llm("h");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("text"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("text"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let first = app
|
let first = app
|
||||||
@@ -268,14 +273,14 @@ async fn analyze_case_second_time_returns_409() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn analyze_case_skips_blank_transcript_from_recordings() {
|
async fn analyze_case_skips_blank_transcript_from_recordings() {
|
||||||
let cfg = cfg_llm("i");
|
let (cfg, settings) = cfg_llm("i");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("echt"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("echt"));
|
||||||
seed_recording(&case_dir, "2026-04-15T10-05-00Z", Some(" ")); // blank
|
seed_recording(&case_dir, "2026-04-15T10-05-00Z", Some(" ")); // blank
|
||||||
seed_recording(&case_dir, "2026-04-15T10-10-00Z", Some("auch echt"));
|
seed_recording(&case_dir, "2026-04-15T10-10-00Z", Some("auch echt"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -328,12 +333,12 @@ async fn analyze_worker_writes_document_via_wiremock() {
|
|||||||
.mount(&mock)
|
.mount(&mock)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
let cfg = TestConfig::new()
|
let (_cfg, settings) = TestConfig::new()
|
||||||
.with_label("analyze-w")
|
.with_label("analyze-w")
|
||||||
.with_data_path(tmp.clone())
|
.with_data_path(tmp.clone())
|
||||||
.with_user(test_user("dr_a"))
|
.with_user(test_user("dr_a"))
|
||||||
.with_llm(mock.uri())
|
.with_llm(mock.uri())
|
||||||
.build();
|
.build_pair();
|
||||||
|
|
||||||
let (tx, rx) = analyze::channel();
|
let (tx, rx) = analyze::channel();
|
||||||
let client = reqwest::Client::new();
|
let client = reqwest::Client::new();
|
||||||
@@ -341,7 +346,7 @@ async fn analyze_worker_writes_document_via_wiremock() {
|
|||||||
let vocab = Arc::new(doctate_server::gazetteer::Gazetteer::empty());
|
let vocab = Arc::new(doctate_server::gazetteer::Gazetteer::empty());
|
||||||
let handle = tokio::spawn(analyze::worker::run(
|
let handle = tokio::spawn(analyze::worker::run(
|
||||||
rx,
|
rx,
|
||||||
cfg,
|
settings,
|
||||||
client,
|
client,
|
||||||
busy,
|
busy,
|
||||||
vocab,
|
vocab,
|
||||||
@@ -420,19 +425,19 @@ async fn analyze_worker_normalizes_llm_output() {
|
|||||||
.mount(&mock)
|
.mount(&mock)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
let cfg = TestConfig::new()
|
let (_cfg, settings) = TestConfig::new()
|
||||||
.with_label("analyze-gaz")
|
.with_label("analyze-gaz")
|
||||||
.with_data_path(tmp.clone())
|
.with_data_path(tmp.clone())
|
||||||
.with_user(test_user("dr_a"))
|
.with_user(test_user("dr_a"))
|
||||||
.with_llm(mock.uri())
|
.with_llm(mock.uri())
|
||||||
.build();
|
.build_pair();
|
||||||
|
|
||||||
let (tx, rx) = analyze::channel();
|
let (tx, rx) = analyze::channel();
|
||||||
let client = reqwest::Client::new();
|
let client = reqwest::Client::new();
|
||||||
let busy = Arc::new(std::sync::atomic::AtomicBool::new(false));
|
let busy = Arc::new(std::sync::atomic::AtomicBool::new(false));
|
||||||
let handle = tokio::spawn(analyze::worker::run(
|
let handle = tokio::spawn(analyze::worker::run(
|
||||||
rx,
|
rx,
|
||||||
cfg,
|
settings,
|
||||||
client,
|
client,
|
||||||
busy,
|
busy,
|
||||||
vocab,
|
vocab,
|
||||||
@@ -553,14 +558,14 @@ async fn recovery_skips_completed_analysis() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn analyze_deletes_old_document_and_writes_fresh_input() {
|
async fn analyze_deletes_old_document_and_writes_fresh_input() {
|
||||||
let cfg = cfg_llm("rn-5");
|
let (cfg, settings) = cfg_llm("rn-5");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
std::fs::write(case_dir.join(DOCUMENT_FILE), "altes Dokument").unwrap();
|
std::fs::write(case_dir.join(DOCUMENT_FILE), "altes Dokument").unwrap();
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("erste Aufnahme"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("erste Aufnahme"));
|
||||||
seed_recording(&case_dir, "2026-04-15T10-05-00Z", Some("zweite Aufnahme"));
|
seed_recording(&case_dir, "2026-04-15T10-05-00Z", Some("zweite Aufnahme"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -591,12 +596,12 @@ async fn analyze_deletes_old_document_and_writes_fresh_input() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn close_writes_marker_and_hides_case() {
|
async fn close_writes_marker_and_hides_case() {
|
||||||
let cfg = cfg_llm("close-1");
|
let (cfg, settings) = cfg_llm("close-1");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -629,12 +634,12 @@ async fn close_writes_marker_and_hides_case() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn closed_case_returns_404_on_detail() {
|
async fn closed_case_returns_404_on_detail() {
|
||||||
let cfg = cfg_llm("close-2");
|
let (cfg, settings) = cfg_llm("close-2");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -658,12 +663,12 @@ async fn closed_case_returns_404_on_detail() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn reopen_removes_marker_and_restores_case() {
|
async fn reopen_removes_marker_and_restores_case() {
|
||||||
let cfg = cfg_llm("reopen-1");
|
let (cfg, settings) = cfg_llm("reopen-1");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
// Close, then reopen via the explicit endpoint.
|
// Close, then reopen via the explicit endpoint.
|
||||||
@@ -705,12 +710,12 @@ async fn reopen_removes_marker_and_restores_case() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn show_closed_query_includes_closed_cases() {
|
async fn show_closed_query_includes_closed_cases() {
|
||||||
let cfg = cfg_llm("show-closed");
|
let (cfg, settings) = cfg_llm("show-closed");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("a closed one"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("a closed one"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
// Close first.
|
// Close first.
|
||||||
@@ -761,12 +766,12 @@ async fn show_closed_query_includes_closed_cases() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn closed_case_detail_with_show_closed_returns_200() {
|
async fn closed_case_detail_with_show_closed_returns_200() {
|
||||||
let cfg = cfg_llm("show-detail");
|
let (cfg, settings) = cfg_llm("show-detail");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("x"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("x"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let _ = app
|
let _ = app
|
||||||
@@ -804,12 +809,12 @@ async fn closed_case_detail_with_show_closed_returns_200() {
|
|||||||
async fn close_redirects_back_to_referer_query() {
|
async fn close_redirects_back_to_referer_query() {
|
||||||
// Close from the show-closed listing must keep ?show_closed=1 so
|
// Close from the show-closed listing must keep ?show_closed=1 so
|
||||||
// the user stays in the view they were in.
|
// the user stays in the view they were in.
|
||||||
let cfg = cfg_llm("close-ref-q");
|
let (cfg, settings) = cfg_llm("close-ref-q");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let mut req = csrf_form_post(paths::case_close(case_id), &cookie, &csrf, "");
|
let mut req = csrf_form_post(paths::case_close(case_id), &cookie, &csrf, "");
|
||||||
@@ -833,12 +838,12 @@ async fn close_from_detail_redirects_to_list_preserving_query() {
|
|||||||
// Close from /web/cases/{uuid}?show_closed=1 must NOT redirect back
|
// Close from /web/cases/{uuid}?show_closed=1 must NOT redirect back
|
||||||
// to the detail page (it 404s after the close). The uuid segment
|
// to the detail page (it 404s after the close). The uuid segment
|
||||||
// is stripped; the query survives so the user lands in show-closed.
|
// is stripped; the query survives so the user lands in show-closed.
|
||||||
let cfg = cfg_llm("close-ref-det");
|
let (cfg, settings) = cfg_llm("close-ref-det");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let mut req = csrf_form_post(paths::case_close(case_id), &cookie, &csrf, "");
|
let mut req = csrf_form_post(paths::case_close(case_id), &cookie, &csrf, "");
|
||||||
@@ -866,12 +871,12 @@ async fn reopen_redirects_back_to_referer() {
|
|||||||
// User reopens a case from the show-closed listing. The redirect
|
// User reopens a case from the show-closed listing. The redirect
|
||||||
// must preserve `?show_closed=1` so the user stays in that view
|
// must preserve `?show_closed=1` so the user stays in that view
|
||||||
// instead of being ejected back to the default open-only listing.
|
// instead of being ejected back to the default open-only listing.
|
||||||
let cfg = cfg_llm("reopen-ref");
|
let (cfg, settings) = cfg_llm("reopen-ref");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let _ = app
|
let _ = app
|
||||||
@@ -903,12 +908,12 @@ async fn reopen_redirects_back_to_referer() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn reopen_is_noop_on_open_case() {
|
async fn reopen_is_noop_on_open_case() {
|
||||||
let cfg = cfg_llm("reopen-2");
|
let (cfg, settings) = cfg_llm("reopen-2");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -927,12 +932,12 @@ async fn reopen_is_noop_on_open_case() {
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn purge_closed_removes_directory() {
|
async fn purge_closed_removes_directory() {
|
||||||
// purge-closed is admin-only (matches the UI, which hides the bar).
|
// purge-closed is admin-only (matches the UI, which hides the bar).
|
||||||
let cfg = cfg_llm_admin("purge-1");
|
let (cfg, settings) = cfg_llm_admin("purge-1");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let _ = app
|
let _ = app
|
||||||
@@ -965,12 +970,12 @@ async fn purge_closed_removes_directory() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn purge_requires_confirm_param() {
|
async fn purge_requires_confirm_param() {
|
||||||
let cfg = cfg_llm_admin("purge-2");
|
let (cfg, settings) = cfg_llm_admin("purge-2");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let _ = app
|
let _ = app
|
||||||
@@ -998,7 +1003,7 @@ async fn purge_requires_confirm_param() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn purge_closed_keeps_open_cases() {
|
async fn purge_closed_keeps_open_cases() {
|
||||||
let cfg = cfg_llm_admin("purge-3");
|
let (cfg, settings) = cfg_llm_admin("purge-3");
|
||||||
let closed_id = "11111111-1111-1111-1111-111111111111";
|
let closed_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let open_id = "22222222-2222-2222-2222-222222222222";
|
let open_id = "22222222-2222-2222-2222-222222222222";
|
||||||
let dir_closed = seed_case(&cfg.data_path, "dr_a", closed_id);
|
let dir_closed = seed_case(&cfg.data_path, "dr_a", closed_id);
|
||||||
@@ -1006,7 +1011,7 @@ async fn purge_closed_keeps_open_cases() {
|
|||||||
seed_recording(&dir_closed, "2026-04-15T10-00-00Z", Some("a"));
|
seed_recording(&dir_closed, "2026-04-15T10-00-00Z", Some("a"));
|
||||||
seed_recording(&dir_open, "2026-04-15T10-00-00Z", Some("b"));
|
seed_recording(&dir_open, "2026-04-15T10-00-00Z", Some("b"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let _ = app
|
let _ = app
|
||||||
@@ -1040,12 +1045,12 @@ async fn purge_closed_keeps_open_cases() {
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn purge_closed_rejected_for_non_admin() {
|
async fn purge_closed_rejected_for_non_admin() {
|
||||||
// Default `test_user` is role=doctor.
|
// Default `test_user` is role=doctor.
|
||||||
let cfg = cfg_llm("purge-nonadmin");
|
let (cfg, settings) = cfg_llm("purge-nonadmin");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
seed_recording(&case_dir, "2026-04-15T10-00-00Z", Some("ok"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
// Close the case first so there is something for purge to target.
|
// Close the case first so there is something for purge to target.
|
||||||
@@ -1077,7 +1082,7 @@ async fn purge_closed_rejected_for_non_admin() {
|
|||||||
async fn bulk_close_shares_one_closed_at_timestamp() {
|
async fn bulk_close_shares_one_closed_at_timestamp() {
|
||||||
// Bulk actions are admin-only since the UI hides the selection
|
// Bulk actions are admin-only since the UI hides the selection
|
||||||
// from non-admins; the handler enforces the same gate.
|
// from non-admins; the handler enforces the same gate.
|
||||||
let cfg = cfg_llm_admin("bulk-c");
|
let (cfg, settings) = cfg_llm_admin("bulk-c");
|
||||||
let case_a = "11111111-1111-1111-1111-111111111111";
|
let case_a = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_b = "22222222-2222-2222-2222-222222222222";
|
let case_b = "22222222-2222-2222-2222-222222222222";
|
||||||
let dir_a = seed_case(&cfg.data_path, "dr_a", case_a);
|
let dir_a = seed_case(&cfg.data_path, "dr_a", case_a);
|
||||||
@@ -1085,7 +1090,7 @@ async fn bulk_close_shares_one_closed_at_timestamp() {
|
|||||||
seed_recording(&dir_a, "2026-04-15T10-00-00Z", Some("a"));
|
seed_recording(&dir_a, "2026-04-15T10-00-00Z", Some("a"));
|
||||||
seed_recording(&dir_b, "2026-04-15T10-05-00Z", Some("b"));
|
seed_recording(&dir_b, "2026-04-15T10-05-00Z", Some("b"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let body = format!(
|
let body = format!(
|
||||||
@@ -1111,7 +1116,7 @@ async fn bulk_close_shares_one_closed_at_timestamp() {
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn bulk_analyze_processes_each_selected_case() {
|
async fn bulk_analyze_processes_each_selected_case() {
|
||||||
// Bulk analyze is admin-only (UI + handler).
|
// Bulk analyze is admin-only (UI + handler).
|
||||||
let cfg = cfg_llm_admin("bulk-a");
|
let (cfg, settings) = cfg_llm_admin("bulk-a");
|
||||||
let case_a = "11111111-1111-1111-1111-111111111111";
|
let case_a = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_b = "22222222-2222-2222-2222-222222222222";
|
let case_b = "22222222-2222-2222-2222-222222222222";
|
||||||
let dir_a = seed_case(&cfg.data_path, "dr_a", case_a);
|
let dir_a = seed_case(&cfg.data_path, "dr_a", case_a);
|
||||||
@@ -1119,7 +1124,7 @@ async fn bulk_analyze_processes_each_selected_case() {
|
|||||||
seed_recording(&dir_a, "2026-04-15T10-00-00Z", Some("a"));
|
seed_recording(&dir_a, "2026-04-15T10-00-00Z", Some("a"));
|
||||||
seed_recording(&dir_b, "2026-04-15T10-05-00Z", Some("b"));
|
seed_recording(&dir_b, "2026-04-15T10-05-00Z", Some("b"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let body = format!(
|
let body = format!(
|
||||||
@@ -1160,7 +1165,7 @@ async fn recovery_skips_closed_cases() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn reset_case_clears_derived_and_unfails_audio() {
|
async fn reset_case_clears_derived_and_unfails_audio() {
|
||||||
let cfg = cfg_llm_admin("reset-admin");
|
let (cfg, settings) = cfg_llm_admin("reset-admin");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
|
|
||||||
@@ -1177,7 +1182,7 @@ async fn reset_case_clears_derived_and_unfails_audio() {
|
|||||||
std::fs::write(dir.join(DOCUMENT_FILE), "# Doc\n").unwrap();
|
std::fs::write(dir.join(DOCUMENT_FILE), "# Doc\n").unwrap();
|
||||||
std::fs::write(dir.join(ANALYSIS_INPUT_FILE), "{}").unwrap();
|
std::fs::write(dir.join(ANALYSIS_INPUT_FILE), "{}").unwrap();
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -1209,13 +1214,13 @@ async fn reset_case_clears_derived_and_unfails_audio() {
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn reset_case_requires_admin() {
|
async fn reset_case_requires_admin() {
|
||||||
// Default `test_user` has role=doctor, not admin.
|
// Default `test_user` has role=doctor, not admin.
|
||||||
let cfg = cfg_llm("reset-nonadmin");
|
let (cfg, settings) = cfg_llm("reset-nonadmin");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&dir, "2026-04-15T09-00-00Z", Some("hallo"));
|
seed_recording(&dir, "2026-04-15T09-00-00Z", Some("hallo"));
|
||||||
std::fs::write(dir.join(DOCUMENT_FILE), "# Doc\n").unwrap();
|
std::fs::write(dir.join(DOCUMENT_FILE), "# Doc\n").unwrap();
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
@@ -1236,12 +1241,12 @@ async fn reset_case_requires_admin() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn bulk_reset_processes_multiple_cases_admin_only() {
|
async fn bulk_reset_processes_multiple_cases_admin_only() {
|
||||||
let cfg = TestConfig::new()
|
let (cfg, settings) = TestConfig::new()
|
||||||
.with_label("bulk-reset")
|
.with_label("bulk-reset")
|
||||||
.with_user(test_admin("dr_a"))
|
.with_user(test_admin("dr_a"))
|
||||||
.with_user(test_user("dr_b"))
|
.with_user(test_user("dr_b"))
|
||||||
.with_llm("http://unused")
|
.with_llm("http://unused")
|
||||||
.build();
|
.build_pair();
|
||||||
let case_a = "11111111-1111-1111-1111-111111111111";
|
let case_a = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_b = "22222222-2222-2222-2222-222222222222";
|
let case_b = "22222222-2222-2222-2222-222222222222";
|
||||||
let dir_a = seed_case(&cfg.data_path, "dr_a", case_a);
|
let dir_a = seed_case(&cfg.data_path, "dr_a", case_a);
|
||||||
@@ -1256,7 +1261,7 @@ async fn bulk_reset_processes_multiple_cases_admin_only() {
|
|||||||
seed_recording(&dir_c, "2026-04-15T11-00-00Z", Some("c"));
|
seed_recording(&dir_c, "2026-04-15T11-00-00Z", Some("c"));
|
||||||
std::fs::write(dir_c.join(DOCUMENT_FILE), "C").unwrap();
|
std::fs::write(dir_c.join(DOCUMENT_FILE), "C").unwrap();
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
|
|
||||||
// Admin: bulk reset succeeds.
|
// Admin: bulk reset succeeds.
|
||||||
let (cookie_admin, csrf_admin) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie_admin, csrf_admin) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
@@ -1304,12 +1309,12 @@ async fn bulk_reset_processes_multiple_cases_admin_only() {
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn bulk_close_rejected_for_non_admin() {
|
async fn bulk_close_rejected_for_non_admin() {
|
||||||
// Default `test_user` is role=doctor.
|
// Default `test_user` is role=doctor.
|
||||||
let cfg = cfg_llm("bulk-close-nonadmin");
|
let (cfg, settings) = cfg_llm("bulk-close-nonadmin");
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(&dir, "2026-04-15T10-00-00Z", Some("a"));
|
seed_recording(&dir, "2026-04-15T10-00-00Z", Some("a"));
|
||||||
|
|
||||||
let (app, store) = doctate_server::create_router_and_session_store(cfg);
|
let (app, store) = doctate_server::create_router_and_session_store_with_settings(cfg, settings);
|
||||||
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
let (cookie, csrf) = login_with_csrf(&app, &store, "dr_a", "s").await;
|
||||||
|
|
||||||
let body = format!("action={}&case_id={case_id}", BulkAction::Close);
|
let body = format!("action={}&case_id={case_id}", BulkAction::Close);
|
||||||
@@ -1370,12 +1375,12 @@ async fn analyze_works_against_ollama_style_endpoint_without_api_key() {
|
|||||||
// Ollama-style config: explicitly empty api_key — `with_llm_explicit`
|
// Ollama-style config: explicitly empty api_key — `with_llm_explicit`
|
||||||
// lets the builder carry "" through, whereas `with_llm` would default
|
// lets the builder carry "" through, whereas `with_llm` would default
|
||||||
// to the hosted-provider test key.
|
// to the hosted-provider test key.
|
||||||
let cfg = TestConfig::new()
|
let (_cfg, settings) = TestConfig::new()
|
||||||
.with_label("analyze-ollama")
|
.with_label("analyze-ollama")
|
||||||
.with_data_path(tmp.clone())
|
.with_data_path(tmp.clone())
|
||||||
.with_user(test_user("dr_a"))
|
.with_user(test_user("dr_a"))
|
||||||
.with_llm_explicit(mock.uri(), "", "llama3.3:70b")
|
.with_llm_explicit(mock.uri(), "", "llama3.3:70b")
|
||||||
.build();
|
.build_pair();
|
||||||
|
|
||||||
let (tx, rx) = analyze::channel();
|
let (tx, rx) = analyze::channel();
|
||||||
let client = reqwest::Client::new();
|
let client = reqwest::Client::new();
|
||||||
@@ -1383,7 +1388,7 @@ async fn analyze_works_against_ollama_style_endpoint_without_api_key() {
|
|||||||
let vocab = Arc::new(doctate_server::gazetteer::Gazetteer::empty());
|
let vocab = Arc::new(doctate_server::gazetteer::Gazetteer::empty());
|
||||||
let handle = tokio::spawn(analyze::worker::run(
|
let handle = tokio::spawn(analyze::worker::run(
|
||||||
rx,
|
rx,
|
||||||
cfg,
|
settings,
|
||||||
client,
|
client,
|
||||||
busy,
|
busy,
|
||||||
vocab,
|
vocab,
|
||||||
|
|||||||
@@ -77,11 +77,11 @@ async fn case_page_document_has_copy_button() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn case_page_shows_analyze_button_when_transcribed_without_document() {
|
async fn case_page_shows_analyze_button_when_transcribed_without_document() {
|
||||||
let cfg = TestConfig::new()
|
let (cfg, settings) = TestConfig::new()
|
||||||
.with_label("cp-analyze")
|
.with_label("cp-analyze")
|
||||||
.with_user(test_user("dr_a"))
|
.with_user(test_user("dr_a"))
|
||||||
.with_llm("http://unused")
|
.with_llm("http://unused")
|
||||||
.build();
|
.build_pair();
|
||||||
let case_id = "11111111-1111-1111-1111-111111111111";
|
let case_id = "11111111-1111-1111-1111-111111111111";
|
||||||
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
let case_dir = seed_case(&cfg.data_path, "dr_a", case_id);
|
||||||
seed_recording(
|
seed_recording(
|
||||||
@@ -90,7 +90,7 @@ async fn case_page_shows_analyze_button_when_transcribed_without_document() {
|
|||||||
Some("transkribierter Text"),
|
Some("transkribierter Text"),
|
||||||
);
|
);
|
||||||
|
|
||||||
let app = doctate_server::create_router(cfg);
|
let app = doctate_server::create_router_with_settings(cfg, settings);
|
||||||
let cookie = login_dr_a(&app).await;
|
let cookie = login_dr_a(&app).await;
|
||||||
|
|
||||||
let resp = app
|
let resp = app
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ use std::path::PathBuf;
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use doctate_server::config::{Config, User};
|
use doctate_server::config::{Config, User};
|
||||||
|
use doctate_server::settings::Settings;
|
||||||
|
|
||||||
/// Unique tempdir path for a given label. `process::id()` + UUID v4
|
/// Unique tempdir path for a given label. `process::id()` + UUID v4
|
||||||
/// keeps parallel `cargo test` runs from colliding; the label lets
|
/// keeps parallel `cargo test` runs from colliding; the label lets
|
||||||
@@ -125,10 +126,17 @@ impl TestConfig {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Materialize the config. Panics only if the workspace-defaults in
|
/// Materialize the config alone. Bucket-B overrides (`with_llm`,
|
||||||
/// `Config::test_default` themselves are broken (not reachable in
|
/// `with_whisper`, `with_ollama`) are silently dropped — call
|
||||||
/// practice).
|
/// [`build_pair`] when those need to take effect.
|
||||||
pub fn build(self) -> Arc<Config> {
|
pub fn build(self) -> Arc<Config> {
|
||||||
|
self.build_pair().0
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Materialize both `Config` and `Settings`. Use when a test exercises
|
||||||
|
/// LLM, Whisper or Ollama paths and needs the builder-set values to
|
||||||
|
/// reach the worker.
|
||||||
|
pub fn build_pair(self) -> (Arc<Config>, Arc<Settings>) {
|
||||||
let data_path = self.data_path.unwrap_or_else(|| unique_tmpdir(self.label));
|
let data_path = self.data_path.unwrap_or_else(|| unique_tmpdir(self.label));
|
||||||
let api_keys: HashMap<String, String> = self
|
let api_keys: HashMap<String, String> = self
|
||||||
.users
|
.users
|
||||||
@@ -136,21 +144,33 @@ impl TestConfig {
|
|||||||
.map(|u| (u.api_key.clone(), u.slug.clone()))
|
.map(|u| (u.api_key.clone(), u.slug.clone()))
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let defaults = Config::test_default();
|
let config = Arc::new(Config {
|
||||||
Arc::new(Config {
|
|
||||||
data_path,
|
data_path,
|
||||||
users: self.users,
|
users: self.users,
|
||||||
api_keys,
|
api_keys,
|
||||||
llm_url: self.llm_url.unwrap_or(defaults.llm_url),
|
|
||||||
llm_api_key: self.llm_api_key.unwrap_or(defaults.llm_api_key),
|
|
||||||
llm_model: self.llm_model.unwrap_or(defaults.llm_model),
|
|
||||||
whisper_url: self.whisper_url.unwrap_or(defaults.whisper_url),
|
|
||||||
whisper_timeout_seconds: self
|
|
||||||
.whisper_timeout_seconds
|
|
||||||
.unwrap_or(defaults.whisper_timeout_seconds),
|
|
||||||
ollama_url: self.ollama_url.unwrap_or(defaults.ollama_url),
|
|
||||||
..Config::test_default()
|
..Config::test_default()
|
||||||
})
|
});
|
||||||
|
|
||||||
|
let mut settings = Settings::default();
|
||||||
|
if let Some(v) = self.llm_url {
|
||||||
|
settings.llm.url = v;
|
||||||
|
}
|
||||||
|
if let Some(v) = self.llm_api_key {
|
||||||
|
settings.llm.api_key = v;
|
||||||
|
}
|
||||||
|
if let Some(v) = self.llm_model {
|
||||||
|
settings.llm.model = v;
|
||||||
|
}
|
||||||
|
if let Some(v) = self.whisper_url {
|
||||||
|
settings.whisper.url = v;
|
||||||
|
}
|
||||||
|
if let Some(v) = self.whisper_timeout_seconds {
|
||||||
|
settings.whisper.timeout_seconds = v;
|
||||||
|
}
|
||||||
|
if let Some(v) = self.ollama_url {
|
||||||
|
settings.ollama.url = v;
|
||||||
|
}
|
||||||
|
(config, Arc::new(settings))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -53,10 +53,10 @@ async fn failed_only_case_settles_to_empty_without_llm_call() {
|
|||||||
.mount(&mock)
|
.mount(&mock)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
let config = TestConfig::new()
|
let (_config, settings) = TestConfig::new()
|
||||||
.with_data_path(data.path().to_path_buf())
|
.with_data_path(data.path().to_path_buf())
|
||||||
.with_ollama(mock.uri())
|
.with_ollama(mock.uri())
|
||||||
.build();
|
.build_pair();
|
||||||
|
|
||||||
let vocab = Arc::new(Gazetteer::empty());
|
let vocab = Arc::new(Gazetteer::empty());
|
||||||
let events_tx = events::channel();
|
let events_tx = events::channel();
|
||||||
@@ -75,7 +75,14 @@ async fn failed_only_case_settles_to_empty_without_llm_call() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
pipeline
|
pipeline
|
||||||
.heal_orphans_if_idle(&user_root, slug, &http_client, &config, &vocab, &events_tx)
|
.heal_orphans_if_idle(
|
||||||
|
&user_root,
|
||||||
|
slug,
|
||||||
|
&http_client,
|
||||||
|
&settings,
|
||||||
|
&vocab,
|
||||||
|
&events_tx,
|
||||||
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
// Heal spawn drops the busy flag on completion — poll until idle.
|
// Heal spawn drops the busy flag on completion — poll until idle.
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ fn build_state_with_stores() -> AppState {
|
|||||||
let (analyze_tx, _analyze_rx) = analyze::channel();
|
let (analyze_tx, _analyze_rx) = analyze::channel();
|
||||||
AppState {
|
AppState {
|
||||||
config: cfg,
|
config: cfg,
|
||||||
|
settings: Arc::new(doctate_server::settings::Settings::default()),
|
||||||
transcribe_tx,
|
transcribe_tx,
|
||||||
analyze_tx,
|
analyze_tx,
|
||||||
session_store: web_session::new_store(),
|
session_store: web_session::new_store(),
|
||||||
|
|||||||
@@ -71,10 +71,10 @@ async fn heal_orphans_returns_fast_and_dedups_parallel_calls() {
|
|||||||
.mount(&mock)
|
.mount(&mock)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
let config = TestConfig::new()
|
let (_config, settings) = TestConfig::new()
|
||||||
.with_data_path(data.path().to_path_buf())
|
.with_data_path(data.path().to_path_buf())
|
||||||
.with_ollama(mock.uri())
|
.with_ollama(mock.uri())
|
||||||
.build();
|
.build_pair();
|
||||||
|
|
||||||
let vocab = Arc::new(Gazetteer::empty());
|
let vocab = Arc::new(Gazetteer::empty());
|
||||||
let events_tx = events::channel();
|
let events_tx = events::channel();
|
||||||
@@ -99,10 +99,24 @@ async fn heal_orphans_returns_fast_and_dedups_parallel_calls() {
|
|||||||
let before = Instant::now();
|
let before = Instant::now();
|
||||||
timeout(Duration::from_millis(150), async {
|
timeout(Duration::from_millis(150), async {
|
||||||
pipeline
|
pipeline
|
||||||
.heal_orphans_if_idle(&user_root, slug, &http_client, &config, &vocab, &events_tx)
|
.heal_orphans_if_idle(
|
||||||
|
&user_root,
|
||||||
|
slug,
|
||||||
|
&http_client,
|
||||||
|
&settings,
|
||||||
|
&vocab,
|
||||||
|
&events_tx,
|
||||||
|
)
|
||||||
.await;
|
.await;
|
||||||
pipeline
|
pipeline
|
||||||
.heal_orphans_if_idle(&user_root, slug, &http_client, &config, &vocab, &events_tx)
|
.heal_orphans_if_idle(
|
||||||
|
&user_root,
|
||||||
|
slug,
|
||||||
|
&http_client,
|
||||||
|
&settings,
|
||||||
|
&vocab,
|
||||||
|
&events_tx,
|
||||||
|
)
|
||||||
.await;
|
.await;
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ fn build_app_with_events_tx(
|
|||||||
let (analyze_tx, _analyze_rx) = analyze::channel();
|
let (analyze_tx, _analyze_rx) = analyze::channel();
|
||||||
AppState {
|
AppState {
|
||||||
config: cfg,
|
config: cfg,
|
||||||
|
settings: Arc::new(doctate_server::settings::Settings::default()),
|
||||||
transcribe_tx,
|
transcribe_tx,
|
||||||
analyze_tx,
|
analyze_tx,
|
||||||
session_store: web_session::new_store(),
|
session_store: web_session::new_store(),
|
||||||
@@ -230,11 +231,11 @@ async fn early_latch_skips_llm_call_when_manual_set() {
|
|||||||
.mount(&mock)
|
.mount(&mock)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
let cfg = TestConfig::new()
|
let (cfg, settings) = TestConfig::new()
|
||||||
.with_label("oneliner-override-early-latch")
|
.with_label("oneliner-override-early-latch")
|
||||||
.with_user(test_user(SLUG))
|
.with_user(test_user(SLUG))
|
||||||
.with_ollama(mock.uri())
|
.with_ollama(mock.uri())
|
||||||
.build();
|
.build_pair();
|
||||||
let case_id = Uuid::new_v4().to_string();
|
let case_id = Uuid::new_v4().to_string();
|
||||||
let case_dir = seed_case(&cfg.data_path, SLUG, &case_id);
|
let case_dir = seed_case(&cfg.data_path, SLUG, &case_id);
|
||||||
|
|
||||||
@@ -263,7 +264,7 @@ async fn early_latch_skips_llm_call_when_manual_set() {
|
|||||||
&case_dir,
|
&case_dir,
|
||||||
SLUG,
|
SLUG,
|
||||||
&reqwest::Client::new(),
|
&reqwest::Client::new(),
|
||||||
&cfg,
|
&settings,
|
||||||
&vocab,
|
&vocab,
|
||||||
&events_tx,
|
&events_tx,
|
||||||
&locks,
|
&locks,
|
||||||
@@ -305,11 +306,11 @@ async fn re_check_drops_llm_result_when_manual_appears_during_regen() {
|
|||||||
.mount(&mock)
|
.mount(&mock)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
let cfg = TestConfig::new()
|
let (cfg, settings) = TestConfig::new()
|
||||||
.with_label("oneliner-override-race")
|
.with_label("oneliner-override-race")
|
||||||
.with_user(test_user(SLUG))
|
.with_user(test_user(SLUG))
|
||||||
.with_ollama(mock.uri())
|
.with_ollama(mock.uri())
|
||||||
.build();
|
.build_pair();
|
||||||
let case_id = Uuid::new_v4().to_string();
|
let case_id = Uuid::new_v4().to_string();
|
||||||
let case_dir = seed_case(&cfg.data_path, SLUG, &case_id);
|
let case_dir = seed_case(&cfg.data_path, SLUG, &case_id);
|
||||||
|
|
||||||
@@ -326,7 +327,7 @@ async fn re_check_drops_llm_result_when_manual_appears_during_regen() {
|
|||||||
|
|
||||||
// Spawn the regen — it will wait ~500ms inside Mock-Ollama before
|
// Spawn the regen — it will wait ~500ms inside Mock-Ollama before
|
||||||
// reaching the re-check-under-lock branch.
|
// reaching the re-check-under-lock branch.
|
||||||
let regen_cfg = cfg.clone();
|
let regen_settings = settings.clone();
|
||||||
let regen_locks = locks.clone();
|
let regen_locks = locks.clone();
|
||||||
let regen_events = events_tx.clone();
|
let regen_events = events_tx.clone();
|
||||||
let regen_dir = case_dir.clone();
|
let regen_dir = case_dir.clone();
|
||||||
@@ -336,7 +337,7 @@ async fn re_check_drops_llm_result_when_manual_appears_during_regen() {
|
|||||||
®en_dir,
|
®en_dir,
|
||||||
SLUG,
|
SLUG,
|
||||||
&reqwest::Client::new(),
|
&reqwest::Client::new(),
|
||||||
®en_cfg,
|
®en_settings,
|
||||||
&vocab,
|
&vocab,
|
||||||
®en_events,
|
®en_events,
|
||||||
®en_locks,
|
®en_locks,
|
||||||
|
|||||||
@@ -55,10 +55,10 @@ async fn silent_only_case_settles_to_empty_without_llm_call() {
|
|||||||
.mount(&mock)
|
.mount(&mock)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
let config = TestConfig::new()
|
let (_config, settings) = TestConfig::new()
|
||||||
.with_data_path(data.path().to_path_buf())
|
.with_data_path(data.path().to_path_buf())
|
||||||
.with_ollama(mock.uri())
|
.with_ollama(mock.uri())
|
||||||
.build();
|
.build_pair();
|
||||||
|
|
||||||
let vocab = Arc::new(Gazetteer::empty());
|
let vocab = Arc::new(Gazetteer::empty());
|
||||||
let events_tx = events::channel();
|
let events_tx = events::channel();
|
||||||
@@ -77,7 +77,14 @@ async fn silent_only_case_settles_to_empty_without_llm_call() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
pipeline
|
pipeline
|
||||||
.heal_orphans_if_idle(&user_root, slug, &http_client, &config, &vocab, &events_tx)
|
.heal_orphans_if_idle(
|
||||||
|
&user_root,
|
||||||
|
slug,
|
||||||
|
&http_client,
|
||||||
|
&settings,
|
||||||
|
&vocab,
|
||||||
|
&events_tx,
|
||||||
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
// Heal spawn drops the busy flag on completion — poll until idle.
|
// Heal spawn drops the busy flag on completion — poll until idle.
|
||||||
|
|||||||
@@ -260,7 +260,12 @@ async fn recovery_enqueues_only_pending_recordings() {
|
|||||||
|
|
||||||
// -------------------- Worker: failure marker --------------------
|
// -------------------- Worker: failure marker --------------------
|
||||||
|
|
||||||
fn config_with_whisper(whisper_url: String) -> std::sync::Arc<doctate_server::config::Config> {
|
fn config_with_whisper(
|
||||||
|
whisper_url: String,
|
||||||
|
) -> (
|
||||||
|
std::sync::Arc<doctate_server::config::Config>,
|
||||||
|
std::sync::Arc<doctate_server::settings::Settings>,
|
||||||
|
) {
|
||||||
// Ollama URL is irrelevant — worker never reaches it in the failure path.
|
// Ollama URL is irrelevant — worker never reaches it in the failure path.
|
||||||
// Port 1 is effectively unreachable, matching the historical intent.
|
// Port 1 is effectively unreachable, matching the historical intent.
|
||||||
TestConfig::new()
|
TestConfig::new()
|
||||||
@@ -268,7 +273,7 @@ fn config_with_whisper(whisper_url: String) -> std::sync::Arc<doctate_server::co
|
|||||||
.with_user(test_user("dr_test"))
|
.with_user(test_user("dr_test"))
|
||||||
.with_whisper(whisper_url, 5)
|
.with_whisper(whisper_url, 5)
|
||||||
.with_ollama("http://127.0.0.1:1")
|
.with_ollama("http://127.0.0.1:1")
|
||||||
.build()
|
.build_pair()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Permanent Whisper errors (4xx other than 408/429) must rename `.m4a` to
|
/// Permanent Whisper errors (4xx other than 408/429) must rename `.m4a` to
|
||||||
@@ -292,7 +297,7 @@ async fn worker_renames_audio_to_failed_on_permanent_whisper_error() {
|
|||||||
let audio = case_dir.join("2026-04-13T10-30-00Z.m4a");
|
let audio = case_dir.join("2026-04-13T10-30-00Z.m4a");
|
||||||
std::fs::copy(fixture("sample.m4a"), &audio).unwrap();
|
std::fs::copy(fixture("sample.m4a"), &audio).unwrap();
|
||||||
|
|
||||||
let config = config_with_whisper(server.uri());
|
let (config, settings) = config_with_whisper(server.uri());
|
||||||
let (tx, rx) = transcribe::channel();
|
let (tx, rx) = transcribe::channel();
|
||||||
tx.send(transcribe::TranscribeJob {
|
tx.send(transcribe::TranscribeJob {
|
||||||
audio_path: audio.clone(),
|
audio_path: audio.clone(),
|
||||||
@@ -308,6 +313,7 @@ async fn worker_renames_audio_to_failed_on_permanent_whisper_error() {
|
|||||||
transcribe::worker::run(
|
transcribe::worker::run(
|
||||||
rx,
|
rx,
|
||||||
config,
|
config,
|
||||||
|
settings,
|
||||||
client,
|
client,
|
||||||
busy,
|
busy,
|
||||||
vocab,
|
vocab,
|
||||||
@@ -341,7 +347,7 @@ async fn worker_leaves_m4a_intact_on_transient_whisper_error() {
|
|||||||
let audio = case_dir.join("2026-04-13T10-31-00Z.m4a");
|
let audio = case_dir.join("2026-04-13T10-31-00Z.m4a");
|
||||||
std::fs::copy(fixture("sample.m4a"), &audio).unwrap();
|
std::fs::copy(fixture("sample.m4a"), &audio).unwrap();
|
||||||
|
|
||||||
let config = config_with_whisper(server.uri());
|
let (config, settings) = config_with_whisper(server.uri());
|
||||||
let (tx, rx) = transcribe::channel();
|
let (tx, rx) = transcribe::channel();
|
||||||
tx.send(transcribe::TranscribeJob {
|
tx.send(transcribe::TranscribeJob {
|
||||||
audio_path: audio.clone(),
|
audio_path: audio.clone(),
|
||||||
@@ -357,6 +363,7 @@ async fn worker_leaves_m4a_intact_on_transient_whisper_error() {
|
|||||||
transcribe::worker::run(
|
transcribe::worker::run(
|
||||||
rx,
|
rx,
|
||||||
config,
|
config,
|
||||||
|
settings,
|
||||||
client,
|
client,
|
||||||
busy,
|
busy,
|
||||||
vocab,
|
vocab,
|
||||||
@@ -407,7 +414,7 @@ async fn transcribe_worker_normalizes_whisper_output() {
|
|||||||
);
|
);
|
||||||
assert_eq!(vocab.len(), 1);
|
assert_eq!(vocab.len(), 1);
|
||||||
|
|
||||||
let config = config_with_whisper(server.uri());
|
let (config, settings) = config_with_whisper(server.uri());
|
||||||
let (tx, rx) = transcribe::channel();
|
let (tx, rx) = transcribe::channel();
|
||||||
tx.send(transcribe::TranscribeJob {
|
tx.send(transcribe::TranscribeJob {
|
||||||
audio_path: audio.clone(),
|
audio_path: audio.clone(),
|
||||||
@@ -422,6 +429,7 @@ async fn transcribe_worker_normalizes_whisper_output() {
|
|||||||
transcribe::worker::run(
|
transcribe::worker::run(
|
||||||
rx,
|
rx,
|
||||||
config,
|
config,
|
||||||
|
settings,
|
||||||
client,
|
client,
|
||||||
busy,
|
busy,
|
||||||
vocab,
|
vocab,
|
||||||
|
|||||||
@@ -67,11 +67,11 @@ async fn transient_whisper_failure_is_reenqueued_and_recovers() {
|
|||||||
// Config points at the mock Whisper, ollama intentionally unreachable
|
// Config points at the mock Whisper, ollama intentionally unreachable
|
||||||
// (the oneliner heal may fire in parallel; we only assert on
|
// (the oneliner heal may fire in parallel; we only assert on
|
||||||
// the transcript artefact, not on the oneliner).
|
// the transcript artefact, not on the oneliner).
|
||||||
let config = TestConfig::new()
|
let (config, settings) = TestConfig::new()
|
||||||
.with_data_path(data.path().to_path_buf())
|
.with_data_path(data.path().to_path_buf())
|
||||||
.with_user(test_user(slug))
|
.with_user(test_user(slug))
|
||||||
.with_whisper(whisper.uri(), 5)
|
.with_whisper(whisper.uri(), 5)
|
||||||
.build();
|
.build_pair();
|
||||||
|
|
||||||
let vocab = Arc::new(Gazetteer::empty());
|
let vocab = Arc::new(Gazetteer::empty());
|
||||||
let events_tx = events::channel();
|
let events_tx = events::channel();
|
||||||
@@ -88,6 +88,7 @@ async fn transient_whisper_failure_is_reenqueued_and_recovers() {
|
|||||||
let worker = tokio::spawn(transcribe::worker::run(
|
let worker = tokio::spawn(transcribe::worker::run(
|
||||||
rx_t,
|
rx_t,
|
||||||
config.clone(),
|
config.clone(),
|
||||||
|
settings.clone(),
|
||||||
http_client.clone(),
|
http_client.clone(),
|
||||||
transcribe_busy.clone(),
|
transcribe_busy.clone(),
|
||||||
vocab.clone(),
|
vocab.clone(),
|
||||||
@@ -143,7 +144,14 @@ async fn transient_whisper_failure_is_reenqueued_and_recovers() {
|
|||||||
|
|
||||||
// Act 2: heal re-enqueues the pending .m4a (second mock → 200).
|
// Act 2: heal re-enqueues the pending .m4a (second mock → 200).
|
||||||
pipeline
|
pipeline
|
||||||
.heal_orphans_if_idle(&user_root, slug, &http_client, &config, &vocab, &events_tx)
|
.heal_orphans_if_idle(
|
||||||
|
&user_root,
|
||||||
|
slug,
|
||||||
|
&http_client,
|
||||||
|
&settings,
|
||||||
|
&vocab,
|
||||||
|
&events_tx,
|
||||||
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
// Assert: the transcript lands. Poll because the worker runs
|
// Assert: the transcript lands. Poll because the worker runs
|
||||||
|
|||||||
Reference in New Issue
Block a user