jake/vOOice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed locale and looping issue

Browse Source
This commit is contained in:
Beingpax 2025-06-26 13:59:40 +05:45
parent 9629d8b8ef
commit 1ff124a7ce
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VoiceInk/Services/AIService.swift
View File

@ -99,9 +99,8 @@ enum AIProvider: String, CaseIterable {
"claude-opus-4-0", "claude-opus-4-0",
"claude-sonnet-4-0", "claude-sonnet-4-0",
"claude-3-7-sonnet-latest", "claude-3-7-sonnet-latest",
"claude-3-5-sonnet-latest",
"claude-3-5-haiku-latest", "claude-3-5-haiku-latest",
"claude-3-opus-latest" "claude-3-5-sonnet-latest"
] ]
case .mistral: case .mistral:
return [ return [

56
VoiceInk/Services/NativeAppleTranscriptionService.swift
View File

@ -34,6 +34,7 @@ class NativeAppleTranscriptionService: TranscriptionService {
case transcriptionFailed case transcriptionFailed
case localeNotSupported case localeNotSupported
case invalidModel case invalidModel
case assetAllocationFailed
var errorDescription: String? { var errorDescription: String? {
switch self { switch self {
@ -45,6 +46,8 @@ class NativeAppleTranscriptionService: TranscriptionService {
return "The selected language is not supported by SpeechAnalyzer." return "The selected language is not supported by SpeechAnalyzer."
case .invalidModel: case .invalidModel:
return "Invalid model type provided for Native Apple transcription." return "Invalid model type provided for Native Apple transcription."
case .assetAllocationFailed:
return "Failed to allocate assets for the selected locale."
} }
} }
} }
@ -69,16 +72,16 @@ class NativeAppleTranscriptionService: TranscriptionService {
let appleLocale = mapToAppleLocale(selectedLanguage) let appleLocale = mapToAppleLocale(selectedLanguage)
let locale = Locale(identifier: appleLocale) let locale = Locale(identifier: appleLocale)
// Check for locale support and asset installation status. // Check for locale support and asset installation status using proper BCP-47 format
let supportedLocales = await SpeechTranscriber.supportedLocales let supportedLocales = await SpeechTranscriber.supportedLocales
let installedLocales = await SpeechTranscriber.installedLocales let installedLocales = await SpeechTranscriber.installedLocales
let isLocaleSupported = supportedLocales.contains(locale) let isLocaleSupported = supportedLocales.map({ $0.identifier(.bcp47) }).contains(locale.identifier(.bcp47))
let isLocaleInstalled = installedLocales.contains(locale) let isLocaleInstalled = installedLocales.map({ $0.identifier(.bcp47) }).contains(locale.identifier(.bcp47))
// Create the detailed log message // Create the detailed log message
let supportedIdentifiers = supportedLocales.map { $0.identifier }.sorted().joined(separator: ", ") let supportedIdentifiers = supportedLocales.map { $0.identifier(.bcp47) }.sorted().joined(separator: ", ")
let installedIdentifiers = installedLocales.map { $0.identifier }.sorted().joined(separator: ", ") let installedIdentifiers = installedLocales.map { $0.identifier(.bcp47) }.sorted().joined(separator: ", ")
let availableForDownload = Set(supportedLocales).subtracting(Set(installedLocales)).map { $0.identifier }.sorted().joined(separator: ", ") let availableForDownload = Set(supportedLocales).subtracting(Set(installedLocales)).map { $0.identifier(.bcp47) }.sorted().joined(separator: ", ")
var statusMessage: String var statusMessage: String
if isLocaleInstalled { if isLocaleInstalled {
@ -92,7 +95,7 @@ class NativeAppleTranscriptionService: TranscriptionService {
let logMessage = """ let logMessage = """
--- Native Speech Transcription --- --- Native Speech Transcription ---
Selected Language: '\(selectedLanguage)' → Apple Locale: '\(locale.identifier)' Selected Language: '\(selectedLanguage)' → Apple Locale: '\(locale.identifier(.bcp47))'
Status: \(statusMessage) Status: \(statusMessage)
------------------------------------ ------------------------------------
Supported Locales: [\(supportedIdentifiers)] Supported Locales: [\(supportedIdentifiers)]
@ -103,10 +106,14 @@ class NativeAppleTranscriptionService: TranscriptionService {
logger.notice("\(logMessage)") logger.notice("\(logMessage)")
guard isLocaleSupported else { guard isLocaleSupported else {
logger.error("Transcription failed: Locale '\(locale.identifier)' is not supported by SpeechTranscriber.") logger.error("Transcription failed: Locale '\(locale.identifier(.bcp47))' is not supported by SpeechTranscriber.")
throw ServiceError.localeNotSupported throw ServiceError.localeNotSupported
} }
// Properly manage asset allocation/deallocation
try await deallocateExistingAssets()
try await allocateAssetsForLocale(locale)
let transcriber = SpeechTranscriber( let transcriber = SpeechTranscriber(
locale: locale, locale: locale,
transcriptionOptions: [], transcriptionOptions: [],
@ -137,19 +144,44 @@ class NativeAppleTranscriptionService: TranscriptionService {
#endif #endif
} }
@available(macOS 26, *)
private func deallocateExistingAssets() async throws {
#if canImport(Speech)
// Deallocate any existing allocated locales to avoid conflicts
for locale in await AssetInventory.allocatedLocales {
await AssetInventory.deallocate(locale: locale)
}
logger.notice("Deallocated existing asset locales.")
#endif
}
@available(macOS 26, *)
private func allocateAssetsForLocale(_ locale: Locale) async throws {
#if canImport(Speech)
do {
try await AssetInventory.allocate(locale: locale)
logger.notice("Successfully allocated assets for locale: '\(locale.identifier(.bcp47))'")
} catch {
logger.error("Failed to allocate assets for locale '\(locale.identifier(.bcp47))': \(error.localizedDescription)")
throw ServiceError.assetAllocationFailed
}
#endif
}
@available(macOS 26, *) @available(macOS 26, *)
private func ensureModelIsAvailable(for transcriber: SpeechTranscriber, locale: Locale) async throws { private func ensureModelIsAvailable(for transcriber: SpeechTranscriber, locale: Locale) async throws {
#if canImport(Speech) #if canImport(Speech)
let isInstalled = await SpeechTranscriber.installedLocales.contains(locale) let installedLocales = await SpeechTranscriber.installedLocales
let isInstalled = installedLocales.map({ $0.identifier(.bcp47) }).contains(locale.identifier(.bcp47))
if !isInstalled { if !isInstalled {
logger.notice("Assets for '\(locale.identifier)' not installed. Requesting system download.") logger.notice("Assets for '\(locale.identifier(.bcp47))' not installed. Requesting system download.")
if let request = try await AssetInventory.assetInstallationRequest(supporting: [transcriber]) { if let request = try await AssetInventory.assetInstallationRequest(supporting: [transcriber]) {
try await request.downloadAndInstall() try await request.downloadAndInstall()
logger.notice("Asset download for '\(locale.identifier)' complete.") logger.notice("Asset download for '\(locale.identifier(.bcp47))' complete.")
} else { } else {
logger.error("Asset download for '\(locale.identifier)' failed: Could not create installation request.") logger.error("Asset download for '\(locale.identifier(.bcp47))' failed: Could not create installation request.")
// Note: We don't throw an error here, as transcription might still work with a base model. // Note: We don't throw an error here, as transcription might still work with a base model.
} }
} }