feat #14740: merge speakers and name calls
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -7,7 +7,7 @@ use chrono::{DateTime, Local};
|
||||
use serde::Serialize;
|
||||
|
||||
use crate::merge;
|
||||
use crate::model::{Call, CallId, CallStatus, Segment};
|
||||
use crate::model::{Call, CallId, CallStatus, Segment, Speaker};
|
||||
|
||||
/// A row of the call list.
|
||||
#[derive(Serialize, Clone, Debug, PartialEq)]
|
||||
@@ -19,6 +19,8 @@ pub struct CallListItem {
|
||||
pub duration_secs: i64,
|
||||
pub status: CallStatus,
|
||||
pub interrupted: bool,
|
||||
/// The name the user gave the call, if any.
|
||||
pub title: Option<String>,
|
||||
}
|
||||
|
||||
impl CallListItem {
|
||||
@@ -30,6 +32,7 @@ impl CallListItem {
|
||||
duration_secs: duration_secs(call),
|
||||
status: call.status,
|
||||
interrupted: call.interrupted,
|
||||
title: call.title.clone(),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -62,19 +65,43 @@ pub struct SegmentView {
|
||||
pub text: String,
|
||||
}
|
||||
|
||||
/// A merged speaker: "Sprecher 2 → Frau Beispiel zusammengeführt".
|
||||
#[derive(Serialize, Clone, Debug, PartialEq)]
|
||||
pub struct MergeView {
|
||||
pub from_key: String,
|
||||
/// The source's default label: its own rename is not in effect while
|
||||
/// it is merged.
|
||||
pub from_label: String,
|
||||
/// The speaker the source's lines now belong to (the end of a chain of
|
||||
/// merges).
|
||||
pub into_key: String,
|
||||
pub into_label: String,
|
||||
}
|
||||
|
||||
/// Everything the detail pane shows about one call.
|
||||
#[derive(Serialize, Clone, Debug, PartialEq)]
|
||||
pub struct CallDetail {
|
||||
pub call: CallHeader,
|
||||
/// The transcript with speaker merges applied
|
||||
/// ([`merge::apply_merges`]).
|
||||
pub segments: Vec<SegmentView>,
|
||||
/// Renamed speakers by key; speakers not in here keep their default
|
||||
/// label.
|
||||
pub speaker_names: BTreeMap<String, String>,
|
||||
/// The call's speaker merges, by source speaker number.
|
||||
pub merges: Vec<MergeView>,
|
||||
}
|
||||
|
||||
impl CallDetail {
|
||||
pub fn of(call: &Call, segments: &[Segment], speaker_names: BTreeMap<String, String>) -> Self {
|
||||
let segments = segments
|
||||
/// `segments` are the stored ones; `merges` the stored speaker merges
|
||||
/// (source key → target key).
|
||||
pub fn of(
|
||||
call: &Call,
|
||||
segments: &[Segment],
|
||||
speaker_names: BTreeMap<String, String>,
|
||||
merges: &BTreeMap<String, String>,
|
||||
) -> Self {
|
||||
let segments = merge::apply_merges(segments, merges)
|
||||
.iter()
|
||||
.map(|segment| SegmentView {
|
||||
speaker_key: segment.speaker.key(),
|
||||
@@ -91,11 +118,37 @@ impl CallDetail {
|
||||
account_id: call.account_id.clone(),
|
||||
},
|
||||
segments,
|
||||
merges: merge_views(merges, &speaker_names),
|
||||
speaker_names,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn merge_views(
|
||||
merges: &BTreeMap<String, String>,
|
||||
speaker_names: &BTreeMap<String, String>,
|
||||
) -> Vec<MergeView> {
|
||||
let mut views: Vec<(u32, MergeView)> = merge::resolve_merges(merges)
|
||||
.into_iter()
|
||||
.filter_map(|(from_key, into_key)| {
|
||||
let (Some(Speaker::Remote(n)), Some(into)) =
|
||||
(Speaker::from_key(&from_key), Speaker::from_key(&into_key))
|
||||
else {
|
||||
return None;
|
||||
};
|
||||
let view = MergeView {
|
||||
from_label: Speaker::Remote(n).default_label(),
|
||||
into_label: merge::label(&into, speaker_names),
|
||||
from_key,
|
||||
into_key,
|
||||
};
|
||||
Some((n, view))
|
||||
})
|
||||
.collect();
|
||||
views.sort_by_key(|(n, _)| *n);
|
||||
views.into_iter().map(|(_, view)| view).collect()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::path::PathBuf;
|
||||
@@ -124,6 +177,7 @@ mod tests {
|
||||
transcribed_at: None,
|
||||
audio_deleted: false,
|
||||
account_id: None,
|
||||
title: None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -161,8 +215,12 @@ mod tests {
|
||||
duration_secs: 60,
|
||||
status: CallStatus::AwaitingDecision,
|
||||
interrupted: true,
|
||||
title: None,
|
||||
}
|
||||
);
|
||||
|
||||
c.title = Some("Angebot Rioja".into());
|
||||
assert_eq!(CallListItem::of(&c).title.as_deref(), Some("Angebot Rioja"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -176,7 +234,12 @@ mod tests {
|
||||
names.insert("remote:1".to_string(), "Frau Beispiel".to_string());
|
||||
names.insert("remote:2".to_string(), " ".to_string());
|
||||
|
||||
let detail = CallDetail::of(&call(Some(at(10, 15, 0))), &segments, names.clone());
|
||||
let detail = CallDetail::of(
|
||||
&call(Some(at(10, 15, 0))),
|
||||
&segments,
|
||||
names.clone(),
|
||||
&BTreeMap::new(),
|
||||
);
|
||||
|
||||
let lines: Vec<_> = detail
|
||||
.segments
|
||||
@@ -194,6 +257,72 @@ mod tests {
|
||||
assert_eq!(detail.segments[1].start, 2.5);
|
||||
assert_eq!(detail.segments[1].end, 4.5);
|
||||
assert_eq!(detail.speaker_names, names);
|
||||
assert_eq!(detail.merges, []);
|
||||
}
|
||||
|
||||
fn keys(pairs: &[(&str, &str)]) -> BTreeMap<String, String> {
|
||||
pairs
|
||||
.iter()
|
||||
.map(|(a, b)| (a.to_string(), b.to_string()))
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn detail_shows_merged_speakers_under_their_target() {
|
||||
let segments = [
|
||||
segment(Speaker::Remote(1), 0.0, "Guten Tag,"),
|
||||
segment(Speaker::Remote(2), 2.5, "hier Weingut Beispiel."),
|
||||
segment(Speaker::Me, 5.0, "Hallo."),
|
||||
segment(Speaker::Remote(3), 7.5, "Zur Lieferung:"),
|
||||
segment(Speaker::Remote(4), 10.0, "Moin."),
|
||||
];
|
||||
let names = keys(&[("remote:1", "Frau Beispiel"), ("remote:2", "Herr Probe")]);
|
||||
let merges = keys(&[
|
||||
("remote:3", "remote:2"),
|
||||
("remote:2", "remote:1"),
|
||||
("remote:10", "remote:4"),
|
||||
]);
|
||||
|
||||
let detail = CallDetail::of(&call(Some(at(10, 15, 0))), &segments, names, &merges);
|
||||
|
||||
let lines: Vec<_> = detail
|
||||
.segments
|
||||
.iter()
|
||||
.map(|s| (s.speaker_key.as_str(), s.label.as_str(), s.text.as_str()))
|
||||
.collect();
|
||||
assert_eq!(
|
||||
lines,
|
||||
[
|
||||
(
|
||||
"remote:1",
|
||||
"Frau Beispiel",
|
||||
"Guten Tag, hier Weingut Beispiel."
|
||||
),
|
||||
("me", "Ich", "Hallo."),
|
||||
("remote:1", "Frau Beispiel", "Zur Lieferung:"),
|
||||
("remote:4", "Sprecher 4", "Moin."),
|
||||
]
|
||||
);
|
||||
let merge_lines: Vec<_> = detail
|
||||
.merges
|
||||
.iter()
|
||||
.map(|m| {
|
||||
(
|
||||
m.from_key.as_str(),
|
||||
m.from_label.as_str(),
|
||||
m.into_key.as_str(),
|
||||
m.into_label.as_str(),
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
assert_eq!(
|
||||
merge_lines,
|
||||
[
|
||||
("remote:2", "Sprecher 2", "remote:1", "Frau Beispiel"),
|
||||
("remote:3", "Sprecher 3", "remote:1", "Frau Beispiel"),
|
||||
("remote:10", "Sprecher 10", "remote:4", "Sprecher 4"),
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -202,8 +331,11 @@ mod tests {
|
||||
c.status = CallStatus::Failed;
|
||||
c.error = Some("Netzwerkfehler".into());
|
||||
c.account_id = Some("mock-2".into());
|
||||
c.title = Some("Reklamation".into());
|
||||
let merges = keys(&[("remote:2", "remote:1")]);
|
||||
|
||||
let value = serde_json::to_value(CallDetail::of(&c, &[], BTreeMap::new())).unwrap();
|
||||
let value =
|
||||
serde_json::to_value(CallDetail::of(&c, &[], BTreeMap::new(), &merges)).unwrap();
|
||||
|
||||
assert_eq!(
|
||||
value,
|
||||
@@ -215,11 +347,18 @@ mod tests {
|
||||
"duration_secs": 60,
|
||||
"status": "failed",
|
||||
"interrupted": false,
|
||||
"title": "Reklamation",
|
||||
"error": "Netzwerkfehler",
|
||||
"account_id": "mock-2",
|
||||
},
|
||||
"segments": [],
|
||||
"speaker_names": {},
|
||||
"merges": [{
|
||||
"from_key": "remote:2",
|
||||
"from_label": "Sprecher 2",
|
||||
"into_key": "remote:1",
|
||||
"into_label": "Sprecher 1",
|
||||
}],
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user