mirror of
https://github.com/stablyai/orca.git
synced 2026-11-16 10:58:10 +00:00
chore(speech): fit the VAD commits onto the sherpa-free engine
The VAD download carries legacy files, fetches after any GGUF model, and the test model managers answer the VAD fetch.
This commit is contained in:
@@ -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(
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -139,10 +139,11 @@ const stoppedReply = (worker: InstanceType<typeof MockWorker>) => ({
|
||||
})
|
||||
|
||||
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<ModelManager, 'getModelState' | 'getModelDir'> = {
|
||||
const models: Pick<ModelManager, 'getModelState' | 'getModelDir' | 'downloadModel'> = {
|
||||
getModelState: vi.fn<ModelManager['getModelState']>().mockResolvedValue({
|
||||
id: 'model-a',
|
||||
status: 'ready'
|
||||
}),
|
||||
getModelDir: vi.fn<ModelManager['getModelDir']>().mockReturnValue('/tmp/model-a')
|
||||
getModelDir: vi.fn<ModelManager['getModelDir']>().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<SttEventSink>()
|
||||
await service.startDictation('model-a', sink, undefined, 'desktop')
|
||||
|
||||
Reference in New Issue
Block a user