Phase 6: Llama-server manager, settings UI, packaging, and polish
- Implement LlamaManager in Rust for llama-server lifecycle: spawn with port allocation, health check, clean shutdown on Drop, model listing - Add llama_start/stop/status/list_models Tauri commands - Add load_settings/save_settings commands with JSON persistence - Build SettingsModal with tabs for Transcription, AI Provider, Local AI settings (model size, device, language, API keys, provider selection) - Wire settings into pipeline calls (model, device, language, skip diarization) - Configure Tauri packaging: asset protocol for local audio files, CSP policy, bundle metadata, Linux .deb/.AppImage and Windows .msi config - Add keyboard shortcuts: Space (play/pause), Ctrl+O (import), Ctrl+, (settings), Escape (close menus/modals) - Close export dropdown on outside click - Tests: 30 Python, 6 Rust, 0 Svelte errors Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
287
src/lib/components/SettingsModal.svelte
Normal file
287
src/lib/components/SettingsModal.svelte
Normal file
@@ -0,0 +1,287 @@
|
||||
<script lang="ts">
|
||||
import { settings, saveSettings, type AppSettings } from '$lib/stores/settings';
|
||||
|
||||
interface Props {
|
||||
visible: boolean;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
let { visible, onClose }: Props = $props();
|
||||
|
||||
let localSettings = $state<AppSettings>({ ...$settings });
|
||||
let activeTab = $state<'transcription' | 'ai' | 'local'>('transcription');
|
||||
|
||||
// Sync when settings store changes
|
||||
$effect(() => {
|
||||
localSettings = { ...$settings };
|
||||
});
|
||||
|
||||
async function handleSave() {
|
||||
await saveSettings(localSettings);
|
||||
onClose();
|
||||
}
|
||||
|
||||
function handleCancel() {
|
||||
localSettings = { ...$settings };
|
||||
onClose();
|
||||
}
|
||||
|
||||
function handleOverlayClick(e: MouseEvent) {
|
||||
if ((e.target as HTMLElement).classList.contains('modal-overlay')) {
|
||||
handleCancel();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
{#if visible}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="modal-overlay" onclick={handleOverlayClick} onkeydown={(e) => { if (e.key === 'Escape') handleCancel(); }}>
|
||||
<div class="modal">
|
||||
<div class="modal-header">
|
||||
<h2>Settings</h2>
|
||||
<button class="close-btn" onclick={handleCancel}>x</button>
|
||||
</div>
|
||||
|
||||
<div class="tabs">
|
||||
<button class="tab" class:active={activeTab === 'transcription'} onclick={() => activeTab = 'transcription'}>
|
||||
Transcription
|
||||
</button>
|
||||
<button class="tab" class:active={activeTab === 'ai'} onclick={() => activeTab = 'ai'}>
|
||||
AI Provider
|
||||
</button>
|
||||
<button class="tab" class:active={activeTab === 'local'} onclick={() => activeTab = 'local'}>
|
||||
Local AI
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
{#if activeTab === 'transcription'}
|
||||
<div class="field">
|
||||
<label for="stt-model">Whisper Model</label>
|
||||
<select id="stt-model" bind:value={localSettings.transcription_model}>
|
||||
<option value="tiny">Tiny (fastest, least accurate)</option>
|
||||
<option value="base">Base (fast, good accuracy)</option>
|
||||
<option value="small">Small (balanced)</option>
|
||||
<option value="medium">Medium (slower, better accuracy)</option>
|
||||
<option value="large-v3">Large v3 (slowest, best accuracy)</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label for="stt-device">Device</label>
|
||||
<select id="stt-device" bind:value={localSettings.transcription_device}>
|
||||
<option value="cpu">CPU</option>
|
||||
<option value="cuda">CUDA (NVIDIA GPU)</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label for="stt-lang">Language (blank = auto-detect)</label>
|
||||
<input id="stt-lang" type="text" bind:value={localSettings.transcription_language} placeholder="e.g., en, es, fr" />
|
||||
</div>
|
||||
<div class="field checkbox">
|
||||
<label>
|
||||
<input type="checkbox" bind:checked={localSettings.skip_diarization} />
|
||||
Skip speaker diarization (faster, no speaker labels)
|
||||
</label>
|
||||
</div>
|
||||
{:else if activeTab === 'ai'}
|
||||
<div class="field">
|
||||
<label for="ai-provider">AI Provider</label>
|
||||
<select id="ai-provider" bind:value={localSettings.ai_provider}>
|
||||
<option value="local">Local (llama-server)</option>
|
||||
<option value="openai">OpenAI</option>
|
||||
<option value="anthropic">Anthropic</option>
|
||||
<option value="litellm">LiteLLM</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
{#if localSettings.ai_provider === 'openai'}
|
||||
<div class="field">
|
||||
<label for="openai-key">OpenAI API Key</label>
|
||||
<input id="openai-key" type="password" bind:value={localSettings.openai_api_key} placeholder="sk-..." />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label for="openai-model">Model</label>
|
||||
<input id="openai-model" type="text" bind:value={localSettings.openai_model} />
|
||||
</div>
|
||||
{:else if localSettings.ai_provider === 'anthropic'}
|
||||
<div class="field">
|
||||
<label for="anthropic-key">Anthropic API Key</label>
|
||||
<input id="anthropic-key" type="password" bind:value={localSettings.anthropic_api_key} placeholder="sk-ant-..." />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label for="anthropic-model">Model</label>
|
||||
<input id="anthropic-model" type="text" bind:value={localSettings.anthropic_model} />
|
||||
</div>
|
||||
{:else if localSettings.ai_provider === 'litellm'}
|
||||
<div class="field">
|
||||
<label for="litellm-model">Model</label>
|
||||
<input id="litellm-model" type="text" bind:value={localSettings.litellm_model} placeholder="provider/model-name" />
|
||||
</div>
|
||||
{/if}
|
||||
{:else}
|
||||
<div class="field">
|
||||
<label for="llama-binary">llama-server Binary Path</label>
|
||||
<input id="llama-binary" type="text" bind:value={localSettings.local_binary_path} placeholder="llama-server" />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label for="llama-model">GGUF Model Path</label>
|
||||
<input id="llama-model" type="text" bind:value={localSettings.local_model_path} placeholder="~/.voicetonotes/models/model.gguf" />
|
||||
</div>
|
||||
<p class="hint">
|
||||
Place GGUF model files in ~/.voicetonotes/models/ for auto-detection.
|
||||
The local AI server uses the OpenAI-compatible API from llama.cpp.
|
||||
</p>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button class="btn-secondary" onclick={handleCancel}>Cancel</button>
|
||||
<button class="btn-primary" onclick={handleSave}>Save</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<style>
|
||||
.modal-overlay {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
background: rgba(0, 0, 0, 0.6);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 100;
|
||||
}
|
||||
.modal {
|
||||
background: #16213e;
|
||||
border-radius: 12px;
|
||||
width: 500px;
|
||||
max-width: 90vw;
|
||||
max-height: 80vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
color: #e0e0e0;
|
||||
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
.modal-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 1rem 1.25rem;
|
||||
border-bottom: 1px solid #2a3a5e;
|
||||
}
|
||||
.modal-header h2 {
|
||||
margin: 0;
|
||||
font-size: 1.1rem;
|
||||
}
|
||||
.close-btn {
|
||||
background: none;
|
||||
border: none;
|
||||
color: #999;
|
||||
font-size: 1.2rem;
|
||||
cursor: pointer;
|
||||
padding: 0.25rem;
|
||||
}
|
||||
.close-btn:hover {
|
||||
color: #e0e0e0;
|
||||
}
|
||||
.tabs {
|
||||
display: flex;
|
||||
border-bottom: 1px solid #2a3a5e;
|
||||
padding: 0 1.25rem;
|
||||
}
|
||||
.tab {
|
||||
background: none;
|
||||
border: none;
|
||||
color: #888;
|
||||
padding: 0.6rem 1rem;
|
||||
cursor: pointer;
|
||||
font-size: 0.85rem;
|
||||
border-bottom: 2px solid transparent;
|
||||
}
|
||||
.tab:hover {
|
||||
color: #e0e0e0;
|
||||
}
|
||||
.tab.active {
|
||||
color: #e94560;
|
||||
border-bottom-color: #e94560;
|
||||
}
|
||||
.modal-body {
|
||||
padding: 1.25rem;
|
||||
overflow-y: auto;
|
||||
flex: 1;
|
||||
}
|
||||
.field {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
.field label {
|
||||
display: block;
|
||||
font-size: 0.8rem;
|
||||
color: #aaa;
|
||||
margin-bottom: 0.3rem;
|
||||
}
|
||||
.field input,
|
||||
.field select {
|
||||
width: 100%;
|
||||
background: #1a1a2e;
|
||||
color: #e0e0e0;
|
||||
border: 1px solid #4a5568;
|
||||
border-radius: 4px;
|
||||
padding: 0.5rem;
|
||||
font-size: 0.85rem;
|
||||
font-family: inherit;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.field input:focus,
|
||||
.field select:focus {
|
||||
outline: none;
|
||||
border-color: #e94560;
|
||||
}
|
||||
.field.checkbox label {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
cursor: pointer;
|
||||
color: #e0e0e0;
|
||||
}
|
||||
.field.checkbox input {
|
||||
width: auto;
|
||||
}
|
||||
.hint {
|
||||
font-size: 0.75rem;
|
||||
color: #666;
|
||||
line-height: 1.4;
|
||||
}
|
||||
.modal-footer {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 0.5rem;
|
||||
padding: 1rem 1.25rem;
|
||||
border-top: 1px solid #2a3a5e;
|
||||
}
|
||||
.btn-secondary {
|
||||
background: none;
|
||||
border: 1px solid #4a5568;
|
||||
color: #e0e0e0;
|
||||
padding: 0.5rem 1rem;
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
font-size: 0.85rem;
|
||||
}
|
||||
.btn-secondary:hover {
|
||||
background: rgba(255,255,255,0.05);
|
||||
}
|
||||
.btn-primary {
|
||||
background: #e94560;
|
||||
border: none;
|
||||
color: white;
|
||||
padding: 0.5rem 1rem;
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
font-size: 0.85rem;
|
||||
font-weight: 500;
|
||||
}
|
||||
.btn-primary:hover {
|
||||
background: #d63851;
|
||||
}
|
||||
</style>
|
||||
@@ -57,7 +57,8 @@
|
||||
wavesurfer?.destroy();
|
||||
});
|
||||
|
||||
function togglePlayPause() {
|
||||
/** Toggle play/pause. Exposed for keyboard shortcuts. */
|
||||
export function togglePlayPause() {
|
||||
wavesurfer?.playPause();
|
||||
}
|
||||
|
||||
|
||||
48
src/lib/stores/settings.ts
Normal file
48
src/lib/stores/settings.ts
Normal file
@@ -0,0 +1,48 @@
|
||||
import { writable } from 'svelte/store';
|
||||
import { invoke } from '@tauri-apps/api/core';
|
||||
|
||||
export interface AppSettings {
|
||||
ai_provider: string;
|
||||
openai_api_key: string;
|
||||
anthropic_api_key: string;
|
||||
openai_model: string;
|
||||
anthropic_model: string;
|
||||
litellm_model: string;
|
||||
local_model_path: string;
|
||||
local_binary_path: string;
|
||||
transcription_model: string;
|
||||
transcription_device: string;
|
||||
transcription_language: string;
|
||||
skip_diarization: boolean;
|
||||
}
|
||||
|
||||
const defaults: AppSettings = {
|
||||
ai_provider: 'local',
|
||||
openai_api_key: '',
|
||||
anthropic_api_key: '',
|
||||
openai_model: 'gpt-4o-mini',
|
||||
anthropic_model: 'claude-sonnet-4-6',
|
||||
litellm_model: 'gpt-4o-mini',
|
||||
local_model_path: '',
|
||||
local_binary_path: 'llama-server',
|
||||
transcription_model: 'base',
|
||||
transcription_device: 'cpu',
|
||||
transcription_language: '',
|
||||
skip_diarization: false,
|
||||
};
|
||||
|
||||
export const settings = writable<AppSettings>({ ...defaults });
|
||||
|
||||
export async function loadSettings(): Promise<void> {
|
||||
try {
|
||||
const saved = await invoke<Record<string, unknown>>('load_settings');
|
||||
settings.update(s => ({ ...s, ...saved } as AppSettings));
|
||||
} catch {
|
||||
// Use defaults if settings can't be loaded
|
||||
}
|
||||
}
|
||||
|
||||
export async function saveSettings(s: AppSettings): Promise<void> {
|
||||
settings.set(s);
|
||||
await invoke('save_settings', { settings: s });
|
||||
}
|
||||
@@ -6,11 +6,58 @@
|
||||
import SpeakerManager from '$lib/components/SpeakerManager.svelte';
|
||||
import AIChatPanel from '$lib/components/AIChatPanel.svelte';
|
||||
import ProgressOverlay from '$lib/components/ProgressOverlay.svelte';
|
||||
import SettingsModal from '$lib/components/SettingsModal.svelte';
|
||||
import { segments, speakers } from '$lib/stores/transcript';
|
||||
import { settings, loadSettings } from '$lib/stores/settings';
|
||||
import type { Segment, Speaker } from '$lib/types/transcript';
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
let waveformPlayer: WaveformPlayer;
|
||||
let audioUrl = $state('');
|
||||
let showSettings = $state(false);
|
||||
|
||||
onMount(() => {
|
||||
loadSettings();
|
||||
|
||||
// Global keyboard shortcuts
|
||||
function handleKeyDown(e: KeyboardEvent) {
|
||||
// Don't trigger shortcuts when typing in inputs
|
||||
const tag = (e.target as HTMLElement)?.tagName;
|
||||
if (tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT') return;
|
||||
|
||||
if (e.key === ' ' && !e.ctrlKey && !e.metaKey) {
|
||||
e.preventDefault();
|
||||
waveformPlayer?.togglePlayPause?.();
|
||||
} else if (e.key === 'o' && (e.ctrlKey || e.metaKey)) {
|
||||
e.preventDefault();
|
||||
handleFileImport();
|
||||
} else if (e.key === ',' && (e.ctrlKey || e.metaKey)) {
|
||||
e.preventDefault();
|
||||
showSettings = true;
|
||||
} else if (e.key === 'Escape') {
|
||||
showExportMenu = false;
|
||||
showSettings = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Close export dropdown on outside click
|
||||
function handleClickOutside(e: MouseEvent) {
|
||||
if (showExportMenu) {
|
||||
const target = e.target as HTMLElement;
|
||||
if (!target.closest('.export-dropdown')) {
|
||||
showExportMenu = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
document.addEventListener('keydown', handleKeyDown);
|
||||
document.addEventListener('click', handleClickOutside);
|
||||
|
||||
return () => {
|
||||
document.removeEventListener('keydown', handleKeyDown);
|
||||
document.removeEventListener('click', handleClickOutside);
|
||||
};
|
||||
});
|
||||
let isTranscribing = $state(false);
|
||||
let transcriptionProgress = $state(0);
|
||||
let transcriptionStage = $state('');
|
||||
@@ -61,7 +108,13 @@
|
||||
duration_ms: number;
|
||||
speakers: string[];
|
||||
num_speakers: number;
|
||||
}>('run_pipeline', { filePath });
|
||||
}>('run_pipeline', {
|
||||
filePath,
|
||||
model: $settings.transcription_model || undefined,
|
||||
device: $settings.transcription_device || undefined,
|
||||
language: $settings.transcription_language || undefined,
|
||||
skipDiarization: $settings.skip_diarization || undefined,
|
||||
});
|
||||
|
||||
// Create speaker entries from pipeline result
|
||||
const newSpeakers: Speaker[] = (result.speakers || []).map((label, idx) => ({
|
||||
@@ -167,6 +220,9 @@
|
||||
<button class="import-btn" onclick={handleFileImport}>
|
||||
Import Audio/Video
|
||||
</button>
|
||||
<button class="settings-btn" onclick={() => showSettings = true} title="Settings">
|
||||
Settings
|
||||
</button>
|
||||
{#if $segments.length > 0}
|
||||
<div class="export-dropdown">
|
||||
<button class="export-btn" onclick={() => showExportMenu = !showExportMenu}>
|
||||
@@ -204,6 +260,11 @@
|
||||
message={transcriptionMessage}
|
||||
/>
|
||||
|
||||
<SettingsModal
|
||||
visible={showSettings}
|
||||
onClose={() => showSettings = false}
|
||||
/>
|
||||
|
||||
<style>
|
||||
.app-header {
|
||||
display: flex;
|
||||
@@ -235,6 +296,19 @@
|
||||
gap: 0.5rem;
|
||||
align-items: center;
|
||||
}
|
||||
.settings-btn {
|
||||
background: none;
|
||||
border: 1px solid #4a5568;
|
||||
color: #e0e0e0;
|
||||
padding: 0.5rem 0.75rem;
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
.settings-btn:hover {
|
||||
background: rgba(255,255,255,0.05);
|
||||
border-color: #e94560;
|
||||
}
|
||||
.export-dropdown {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user