Skip to content

Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more

fix: chunk uploaded api audio

altic-dev7d952f381f57
diff --git a/Sources/Fluid/Services/LocalAPI/InferenceAPIController.swift b/Sources/Fluid/Services/LocalAPI/InferenceAPIController.swift
index c74a9f5f..96c5b20b 100644
--- a/Sources/Fluid/Services/LocalAPI/InferenceAPIController.swift
+++ b/Sources/Fluid/Services/LocalAPI/InferenceAPIController.swift
@@ -43,32 +43,35 @@ final class InferenceAPIController: LocalAPIRouteHandler {
private func transcribe(_ request: LocalAPI.Request) async -> LocalAPI.Response {
do {
if let fileURL = try self.decodeFilePath(from: request) {
- let apiResult = try await AppServices.shared.asr.transcribeFileForAPI(fileURL)
- return LocalAPI.json(
- TranscribeResponse(
- text: apiResult.result.text,
- confidence: apiResult.result.confidence,
- sampleCount: apiResult.sampleCount,
- provider: SettingsStore.shared.selectedSpeechModel.displayName
- )
- )
+ return try await self.transcribeFile(fileURL)
}
- let samples = try self.decodeAudioSamples(from: request)
- let result = try await AppServices.shared.asr.transcribeSamplesForAPI(samples)
- return LocalAPI.json(
- TranscribeResponse(
- text: result.text,
- confidence: result.confidence,
- sampleCount: samples.count,
- provider: SettingsStore.shared.selectedSpeechModel.displayName
- )
- )
+ let temporaryFileURL = try await self.decodeUploadedAudioFile(from: request)
+ do {
+ let response = try await self.transcribeFile(temporaryFileURL)
+ await LocalAPIAudioDecoder.removeTemporaryFile(at: temporaryFileURL)
+ return response
+ } catch {
+ await LocalAPIAudioDecoder.removeTemporaryFile(at: temporaryFileURL)
+ throw error
+ }
} catch {
return LocalAPI.error(error.localizedDescription, status: 400)
}
}
+ private func transcribeFile(_ fileURL: URL) async throws -> LocalAPI.Response {
+ let apiResult = try await AppServices.shared.asr.transcribeFileForAPI(fileURL)
+ return LocalAPI.json(
+ TranscribeResponse(
+ text: apiResult.result.text,
+ confidence: apiResult.result.confidence,
+ sampleCount: apiResult.sampleCount,
+ provider: SettingsStore.shared.selectedSpeechModel.displayName
+ )
+ )
+ }
+
private func decodeFilePath(from request: LocalAPI.Request) throws -> URL? {
guard self.isJSON(request) else { return nil }
let payload: TranscribeJSONRequest
@@ -98,7 +101,9 @@ final class InferenceAPIController: LocalAPIRouteHandler {
}
}
- private func decodeAudioSamples(from request: LocalAPI.Request) throws -> [Float] {
+ private func decodeUploadedAudioFile(from request: LocalAPI.Request) async throws -> URL {
+ let data: Data
+ let suggestedExtension: String
if self.isJSON(request) {
let payload: TranscribeJSONRequest
do {
@@ -107,30 +112,27 @@ final class InferenceAPIController: LocalAPIRouteHandler {
throw NSError(domain: "InferenceAPIController", code: -3, userInfo: [NSLocalizedDescriptionKey: "Invalid JSON audio payload."])
}
- if let path = payload.path, !path.isEmpty {
- return try LocalAPIAudioDecoder.samples(from: URL(fileURLWithPath: path))
- }
-
if let audioBase64 = payload.audioBase64,
- let data = Data(base64Encoded: audioBase64)
+ let decodedData = Data(base64Encoded: audioBase64)
{
- return try LocalAPIAudioDecoder.samples(
- fromAudioData: data,
- suggestedExtension: payload.filename.flatMap { URL(fileURLWithPath: $0).pathExtension } ?? "wav"
- )
+ data = decodedData
+ suggestedExtension = payload.filename.flatMap { URL(fileURLWithPath: $0).pathExtension } ?? "wav"
+ } else {
+ throw NSError(domain: "InferenceAPIController", code: -1, userInfo: [NSLocalizedDescriptionKey: "Missing audio path or audioBase64."])
+ }
+ } else {
+ guard !request.body.isEmpty else {
+ throw NSError(domain: "InferenceAPIController", code: -1, userInfo: [NSLocalizedDescriptionKey: "Missing audio body."])
}
- throw NSError(domain: "InferenceAPIController", code: -1, userInfo: [NSLocalizedDescriptionKey: "Missing audio path or audioBase64."])
- }
-
- guard !request.body.isEmpty else {
- throw NSError(domain: "InferenceAPIController", code: -1, userInfo: [NSLocalizedDescriptionKey: "Missing audio body."])
+ data = request.body
+ let filename = request.headers["x-filename"] ?? "audio.wav"
+ suggestedExtension = URL(fileURLWithPath: filename).pathExtension
}
- let filename = request.headers["x-filename"] ?? "audio.wav"
- return try LocalAPIAudioDecoder.samples(
- fromAudioData: request.body,
- suggestedExtension: URL(fileURLWithPath: filename).pathExtension
+ return try await LocalAPIAudioDecoder.temporaryFile(
+ fromAudioData: data,
+ suggestedExtension: suggestedExtension
)
}
diff --git a/Sources/Fluid/Services/LocalAPI/LocalAPIAudioDecoder.swift b/Sources/Fluid/Services/LocalAPI/LocalAPIAudioDecoder.swift
index 21e5fb71..2b56dba4 100644
--- a/Sources/Fluid/Services/LocalAPI/LocalAPIAudioDecoder.swift
+++ b/Sources/Fluid/Services/LocalAPI/LocalAPIAudioDecoder.swift
@@ -54,36 +54,22 @@ enum LocalAPIAudioDecoder {
}
}
- static func samples(from fileURL: URL) throws -> [Float] {
- let file = try AVAudioFile(forReading: fileURL)
- let sourceFormat = file.processingFormat
- let framesToRead = file.length
- guard framesToRead > 0 else { return [] }
-
- guard let sourceBuffer = AVAudioPCMBuffer(
- pcmFormat: sourceFormat,
- frameCapacity: AVAudioFrameCount(framesToRead)
- ) else {
- throw NSError(domain: "LocalAPIAudioDecoder", code: -1, userInfo: [NSLocalizedDescriptionKey: "Unable to allocate audio buffer."])
- }
-
- try file.read(into: sourceBuffer, frameCount: AVAudioFrameCount(framesToRead))
- return try AudioBufferConverter.monoSamples(
- from: sourceBuffer,
- targetSampleRate: self.sampleRate
- )
+ static func temporaryFile(fromAudioData data: Data, suggestedExtension: String) async throws -> URL {
+ try await Task.detached(priority: .utility) {
+ let trimmedExtension = suggestedExtension.trimmingCharacters(in: CharacterSet(charactersIn: ". \n\t"))
+ let fileExtension = trimmedExtension.isEmpty ? "wav" : trimmedExtension
+ let fileURL = FileManager.default.temporaryDirectory
+ .appendingPathComponent("fluidvoice-api-\(UUID().uuidString)")
+ .appendingPathExtension(fileExtension)
+ try data.write(to: fileURL, options: .atomic)
+ return fileURL
+ }.value
}
- static func samples(fromAudioData data: Data, suggestedExtension: String) throws -> [Float] {
- let ext = suggestedExtension.trimmingCharacters(in: CharacterSet(charactersIn: ". \n\t")).isEmpty
- ? "wav"
- : suggestedExtension.trimmingCharacters(in: CharacterSet(charactersIn: ". \n\t"))
- let url = FileManager.default.temporaryDirectory
- .appendingPathComponent("fluidvoice-api-\(UUID().uuidString)")
- .appendingPathExtension(ext)
- try data.write(to: url, options: .atomic)
- defer { try? FileManager.default.removeItem(at: url) }
- return try self.samples(from: url)
+ static func removeTemporaryFile(at fileURL: URL) async {
+ await Task.detached(priority: .utility) {
+ try? FileManager.default.removeItem(at: fileURL)
+ }.value
}
static func estimatedSampleCount(for fileURL: URL) throws -> Int {
diff --git a/Tests/FluidDictationIntegrationTests/AudioBufferConverterTests.swift b/Tests/FluidDictationIntegrationTests/AudioBufferConverterTests.swift
index 74d60f5c..ccf6d20e 100644
--- a/Tests/FluidDictationIntegrationTests/AudioBufferConverterTests.swift
+++ b/Tests/FluidDictationIntegrationTests/AudioBufferConverterTests.swift
@@ -91,6 +91,20 @@ final class AudioBufferConverterTests: XCTestCase {
XCTAssertEqual(LocalAPIAudioDecoder.maxChunkDurationSeconds, 20 * 60)
}
+ func testLocalAPIExtensionlessUploadUsesTemporaryWAVAndCleansUp() async throws {
+ let expectedData = Data([0, 1, 2, 3])
+ let fileURL = try await LocalAPIAudioDecoder.temporaryFile(
+ fromAudioData: expectedData,
+ suggestedExtension: ""
+ )
+
+ XCTAssertEqual(fileURL.pathExtension, "wav")
+ XCTAssertEqual(try Data(contentsOf: fileURL), expectedData)
+
+ await LocalAPIAudioDecoder.removeTemporaryFile(at: fileURL)
+ XCTAssertFalse(FileManager.default.fileExists(atPath: fileURL.path))
+ }
+
private func makeFloatBuffer(
sampleRate: Double,
channels: AVAudioChannelCount,