diff --git a/src/main/speech/model-download-catalog.ts b/src/main/speech/model-download-catalog.ts index 7f9900536ad..6d4b740976a 100644 --- a/src/main/speech/model-download-catalog.ts +++ b/src/main/speech/model-download-catalog.ts @@ -219,7 +219,7 @@ export type DownloadableSpeechModelId = keyof typeof MODEL_DOWNLOAD_FILES /** What the model manager needs to download, verify and place one model's files. */ export type SpeechModelDownload = Pick< SpeechModelManifest, - 'id' | 'provider' | 'downloadFiles' | 'sizeBytes' + 'id' | 'provider' | 'downloadFiles' | 'legacyDownloadFiles' | 'sizeBytes' > const SILERO_VAD_FILES = huggingFaceFiles( diff --git a/src/main/speech/model-manager.ts b/src/main/speech/model-manager.ts index df14306242d..6e794841b4c 100644 --- a/src/main/speech/model-manager.ts +++ b/src/main/speech/model-manager.ts @@ -200,7 +200,7 @@ export class ModelManager extends SpeechModelDownloadTransport { await rm(modelDir, { recursive: true, force: true }) await rename(stagingDir, modelDir) this.updateState(modelId, 'ready') - if (getCatalogModel(modelId)) { + if (getCatalogModel(modelId)?.files?.some((file) => file.endsWith('.gguf'))) { downloadSileroVadInBackground(this) } } catch (err) { diff --git a/src/main/speech/stt-service.test.ts b/src/main/speech/stt-service.test.ts index 5773050260a..2e623501dff 100644 --- a/src/main/speech/stt-service.test.ts +++ b/src/main/speech/stt-service.test.ts @@ -139,10 +139,11 @@ const stoppedReply = (worker: InstanceType) => ({ }) const readyModels = (): ModelManager => - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SttService reads only getModelState and getModelDir. + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SttService reads getModelState and getModelDir, and fetches the VAD with downloadModel. ({ getModelState: vi.fn().mockResolvedValue({ id: 'model-a', status: 'ready' }), - getModelDir: vi.fn().mockReturnValue('/tmp/model-a') + getModelDir: vi.fn().mockReturnValue('/tmp/model-a'), + downloadModel: vi.fn().mockResolvedValue(undefined) }) as never // Starting a session awaits the model check before it spawns the process. @@ -320,11 +321,12 @@ describe('SttService', () => { }) it('rebuilds the warm worker when the dictation language changes', async () => { - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a local start reads only getModelState and getModelDir. + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a local start reads getModelState and getModelDir, and fetches the VAD with downloadModel. const service = new SttService( { getModelState: vi.fn().mockResolvedValue({ id: 'whisper-model', status: 'ready' }), - getModelDir: vi.fn().mockReturnValue('/tmp/whisper-model') + getModelDir: vi.fn().mockReturnValue('/tmp/whisper-model'), + downloadModel: vi.fn().mockResolvedValue(undefined) } as never, spawnMockWorker ) @@ -467,7 +469,8 @@ describe('SttService', () => { const service = new SttService( { getModelState: vi.fn(() => modelStatePromise), - getModelDir: vi.fn().mockReturnValue('/tmp/model-a') + getModelDir: vi.fn().mockReturnValue('/tmp/model-a'), + downloadModel: vi.fn().mockResolvedValue(undefined) } as never, spawnMockWorker ) @@ -500,7 +503,8 @@ describe('SttService', () => { const service = new SttService( { getModelState: vi.fn().mockResolvedValue({ id: 'openai-model', status: 'ready' }), - getModelDir: vi.fn().mockReturnValue('/tmp/model-a') + getModelDir: vi.fn().mockReturnValue('/tmp/model-a'), + downloadModel: vi.fn().mockResolvedValue(undefined) } as never, spawnMockWorker ) @@ -782,7 +786,8 @@ describe('SttService', () => { const service = new SttService( { getModelState, - getModelDir: vi.fn().mockReturnValue('/tmp/model-a') + getModelDir: vi.fn().mockReturnValue('/tmp/model-a'), + downloadModel: vi.fn().mockResolvedValue(undefined) } as never, spawnMockWorker ) @@ -810,14 +815,15 @@ describe('SttService', () => { async (event) => { vi.useFakeTimers() try { - const models: Pick = { + const models: Pick = { getModelState: vi.fn().mockResolvedValue({ id: 'model-a', status: 'ready' }), - getModelDir: vi.fn().mockReturnValue('/tmp/model-a') + getModelDir: vi.fn().mockReturnValue('/tmp/model-a'), + downloadModel: vi.fn().mockResolvedValue(undefined) } - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This lifecycle reads only getModelState/getModelDir on the model manager. + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This lifecycle reads getModelState/getModelDir and downloadModel (VAD) on the model manager. const service = new SttService(models as ModelManager, spawnMockWorker) const sink = vi.fn() await service.startDictation('model-a', sink, undefined, 'desktop')