forked from Blendman974/faceclaw
Merge dedicated offline French Whisper model
This commit is contained in:
18 files changed
+621
-17
No files matched your search
@@ -55,6 +55,7 @@ function settingsEnv(initialUrl = '', initialModel = 'openai-compatible') {
|
||||
'../../native/asr-model': {
|
||||
ASR_MODELS: {
|
||||
moonshine: { label: 'Moonshine', sizeBytes: 1 },
|
||||
'whisper-small-fr': { label: 'Whisper French Small', sizeBytes: 1 },
|
||||
'whisper-base-en': { label: 'Whisper Base English', sizeBytes: 1 },
|
||||
'whisper-base': { label: 'Whisper Base Multilingual', sizeBytes: 1 },
|
||||
},
|
||||
|
||||
@@ -209,6 +209,8 @@ test('provider selection falls back to on-device without a key and connects the
|
||||
assert.notEqual(transcriptionKey({ provider: 'soniox' }), transcriptionKey({ provider: 'soniox', language: 'ja' }));
|
||||
assert.equal(transcriptionKey({ provider: 'onboard-whisper' }), transcriptionKey({ provider: 'onboard-whisper', language: 'en' }));
|
||||
assert.notEqual(transcriptionKey({ provider: 'onboard-whisper' }), transcriptionKey({ provider: 'onboard-whisper', language: '' }));
|
||||
assert.equal(transcriptionKey({ provider: 'onboard-whisper-fr', language: 'en' }), 'onboard-whisper-fr:fr');
|
||||
assert.notEqual(transcriptionKey({ provider: 'onboard-whisper-fr' }), transcriptionKey({ provider: 'onboard-whisper', language: 'fr' }));
|
||||
const statuses = [];
|
||||
const options = { onTranscript() {}, onStatus: status => statuses.push(status), onError() {} };
|
||||
const selection = { provider: 'onboard', elevenLabsApiKey: '', openAiApiKey: ' ', sonioxApiKey: 'soniox-key' };
|
||||
|
||||
@@ -32,4 +32,15 @@ class WhisperModelFilesTest {
|
||||
assertEquals("", model.language)
|
||||
assertEquals(WhisperModelFiles.forLanguage("fr").files, model.files)
|
||||
}
|
||||
@Test fun frenchFineTuneUsesDistinctFilesRegardlessOfTheGenericLanguage() {
|
||||
for (language in listOf(null, "en", "de", "", "fr")) {
|
||||
val model = WhisperModelFiles.forSelection(language, true)
|
||||
assertTrue(model.frenchOnly)
|
||||
assertFalse(model.englishOnly)
|
||||
assertEquals("fr", model.language)
|
||||
assertEquals("sherpa-onnx-whisper-small-fr-int8-v1", model.dirName)
|
||||
assertEquals(listOf("small-fr-encoder.int8.onnx", "small-fr-decoder.int8.onnx", "small-fr-tokens.txt"), model.files)
|
||||
assertEquals(WhisperModelFiles.forLanguage(language), WhisperModelFiles.forSelection(language, false))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -164,6 +164,7 @@ function androidBridge() {
|
||||
setListener(listener) { this.listener = listener; },
|
||||
setCommunicator() {}, setUsePhoneMic() {}, setSaveRecordings() {}, setEndpointing() {},
|
||||
setNoiseSuppression() {}, setBeamFilter() {}, clearSpeakerVerification() {},
|
||||
setFrenchWhisper(enabled) { this.frenchWhisper = enabled; },
|
||||
setOnboardModelKind(kind) { this.modelKind = kind; }, setOnboardLanguage(language) { this.language = language; },
|
||||
start(_mode, id) { this.captureId = id; this.active = true; this.starts++; },
|
||||
stop() { this.active = false; },
|
||||
@@ -173,7 +174,7 @@ function androidBridge() {
|
||||
'@nativescript/core': { Utils: { android: { getApplicationContext: () => ({}) } } },
|
||||
'./speech-pause': { SpeechPauseDetector: class { reset() {} } },
|
||||
'./cloud-stt-provider': { createCloudSttClient: () => null,
|
||||
transcriptionKey: options => `${options.provider}:${options.language ?? (options.provider === 'onboard-whisper' ? 'en' : '')}` },
|
||||
transcriptionKey: options => `${options.provider}:${options.provider === 'onboard-whisper-fr' ? 'fr' : options.language ?? (options.provider === 'onboard-whisper' ? 'en' : '')}` },
|
||||
}, { global: { isAndroid: true }, com: { faceclaw: { app: {
|
||||
FaceclawVoiceController: function () { return controller; },
|
||||
FaceclawVoiceControllerListener: function (listener) { return listener; },
|
||||
@@ -237,3 +238,16 @@ test('a shared capture restarts for a holder that needs another provider, and is
|
||||
assert.equal(controller.active, true);
|
||||
assert.equal(bridge.holdsCapture('ptt'), true);
|
||||
});
|
||||
|
||||
test('dedicated French Whisper selects its own files and switches back without retaining the override', () => {
|
||||
const { bridge, controller } = androidBridge();
|
||||
bridge.startContinuousCapture({ provider: 'onboard-whisper-fr', language: 'en' });
|
||||
assert.equal(controller.modelKind, 'whisper');
|
||||
assert.equal(controller.frenchWhisper, true);
|
||||
assert.equal(controller.language, 'fr');
|
||||
bridge.retargetContinuousCapture({ provider: 'onboard-whisper' });
|
||||
assert.equal(controller.frenchWhisper, false);
|
||||
assert.equal(controller.language, 'en');
|
||||
assert.equal(controller.starts, 2);
|
||||
bridge.stop();
|
||||
});
|
||||
@@ -144,3 +144,67 @@ test('OpenAI transcription model preserves legacy default and persists independe
|
||||
assert.equal(s.voiceLanguageSetting.get(), 'fr');
|
||||
assert.equal(settings(new Map([['voice.openAiTranscriptionModel', 'invalid']])).openAiTranscriptionModelSetting.get(), 'gpt-realtime-whisper');
|
||||
});
|
||||
|
||||
test('French provider persists independently and never overwrites shared language preferences', () => {
|
||||
const values = new Map([['voice.language', 'ja'], ['voice.provider', 'onboard-whisper']]);
|
||||
let s = settings(values);
|
||||
s.voiceProviderSetting.set('onboard-whisper-fr');
|
||||
s = settings(values);
|
||||
assert.equal(s.voiceProviderSetting.get(), 'onboard-whisper-fr');
|
||||
assert.equal(s.getVoiceTranscriptionLanguage('onboard-whisper-fr'), 'fr');
|
||||
assert.equal(s.getVoiceTranscriptionLanguage('onboard-whisper'), 'ja');
|
||||
assert.equal(s.voiceLanguageSetting.get(), 'ja');
|
||||
s.voiceProviderSetting.set('onboard-whisper');
|
||||
assert.equal(s.getVoiceTranscriptionLanguage('onboard-whisper'), 'ja');
|
||||
});
|
||||
|
||||
test('French model download resumes, verifies every file including its license, and preserves other models', () => {
|
||||
const files = new Map(), downloads = [];
|
||||
const asr = load('app/native/asr-model.ts', () => ({
|
||||
Utils: { android: { getApplicationContext: () => ({ getFilesDir: () => ({ getAbsolutePath: () => '/files' }) }) } },
|
||||
}), {
|
||||
java: { io: { File: class {
|
||||
constructor(name) { this.name = name; }
|
||||
exists() { return files.has(this.name); }
|
||||
length() { return files.get(this.name) ?? 0; }
|
||||
delete() { return files.delete(this.name); }
|
||||
} } },
|
||||
com: { faceclaw: { app: {
|
||||
FaceclawModelDownloaderListener: function(listener) { return listener; },
|
||||
FaceclawModelDownloader: class {
|
||||
constructor(url, destination, hash, size, listener) {
|
||||
Object.assign(this, { url, destination, hash, size, listener }); downloads.push(this);
|
||||
}
|
||||
start() {}
|
||||
cancel() {}
|
||||
},
|
||||
} } },
|
||||
});
|
||||
for (const id of ['moonshine', 'whisper-base-en', 'whisper-base']) {
|
||||
const model = asr.ASR_MODELS[id];
|
||||
for (const file of model.files) files.set(`/files/faceclaw-voice-asr/${model.dirName}/${file.name}`, file.sizeBytes);
|
||||
}
|
||||
const model = asr.ASR_MODELS['whisper-small-fr'];
|
||||
const manifest = JSON.parse(fs.readFileSync(path.join(__dirname, '../docs/models/whisper-small-fr/manifest.json')));
|
||||
assert.deepEqual(JSON.parse(JSON.stringify(model.files)), manifest.files);
|
||||
assert.equal(model.totalBytes, model.files.reduce((total, file) => total + file.sizeBytes, 0));
|
||||
assert.equal(asr.isAsrModelReady('whisper-small-fr'), false);
|
||||
asr.startAsrModelDownload('whisper-small-fr');
|
||||
files.set(downloads[0].destination, downloads[0].size);
|
||||
downloads[0].listener.onDone();
|
||||
downloads[1].listener.onError('network unavailable');
|
||||
assert.equal(asr.asrModelState('whisper-small-fr').status, 'absent');
|
||||
asr.startAsrModelDownload('whisper-small-fr');
|
||||
assert.equal(downloads[2].destination, downloads[1].destination, 'resume the missing decoder');
|
||||
for (let index = 2; index < 5; index++) {
|
||||
const download = downloads[index];
|
||||
assert.match(download.url, /api\/packages\/Blendman974\/generic\/faceclaw-asr\/whisper-small-fr-v1\//);
|
||||
assert.match(download.hash, /^[a-f0-9]{64}$/);
|
||||
files.set(download.destination, download.size);
|
||||
download.listener.onDone();
|
||||
}
|
||||
assert.equal(asr.isAsrModelReady('whisper-small-fr'), true);
|
||||
asr.deleteAsrModel('whisper-small-fr');
|
||||
assert.equal(asr.isAsrModelReady('whisper-small-fr'), false);
|
||||
for (const id of ['moonshine', 'whisper-base-en', 'whisper-base']) assert.equal(asr.isAsrModelReady(id), true);
|
||||
});
|
||||
Reference in new issue
Block a user