Formatting and adding typealias

Author: chen-argmax

Playground.xcodeproj/project.pbxproj

@@ -24,6 +24,7 @@
 		7446C9172E4D536400290EAB /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7446C9162E4D536400290EAB /* SwiftUI.framework */; };
 		7446C9242E4D536500290EAB /* TranscriptionLiveActivityExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 7446C9122E4D536400290EAB /* TranscriptionLiveActivityExtension.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		7469F1FA2E3AC3D00090AEBA /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 7469F1F92E3AC3D00090AEBA /* README.md */; };
+		746D9D512EC7D12300CBFB4A /* VocabularyResults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 746D9D502EC7D11E00CBFB4A /* VocabularyResults.swift */; };
 		746E4C062E39874F009623D7 /* DefaultEnvInitializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 746E4C042E39874F009623D7 /* DefaultEnvInitializer.swift */; };
 		746E4C0A2E398757009623D7 /* PlaygroundEnvInitializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 746E4C082E398757009623D7 /* PlaygroundEnvInitializer.swift */; };
 		746F2A072E39D7030081D0D6 /* NoOpAnalyticsLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 746F2A062E39D6FC0081D0D6 /* NoOpAnalyticsLogger.swift */; };
@@ -103,6 +104,7 @@
 		7446C9142E4D536400290EAB /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
 		7446C9162E4D536400290EAB /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
 		7469F1F92E3AC3D00090AEBA /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+		746D9D502EC7D11E00CBFB4A /* VocabularyResults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VocabularyResults.swift; sourceTree = "<group>"; };
 		746E4C042E39874F009623D7 /* DefaultEnvInitializer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultEnvInitializer.swift; sourceTree = "<group>"; };
 		746E4C082E398757009623D7 /* PlaygroundEnvInitializer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaygroundEnvInitializer.swift; sourceTree = "<group>"; };
 		746F2A062E39D6FC0081D0D6 /* NoOpAnalyticsLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoOpAnalyticsLogger.swift; sourceTree = "<group>"; };
@@ -272,6 +274,7 @@
 		74C12F122E2EB54A00C772C3 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				746D9D502EC7D11E00CBFB4A /* VocabularyResults.swift */,
 				74F860952E2B19060007163C /* CoreAudioUtils.swift */,
 			);
 			path = Utils;
@@ -404,6 +407,7 @@
 				747E67082E300F780061E778 /* TranscribeResultView.swift in Sources */,
 				74312CDC2E1D02E3000D994A /* MacAudioDevicesView.swift in Sources */,
 				74F3B7BE2E1CF44F00C544D1 /* AudioProcessDiscoverer.swift in Sources */,
+				746D9D512EC7D12300CBFB4A /* VocabularyResults.swift in Sources */,
 				1677AFE62B57704E008C61C0 /* ContentView.swift in Sources */,
 				74F3B7C12E1CF4F400C544D1 /* AudioProcess.swift in Sources */,
 				746F2A072E39D7030081D0D6 /* NoOpAnalyticsLogger.swift in Sources */,

Playground/Utils/VocabularyResults.swift

@@ -0,0 +1,4 @@
+import Argmax
+
+/// Convenient alias used for mapping `WordTiming` values to their matching custom vocabulary hits.
+typealias VocabularyResults = [WordTiming: [WordTiming]]

Playground/ViewModels/StreamViewModel.swift

@@ -144,7 +144,7 @@ class StreamViewModel: ObservableObject {
         var title: String = ""
         var confirmedSegments: [TranscriptionSegment] = []
         var hypothesisSegments: [TranscriptionSegment] = []
-        var customVocabularyResults: [WordTiming: [WordTiming]] = [:]
+        var customVocabularyResults: VocabularyResults = [:]
         var streamEndSeconds: Float?
         var bufferEnergy: [Float] = []
         var streamTimestampText: String {
@@ -316,8 +316,8 @@ class StreamViewModel: ObservableObject {
     }
 
     private func mergeVocabularyResults(
-        existing: inout [WordTiming: [WordTiming]],
-        newResults: [WordTiming: [WordTiming]]
+        existing: inout VocabularyResults,
+        newResults: VocabularyResults
     ) {
         guard !newResults.isEmpty else { return }
         for (key, occurrences) in newResults {
@@ -333,7 +333,7 @@ class StreamViewModel: ObservableObject {
     @MainActor
     private func handleResult(_ result: LiveResult, for sourceId: String) {
         switch result {
-        case .hypothesis(let text, _, let hypothesisResult):
+        case .hypothesis(_, _, let hypothesisResult):
             let now = Date().timeIntervalSince1970
             let last = lastHypothesisUpdateAtBySource[sourceId] ?? 0
             // Update at most 10 times per second per source
@@ -354,7 +354,12 @@ class StreamViewModel: ObservableObject {
             Task {
                 await liveActivityManager.updateContentState { oldState in
                     var state = oldState
-                    let highlightedHypothesis = HighlightedTextView.createHighlightedAttributedString(segments: deviceResult?.hypothesisSegments ?? [], customVocabularyResults: deviceResult?.customVocabularyResults ?? [:], font: .body, foregroundColor: .primary)
+                    let highlightedHypothesis = HighlightedTextView.createHighlightedAttributedString(
+                        segments: deviceResult?.hypothesisSegments ?? [],
+                        customVocabularyResults: deviceResult?.customVocabularyResults ?? [:],
+                        font: .body,
+                        foregroundColor: .primary
+                    )
                     state.currentHypothesis = highlightedHypothesis
                     return state
                 }

Playground/ViewModels/TranscribeViewModel.swift

@@ -57,7 +57,7 @@ class TranscribeViewModel: ObservableObject {
     @Published var bufferEnergy: [Float] = []
     @Published var confirmedSegments: [TranscriptionSegment] = []
     @Published var unconfirmedSegments: [TranscriptionSegment] = []
-    @Published var customVocabularyResults: [WordTiming: [WordTiming]] = [:]
+    @Published var customVocabularyResults: VocabularyResults = [:]
     @Published var showShortAudioToast: Bool = false
     @Published var diarizedSpeakerSegments: [SpeakerSegment] = []
     @Published var speakerNames: [Int: String] = [:]

Playground/Views/HighlightedTextView.swift

@@ -6,14 +6,14 @@ import Argmax
 struct HighlightedTextView: View {
     let prefixText: String
     let segments: [TranscriptionSegment]
-    let customVocabularyResults: [WordTiming: [WordTiming]]
+    let customVocabularyResults: VocabularyResults
     let font: Font
     let foregroundColor: Color
 
     init(
         prefixText: String = "",
         segments: [TranscriptionSegment] = [],
-        customVocabularyResults: [WordTiming: [WordTiming]] = [:],
+        customVocabularyResults: VocabularyResults = [:],
         font: Font = .body,
         foregroundColor: Color = .primary
     ) {
@@ -47,7 +47,7 @@ struct HighlightedTextView: View {
     static func createHighlightedAttributedString(
         prefixText: String = "",
         segments: [TranscriptionSegment] = [],
-        customVocabularyResults: [WordTiming: [WordTiming]] = [:],
+        customVocabularyResults: VocabularyResults = [:],
         font: Font,
         foregroundColor: Color
     ) -> AttributedString {
@@ -129,7 +129,7 @@ struct HighlightedTextView: View {
     let sdkWord = WordTiming(word: "SDK", tokens: [], start: 1.0, end: 1.2, probability: 0.9)
     let developersWord = WordTiming(word: "developers", tokens: [], start: 1.2, end: 1.5, probability: 0.9)
 
-    let vocabulary: [WordTiming: [WordTiming]] = [
+    let vocabulary: VocabularyResults = [
         helloWord: [helloWord],
         specialWord: [specialWord],
         sdkWord: [sdkWord],

Playground/Views/StreamResultView.swift

@@ -17,7 +17,7 @@ struct StreamResultLine: View {
 
     let result: StreamViewModel.StreamResult
 
-    private func createHighlightedAttributedString(prefix: String = "", segments: [TranscriptionSegment], customVocabularyResults: [WordTiming: [WordTiming]] = [:], isBold: Bool, color: Color) -> AttributedString {
+    private func createHighlightedAttributedString(prefix: String = "", segments: [TranscriptionSegment], customVocabularyResults: VocabularyResults = [:], isBold: Bool, color: Color) -> AttributedString {
         let baseFont: Font = isBold ? .headline.bold() : .headline
         return HighlightedTextView.createHighlightedAttributedString(
             prefixText: prefix,