Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
579a91d357 | ||
|
|
19b17fc9a5 | ||
|
|
1268149114 | ||
|
|
0f45f2d066 |
@@ -276,7 +276,7 @@
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 26;
|
||||
CURRENT_PROJECT_VERSION = 30;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = G9LVHZAJNX;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
@@ -290,7 +290,7 @@
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 15.0;
|
||||
MARKETING_VERSION = 1.1.14;
|
||||
MARKETING_VERSION = 1.1.18;
|
||||
ONLY_ACTIVE_ARCH = NO;
|
||||
OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes;
|
||||
@@ -312,7 +312,7 @@
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 26;
|
||||
CURRENT_PROJECT_VERSION = 30;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = G9LVHZAJNX;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
@@ -326,7 +326,7 @@
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 15.0;
|
||||
MARKETING_VERSION = 1.1.14;
|
||||
MARKETING_VERSION = 1.1.18;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes;
|
||||
|
||||
@@ -102,12 +102,14 @@ final class AudioManager: NSObject, ObservableObject {
|
||||
let audioFolder = preserveAudioFiles(completedFiles, meetingID: completedMeetingID)
|
||||
lastRecoveryAudioFolderName = audioFolder?.lastPathComponent
|
||||
if !failures.isEmpty {
|
||||
let retentionDays = UserDefaultsManager.shared.audioRetentionDays
|
||||
let retentionUnit = retentionDays == 1 ? "day" : "days"
|
||||
let recoveryMessage = audioFolder == nil
|
||||
? " The audio remains in the app's temporary folder."
|
||||
: " Audio was kept for three days. Use Show Audio Folder in the Meetingnotes menu to find it."
|
||||
: " Audio was kept for \(retentionDays) \(retentionUnit). Use Show Audio Folder in the Meetingnotes menu to find it."
|
||||
errorMessage = "Transcription failed for " + failures.joined(separator: "; ") + recoveryMessage
|
||||
} else if audioFolder == nil, !completedFiles.isEmpty {
|
||||
errorMessage = "The transcript completed, but Meetingnotes could not move the audio into its three-day storage folder."
|
||||
errorMessage = "The transcript completed, but Meetingnotes could not move the audio into its retention folder."
|
||||
}
|
||||
return updated
|
||||
}
|
||||
@@ -342,12 +344,14 @@ final class AudioManager: NSObject, ObservableObject {
|
||||
private func startTapIO(_ tap: ProcessTap) throws {
|
||||
guard var description = tap.tapStreamDescription,
|
||||
let inputFormat = AVAudioFormat(streamDescription: &description),
|
||||
let targetFormat = systemAudioFile?.processingFormat else {
|
||||
let targetFormat = systemAudioFile?.processingFormat,
|
||||
let converter = AVAudioConverter(from: inputFormat, to: targetFormat) else {
|
||||
throw NSError(domain: "AudioManager", code: -1, userInfo: [NSLocalizedDescriptionKey: "Unsupported system audio format"])
|
||||
}
|
||||
try tap.run(on: tapQueue) { [weak self] _, inputData, _, _, _ in
|
||||
guard let self,
|
||||
let converter = AVAudioConverter(from: inputFormat, to: targetFormat) else { return }
|
||||
guard let self else { return }
|
||||
// The tap queue is serial. Reusing the converter preserves its
|
||||
// resampler state instead of discarding audio at every callback.
|
||||
self.processAudioBuffer(
|
||||
{ self.copyAudioBuffer(from: inputData, format: inputFormat) },
|
||||
converter: converter,
|
||||
|
||||
@@ -17,7 +17,6 @@ class LocalStorageManager {
|
||||
private let meetingsDirectory: URL
|
||||
private let templatesDirectory: URL
|
||||
private let recoveryDirectory: URL
|
||||
private let audioRetentionInterval: TimeInterval = 3 * 24 * 60 * 60
|
||||
|
||||
private init() {
|
||||
// Get the app's documents directory
|
||||
@@ -189,7 +188,8 @@ class LocalStorageManager {
|
||||
options: [.skipsHiddenFiles]
|
||||
) else { return }
|
||||
|
||||
let expirationDate = now.addingTimeInterval(-audioRetentionInterval)
|
||||
let retentionInterval = TimeInterval(UserDefaultsManager.shared.audioRetentionDays) * 24 * 60 * 60
|
||||
let expirationDate = now.addingTimeInterval(-retentionInterval)
|
||||
for folder in folders {
|
||||
guard (try? folder.resourceValues(forKeys: [.isDirectoryKey]).isDirectory) == true else { continue }
|
||||
let audioFiles = recoveryAudioFiles(in: folder)
|
||||
|
||||
@@ -23,6 +23,7 @@ class UserDefaultsManager {
|
||||
static let transcriptionModel = "transcriptionModel"
|
||||
static let muteDeckAPIEnabled = "muteDeckAPIEnabled"
|
||||
static let muteDeckAPIPort = "muteDeckAPIPort"
|
||||
static let audioRetentionDays = "audioRetentionDays"
|
||||
}
|
||||
|
||||
// MARK: - User Blurb
|
||||
@@ -94,4 +95,12 @@ class UserDefaultsManager {
|
||||
}
|
||||
set { userDefaults.set(newValue, forKey: Keys.muteDeckAPIPort) }
|
||||
}
|
||||
|
||||
var audioRetentionDays: Int {
|
||||
get {
|
||||
guard userDefaults.object(forKey: Keys.audioRetentionDays) != nil else { return 3 }
|
||||
return min(max(userDefaults.integer(forKey: Keys.audioRetentionDays), 1), 365)
|
||||
}
|
||||
set { userDefaults.set(min(max(newValue, 1), 365), forKey: Keys.audioRetentionDays) }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,6 +54,11 @@ struct Settings: Codable {
|
||||
set { UserDefaultsManager.shared.muteDeckAPIPort = newValue }
|
||||
}
|
||||
|
||||
var audioRetentionDays: Int {
|
||||
get { UserDefaultsManager.shared.audioRetentionDays }
|
||||
set { UserDefaultsManager.shared.audioRetentionDays = newValue }
|
||||
}
|
||||
|
||||
// System prompt default loading
|
||||
static func defaultSystemPrompt() -> String {
|
||||
guard let path = Bundle.main.path(forResource: "DefaultSystemPrompt", ofType: "txt"),
|
||||
|
||||
@@ -138,8 +138,11 @@ final class ProcessTap {
|
||||
tapDescription = CATapDescription(stereoMixdownOfProcesses: [process.objectID])
|
||||
logger.debug("Configuring tap for single process objectID: \(process.objectID)")
|
||||
case .systemAudio:
|
||||
tapDescription = CATapDescription(monoGlobalTapButExcludeProcesses: [])
|
||||
logger.debug("Configuring a global system audio tap.")
|
||||
// Keep the HAL tap's buffer layout consistent with the default
|
||||
// output stream. AudioManager performs the stereo-to-mono mix when
|
||||
// it converts the captured audio to the 16 kHz transcription file.
|
||||
tapDescription = CATapDescription(stereoGlobalTapButExcludeProcesses: [])
|
||||
logger.debug("Configuring a stereo global system audio tap.")
|
||||
}
|
||||
|
||||
tapDescription.uuid = UUID()
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import AVFoundation
|
||||
import Foundation
|
||||
|
||||
struct CoderModel: Codable, Identifiable, Hashable {
|
||||
@@ -73,6 +74,13 @@ final class CoderAPIClient {
|
||||
let segments: [Transcription.Segment]?
|
||||
}
|
||||
|
||||
private struct AudioChunk {
|
||||
let url: URL
|
||||
let offset: TimeInterval
|
||||
let isTemporary: Bool
|
||||
}
|
||||
|
||||
private let transcriptionChunkDuration: TimeInterval = 3 * 60
|
||||
private let transcriptionSession: URLSession
|
||||
|
||||
private init() {
|
||||
@@ -155,10 +163,67 @@ final class CoderAPIClient {
|
||||
let selectedModel = model.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard !selectedModel.isEmpty else { throw CoderAPIError.missingModel("transcription") }
|
||||
let apiKey = try requiredAPIKey(KeychainHelper.shared.getCoderAPIKey() ?? "")
|
||||
let chunks = try makeAudioChunks(from: fileURL)
|
||||
defer {
|
||||
for chunk in chunks where chunk.isTemporary {
|
||||
try? FileManager.default.removeItem(at: chunk.url)
|
||||
}
|
||||
}
|
||||
|
||||
var textParts: [String] = []
|
||||
var segments: [Transcription.Segment] = []
|
||||
var lastNormalizedText = ""
|
||||
var consecutiveDuplicateCount = 0
|
||||
|
||||
for chunk in chunks {
|
||||
let transcription = try await transcribeChunk(
|
||||
chunk.url,
|
||||
model: selectedModel,
|
||||
language: language,
|
||||
apiKey: apiKey
|
||||
)
|
||||
if transcription.segments.isEmpty {
|
||||
let text = transcription.text.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
if !text.isEmpty {
|
||||
textParts.append(text)
|
||||
segments.append(.init(start: chunk.offset, end: chunk.offset, text: text))
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
for segment in transcription.segments {
|
||||
let text = segment.text.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard !text.isEmpty else { continue }
|
||||
let normalized = text.lowercased()
|
||||
if normalized == lastNormalizedText {
|
||||
consecutiveDuplicateCount += 1
|
||||
} else {
|
||||
lastNormalizedText = normalized
|
||||
consecutiveDuplicateCount = 1
|
||||
}
|
||||
guard consecutiveDuplicateCount <= 2 else { continue }
|
||||
textParts.append(text)
|
||||
segments.append(.init(
|
||||
start: segment.start + chunk.offset,
|
||||
end: segment.end + chunk.offset,
|
||||
text: text
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
return Transcription(text: textParts.joined(separator: "\n"), segments: segments)
|
||||
}
|
||||
|
||||
private func transcribeChunk(
|
||||
_ fileURL: URL,
|
||||
model: String,
|
||||
language: String,
|
||||
apiKey: String
|
||||
) async throws -> Transcription {
|
||||
let boundary = "Meetingnotes-\(UUID().uuidString)"
|
||||
let bodyURL = try makeMultipartBody(
|
||||
audioURL: fileURL,
|
||||
model: selectedModel,
|
||||
model: model,
|
||||
language: language,
|
||||
boundary: boundary
|
||||
)
|
||||
@@ -178,6 +243,80 @@ final class CoderAPIClient {
|
||||
return Transcription(text: decoded.text, segments: decoded.segments ?? [])
|
||||
}
|
||||
|
||||
private func makeAudioChunks(from fileURL: URL) throws -> [AudioChunk] {
|
||||
let input = try AVAudioFile(forReading: fileURL)
|
||||
let format = input.processingFormat
|
||||
guard format.sampleRate > 0 else {
|
||||
return [AudioChunk(url: fileURL, offset: 0, isTemporary: false)]
|
||||
}
|
||||
|
||||
let duration = Double(input.length) / format.sampleRate
|
||||
guard duration > transcriptionChunkDuration else {
|
||||
return [AudioChunk(url: fileURL, offset: 0, isTemporary: false)]
|
||||
}
|
||||
|
||||
let framesPerChunk = AVAudioFramePosition(format.sampleRate * transcriptionChunkDuration)
|
||||
var chunks: [AudioChunk] = []
|
||||
var frameOffset: AVAudioFramePosition = 0
|
||||
|
||||
do {
|
||||
while frameOffset < input.length {
|
||||
let frameCount = min(framesPerChunk, input.length - frameOffset)
|
||||
let chunkURL = FileManager.default.temporaryDirectory
|
||||
.appendingPathComponent("meetingnotes-transcription-\(UUID().uuidString).m4a")
|
||||
try writeAudioChunk(
|
||||
from: input,
|
||||
frameCount: frameCount,
|
||||
format: format,
|
||||
to: chunkURL
|
||||
)
|
||||
chunks.append(AudioChunk(
|
||||
url: chunkURL,
|
||||
offset: Double(frameOffset) / format.sampleRate,
|
||||
isTemporary: true
|
||||
))
|
||||
frameOffset += frameCount
|
||||
}
|
||||
return chunks
|
||||
} catch {
|
||||
for chunk in chunks {
|
||||
try? FileManager.default.removeItem(at: chunk.url)
|
||||
}
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
private func writeAudioChunk(
|
||||
from input: AVAudioFile,
|
||||
frameCount: AVAudioFramePosition,
|
||||
format: AVAudioFormat,
|
||||
to outputURL: URL
|
||||
) throws {
|
||||
let settings: [String: Any] = [
|
||||
AVFormatIDKey: kAudioFormatMPEG4AAC,
|
||||
AVSampleRateKey: format.sampleRate,
|
||||
AVNumberOfChannelsKey: format.channelCount,
|
||||
AVEncoderBitRateKey: 48_000 * max(1, Int(format.channelCount))
|
||||
]
|
||||
let output = try AVAudioFile(
|
||||
forWriting: outputURL,
|
||||
settings: settings,
|
||||
commonFormat: format.commonFormat,
|
||||
interleaved: format.isInterleaved
|
||||
)
|
||||
var remaining = frameCount
|
||||
while remaining > 0 {
|
||||
let requestedFrames = AVAudioFrameCount(min(remaining, 8_192))
|
||||
guard let buffer = AVAudioPCMBuffer(pcmFormat: format, frameCapacity: requestedFrames) else {
|
||||
throw CoderAPIError.invalidResponse
|
||||
}
|
||||
try input.read(into: buffer, frameCount: requestedFrames)
|
||||
guard buffer.frameLength > 0 else { break }
|
||||
try output.write(from: buffer)
|
||||
remaining -= AVAudioFramePosition(buffer.frameLength)
|
||||
}
|
||||
}
|
||||
|
||||
private func endpoint(baseURL: String, path: String) throws -> URL {
|
||||
guard var components = URLComponents(string: baseURL.trimmingCharacters(in: .whitespacesAndNewlines)),
|
||||
let scheme = components.scheme?.lowercased(),
|
||||
|
||||
@@ -71,6 +71,7 @@ class SettingsViewModel: ObservableObject {
|
||||
// via computed properties when they're modified
|
||||
let coderSaved = KeychainHelper.shared.saveCoderAPIKey(settings.coderAPIKey)
|
||||
LocalAPIServer.shared.applyConfiguration()
|
||||
LocalStorageManager.shared.purgeExpiredAudioFolders()
|
||||
|
||||
if showMessage {
|
||||
if coderSaved {
|
||||
|
||||
@@ -128,6 +128,23 @@ struct SettingsView: View {
|
||||
Text("Meeting Storage")
|
||||
.font(.headline)
|
||||
|
||||
LabeledContent("Audio retention") {
|
||||
Stepper(
|
||||
value: $viewModel.settings.audioRetentionDays,
|
||||
in: 1...365
|
||||
) {
|
||||
Text("\(viewModel.settings.audioRetentionDays) \(viewModel.settings.audioRetentionDays == 1 ? "day" : "days")")
|
||||
.monospacedDigit()
|
||||
.frame(minWidth: 70, alignment: .trailing)
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
LocalStorageManager.shared.showAudioFolderInFinder()
|
||||
} label: {
|
||||
Label("Show Audio Folder", systemImage: "folder")
|
||||
}
|
||||
|
||||
Button {
|
||||
showingMeetingImporter = true
|
||||
} label: {
|
||||
|
||||
Reference in New Issue
Block a user