From 0ffbf1935c9d091cce22a5583275ac0902f7a693 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Thu, 02 Jul 2026 03:04:51 +0800
Subject: [PATCH] Add Cantonese language model support
---
privatevoice.src/frontend/src/components/settings/LanguagePage.svelte | 264 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 233 insertions(+), 31 deletions(-)
diff --git a/privatevoice.src/frontend/src/components/settings/LanguagePage.svelte b/privatevoice.src/frontend/src/components/settings/LanguagePage.svelte
index 3ff0db7..f989836 100644
--- a/privatevoice.src/frontend/src/components/settings/LanguagePage.svelte
+++ b/privatevoice.src/frontend/src/components/settings/LanguagePage.svelte
@@ -3,7 +3,7 @@
import { t, setLocale } from '../../lib/i18n'
import { languageMode, languageID, effectiveLanguageID, uiLocale } from '../../lib/stores/config'
import type { UILocale } from '../../lib/stores/config'
- import { engineStatus, engineHardwareInfo } from '../../lib/stores/app'
+ import { engineStatus } from '../../lib/stores/app'
interface ModelOption {
modelID: string
@@ -14,6 +14,8 @@
isDefault: boolean
downloadSize?: string
description?: string
+ supportedInBuild?: boolean
+ unsupportedReason?: string
}
interface LanguageOption {
@@ -30,8 +32,11 @@
let languageOptions = $state<LanguageOption[]>([])
let modelOptions = $state<ModelOption[]>([])
let modelBusyID = $state('')
+ let modelBusyKind = $state<'download' | 'select' | ''>('')
+ let modelCancellingID = $state('')
let modelProgress = $state(0)
let modelError = $state('')
+ let pendingLanguageID = $state('')
const unsub1 = languageMode.subscribe(v => { languageModeVal = v })
const unsub2 = languageID.subscribe(v => { languageIDVal = v })
@@ -39,8 +44,30 @@
Events.On('model:download-progress', (ev: any) => {
const data = ev?.data
- if (data?.modelID && data.modelID === modelBusyID && typeof data.percent === 'number') {
+ if (data?.modelID && typeof data.percent === 'number') {
+ modelBusyID = data.modelID
+ modelBusyKind = 'download'
+ if (modelCancellingID !== data.modelID) {
+ modelCancellingID = ''
+ }
modelProgress = data.percent
+ }
+ })
+
+ Events.On('model:download-cancelled', (ev: any) => {
+ const data = ev?.data
+ if (data?.modelID) {
+ modelBusyID = data.modelID
+ modelBusyKind = 'download'
+ modelCancellingID = data.modelID
+ }
+ })
+
+ Events.On('model:download-finished', (ev: any) => {
+ const data = ev?.data
+ if (!data?.modelID || data.modelID === modelBusyID) {
+ clearModelBusy()
+ loadModelOptions()
}
})
@@ -50,6 +77,7 @@
applyLanguageSettings(lang)
} catch {}
await loadModelOptions()
+ await syncModelDownloadStatus()
settingsLoaded = true
}
loadSettings()
@@ -74,23 +102,69 @@
async function syncEngineForCurrentModel() {
try {
const current: any = await Call.ByName('voicesnap/services.EngineService.GetCurrentModelStatus')
- if (current?.installed) {
- engineStatus.set('loading')
- } else {
- engineHardwareInfo.set('')
- engineStatus.set('need_model')
- }
+ if (!current?.installed) return
+ engineStatus.set('loading')
await Call.ByName('voicesnap/services.EngineService.ReloadCurrentModel')
} catch {}
}
async function loadModelOptions() {
+ if (pendingLanguageID) {
+ await loadModelOptionsForLanguage(pendingLanguageID)
+ return
+ }
+ await loadCurrentModelOptions()
+ }
+
+ async function loadCurrentModelOptions() {
try {
const options: any = await Call.ByName('voicesnap/services.EngineService.ListModelOptions')
modelOptions = Array.isArray(options) ? options : []
} catch {
modelOptions = []
}
+ }
+
+ async function loadModelOptionsForLanguage(selection: string): Promise<ModelOption[]> {
+ try {
+ const options: any = await Call.ByName('voicesnap/services.EngineService.ListModelOptionsForLanguage', selection)
+ modelOptions = Array.isArray(options) ? options : []
+ return modelOptions
+ } catch {
+ modelOptions = []
+ return []
+ }
+ }
+
+ async function syncModelDownloadStatus(): Promise<boolean> {
+ try {
+ const status: any = await Call.ByName('voicesnap/services.EngineService.GetModelDownloadStatus')
+ return applyModelDownloadStatus(status)
+ } catch {
+ return false
+ }
+ }
+
+ function applyModelDownloadStatus(status: any): boolean {
+ if (status?.active && status?.modelID) {
+ modelBusyID = status.modelID
+ modelBusyKind = 'download'
+ modelCancellingID = status.cancelling ? status.modelID : ''
+ modelProgress = typeof status.percent === 'number' ? status.percent : 0
+ modelError = ''
+ return true
+ }
+ if (modelBusyKind === 'download') {
+ clearModelBusy()
+ }
+ return false
+ }
+
+ function clearModelBusy() {
+ modelBusyID = ''
+ modelBusyKind = ''
+ modelCancellingID = ''
+ modelProgress = 0
}
function modelDescription(option: ModelOption): string {
@@ -102,6 +176,7 @@
case 'zipformer-ja-reazonspeech': return t('models.japaneseDesc')
case 'zipformer-ko': return t('models.koreanDesc')
case 'qwen3-asr-0.6b': return t('models.qwen3Desc')
+ case 'sensevoice-yue-2025-09-09': return t('models.sensevoiceYueDesc')
default: return option.description || ''
}
}
@@ -113,68 +188,191 @@
}
function modelTierLabel(option: ModelOption): string {
+ if (!modelSupported(option)) return t('settings.modelUnavailable')
if (option.isDefault) return t('settings.modelDefault')
if (option.tier === 'advanced') return t('settings.modelAdvanced')
return option.tier || ''
}
+ function modelSupported(option: ModelOption): boolean {
+ return option.supportedInBuild !== false
+ }
+
+ function modelUnsupportedText(option: ModelOption): string {
+ if (option.unsupportedReason === 'requires_macos_14') {
+ return t('models.qwen3RequiresMacOS14')
+ }
+ if (option.unsupportedReason === 'windows_preview_unsupported') {
+ return t('models.windowsPreviewUnsupported')
+ }
+ return t('settings.modelUnavailable')
+ }
+
function modelActionLabel(option: ModelOption): string {
+ if (!modelSupported(option)) return t('settings.modelUnavailable')
if (modelBusyID === option.modelID) {
- if (!option.installed && modelProgress > 0) {
- return `${Math.min(100, Math.max(0, modelProgress)).toFixed(0)}%`
+ if (modelBusyKind === 'download') {
+ return modelCancellingID === option.modelID ? t('settings.modelCancelling') : t('settings.modelCancel')
}
return t('settings.modelWorking')
}
- if (option.isCurrent) return t('settings.modelCurrent')
+ if (option.isCurrent && option.installed) return t('settings.modelCurrent')
if (option.installed) return t('settings.modelUse')
return t('settings.modelDownload')
}
+ function modelMeta(option: ModelOption): string {
+ let meta = option.installed ? t('settings.modelInstalled') : t('settings.modelNotInstalled')
+ if (!modelSupported(option)) {
+ return `${meta} · ${modelUnsupportedText(option)}`
+ }
+ if (option.downloadSize) {
+ meta += ` · ${option.downloadSize}`
+ }
+ if (modelBusyID === option.modelID && modelBusyKind === 'download' && modelProgress > 0) {
+ const pct = Math.min(100, Math.max(0, modelProgress)).toFixed(0)
+ meta += ` · ${pct}%`
+ }
+ return meta
+ }
+
+ function isCancelError(err: any): boolean {
+ const text = errorMessage(err).toLowerCase()
+ return text.includes('context canceled') || text.includes('cancelled') || text.includes('canceled')
+ }
+
+ function isAlreadyDownloadingError(err: any): boolean {
+ return errorMessage(err).toLowerCase().includes('already downloading')
+ }
+
+ function errorMessage(err: any): string {
+ const raw = String(err?.message || err || '')
+ if (!raw.startsWith('{')) return raw
+ try {
+ const parsed = JSON.parse(raw)
+ return String(parsed?.message || raw)
+ } catch {
+ return raw
+ }
+ }
+
+ function canCancelModel(option: ModelOption): boolean {
+ return modelBusyID === option.modelID && modelBusyKind === 'download'
+ }
+
+ async function onModelButton(option: ModelOption) {
+ if (canCancelModel(option)) {
+ await cancelModelDownload(option)
+ return
+ }
+ await onModelAction(option)
+ }
+
+ async function cancelModelDownload(option: ModelOption) {
+ if (!canCancelModel(option) || modelCancellingID) return
+ modelCancellingID = option.modelID
+ modelError = ''
+ try {
+ const cancelled: any = await Call.ByName('voicesnap/services.EngineService.CancelModelDownload', option.modelID)
+ if (!cancelled) {
+ clearModelBusy()
+ await loadModelOptions()
+ await syncModelDownloadStatus()
+ }
+ } catch (err: any) {
+ modelError = errorMessage(err) || t('settings.modelActionFailed')
+ clearModelBusy()
+ await loadModelOptions()
+ await syncModelDownloadStatus()
+ }
+ }
+
async function onModelAction(option: ModelOption) {
- if (option.isCurrent || modelBusyID) return
+ if (!modelSupported(option) || (option.isCurrent && option.installed) || modelBusyID) return
modelBusyID = option.modelID
+ modelBusyKind = option.installed ? 'select' : 'download'
modelProgress = 0
modelError = ''
try {
if (option.installed) {
engineStatus.set('loading')
- await Call.ByName('voicesnap/services.EngineService.SelectModel', option.modelID)
+ if (pendingLanguageID) {
+ await Call.ByName('voicesnap/services.EngineService.SelectModelForLanguage', pendingLanguageID, option.modelID)
+ pendingLanguageID = ''
+ const settings: any = await Call.ByName('voicesnap/services.ConfigService.GetLanguageSettings')
+ applyLanguageSettings(settings)
+ } else {
+ await Call.ByName('voicesnap/services.EngineService.SelectModel', option.modelID)
+ }
} else {
- await Call.ByName('voicesnap/services.EngineService.DownloadModelByID', option.modelID)
+ if (pendingLanguageID) {
+ await Call.ByName('voicesnap/services.EngineService.DownloadModelByIDForLanguage', pendingLanguageID, option.modelID)
+ pendingLanguageID = ''
+ const settings: any = await Call.ByName('voicesnap/services.ConfigService.GetLanguageSettings')
+ applyLanguageSettings(settings)
+ } else {
+ await Call.ByName('voicesnap/services.EngineService.DownloadModelByID', option.modelID)
+ }
engineStatus.set('loading')
}
await loadModelOptions()
} catch (err: any) {
- modelError = err?.message || String(err || t('settings.modelActionFailed'))
+ if (isAlreadyDownloadingError(err)) {
+ const active = await syncModelDownloadStatus()
+ if (!active) {
+ modelError = errorMessage(err)
+ }
+ } else if (!isCancelError(err)) {
+ modelError = errorMessage(err) || t('settings.modelActionFailed')
+ }
await loadModelOptions()
} finally {
- modelBusyID = ''
- modelProgress = 0
+ if (modelBusyID === option.modelID) {
+ const active = await syncModelDownloadStatus()
+ if (!active || modelBusyID !== option.modelID) {
+ clearModelBusy()
+ }
+ }
}
}
async function onLanguageChange(selection: string) {
const prevMode = languageModeVal
const prevID = languageIDVal
+ const prevEffectiveID = effectiveLanguageIDVal
+ const prevPendingID = pendingLanguageID
if (selection === 'auto') {
+ pendingLanguageID = ''
languageModeVal = 'auto'
languageMode.set('auto')
} else {
languageModeVal = 'manual'
languageIDVal = selection
- languageMode.set('manual')
- languageID.set(selection)
}
try {
+ if (selection !== 'auto') {
+ const options = await loadModelOptionsForLanguage(selection)
+ const defaultInstalled = options.some(option => option.isDefault && option.installed)
+ if (!defaultInstalled) {
+ pendingLanguageID = selection
+ effectiveLanguageIDVal = selection
+ await syncModelDownloadStatus()
+ return
+ }
+ }
+ pendingLanguageID = ''
const settings: any = selection === 'auto'
? await Call.ByName('voicesnap/services.ConfigService.SetLanguageAuto')
: await Call.ByName('voicesnap/services.ConfigService.SetLanguageManual', selection)
applyLanguageSettings(settings)
await syncEngineForCurrentModel()
await loadModelOptions()
+ await syncModelDownloadStatus()
} catch {
languageModeVal = prevMode
languageIDVal = prevID
+ effectiveLanguageIDVal = prevEffectiveID
+ pendingLanguageID = prevPendingID
languageMode.set(prevMode)
languageID.set(prevID)
}
@@ -228,29 +426,25 @@
<div class="model-list">
{#each modelOptions as option}
- <div class="model-card" class:current={option.isCurrent}>
+ <div class="model-card" class:current={option.isCurrent} class:unsupported={!modelSupported(option)}>
<div class="model-main">
<div class="model-title-row">
<span class="model-title">{option.displayName}</span>
- <span class="model-pill" class:current={option.isCurrent}>
- {option.isCurrent ? t('settings.modelCurrent') : modelTierLabel(option)}
+ <span class="model-pill" class:current={option.isCurrent && option.installed}>
+ {option.isCurrent && option.installed ? t('settings.modelCurrent') : modelTierLabel(option)}
</span>
</div>
<span class="model-desc">{modelDescription(option)}</span>
- <span class="model-meta">
- {option.installed ? t('settings.modelInstalled') : t('settings.modelNotInstalled')}
- {#if option.downloadSize}
- · {option.downloadSize}
- {/if}
- </span>
+ <span class="model-meta">{modelMeta(option)}</span>
</div>
- {#if option.isCurrent}
+ {#if option.isCurrent && option.installed}
<span class="model-current-status">{t('settings.modelCurrent')}</span>
{:else}
<button
class="model-action primary"
- disabled={!!modelBusyID}
- onclick={() => onModelAction(option)}
+ class:cancel={canCancelModel(option)}
+ disabled={!modelSupported(option) || (!!modelBusyID && modelBusyID !== option.modelID)}
+ onclick={() => onModelButton(option)}
>
{modelActionLabel(option)}
</button>
@@ -375,6 +569,10 @@
background: rgba(0, 122, 255, 0.055);
}
+ .model-card.unsupported {
+ opacity: 0.76;
+ }
+
.model-card.current::before {
content: '';
position: absolute;
@@ -456,6 +654,10 @@
color: white;
}
+ .model-action.primary.cancel {
+ background: var(--color-red);
+ }
+
.model-action:disabled {
cursor: not-allowed;
opacity: 0.72;
--
Gitblit v1.9.3