Fix critical integration issues for end-to-end functionality
- Rewrite SidecarManager as singleton with OnceLock, reusing one Python process across all commands instead of spawning per call - Separate stdin/stdout ownership with dedicated BufReader to prevent data corruption between wait_for_ready and send_and_receive - Add ensure_running() for auto-start on first command - Fix asset protocol URL: use convertFileSrc() instead of manual encodeURIComponent which broke file paths with slashes - Add +layout.svelte with global dark theme, CSS reset, and custom scrollbar styling to prevent white flash on startup - Register AppState with Tauri .manage(), initialize SQLite database on app startup at ~/.voicetonotes/voice_to_notes.db - Wire project commands (create/get/list) to real database queries instead of placeholder stubs Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,19 +1,7 @@
|
||||
use serde_json::{json, Value};
|
||||
|
||||
use crate::sidecar::messages::IPCMessage;
|
||||
use crate::sidecar::SidecarManager;
|
||||
|
||||
fn get_sidecar() -> Result<SidecarManager, String> {
|
||||
let python_path = std::env::current_dir()
|
||||
.map_err(|e| e.to_string())?
|
||||
.join("../python")
|
||||
.canonicalize()
|
||||
.map_err(|e| format!("Cannot find python directory: {e}"))?;
|
||||
|
||||
let manager = SidecarManager::new();
|
||||
manager.start(&python_path.to_string_lossy())?;
|
||||
Ok(manager)
|
||||
}
|
||||
use crate::sidecar::sidecar;
|
||||
|
||||
/// Send a chat message to the AI provider via the Python sidecar.
|
||||
#[tauri::command]
|
||||
@@ -22,14 +10,8 @@ pub fn ai_chat(
|
||||
transcript_context: Option<String>,
|
||||
provider: Option<String>,
|
||||
) -> Result<Value, String> {
|
||||
let manager = get_sidecar()?;
|
||||
|
||||
let request_id = uuid::Uuid::new_v4().to_string();
|
||||
let payload = json!({
|
||||
"action": "chat",
|
||||
"messages": messages,
|
||||
"transcript_context": transcript_context.unwrap_or_default(),
|
||||
});
|
||||
let manager = sidecar();
|
||||
manager.ensure_running()?;
|
||||
|
||||
// If a specific provider is requested, set it first
|
||||
if let Some(p) = provider {
|
||||
@@ -41,7 +23,17 @@ pub fn ai_chat(
|
||||
let _ = manager.send_and_receive(&set_msg)?;
|
||||
}
|
||||
|
||||
let msg = IPCMessage::new(&request_id, "ai.chat", payload);
|
||||
let request_id = uuid::Uuid::new_v4().to_string();
|
||||
let msg = IPCMessage::new(
|
||||
&request_id,
|
||||
"ai.chat",
|
||||
json!({
|
||||
"action": "chat",
|
||||
"messages": messages,
|
||||
"transcript_context": transcript_context.unwrap_or_default(),
|
||||
}),
|
||||
);
|
||||
|
||||
let response = manager.send_and_receive(&msg)?;
|
||||
|
||||
if response.msg_type == "error" {
|
||||
@@ -57,7 +49,8 @@ pub fn ai_chat(
|
||||
/// List available AI providers.
|
||||
#[tauri::command]
|
||||
pub fn ai_list_providers() -> Result<Value, String> {
|
||||
let manager = get_sidecar()?;
|
||||
let manager = sidecar();
|
||||
manager.ensure_running()?;
|
||||
|
||||
let request_id = uuid::Uuid::new_v4().to_string();
|
||||
let msg = IPCMessage::new(
|
||||
@@ -73,7 +66,8 @@ pub fn ai_list_providers() -> Result<Value, String> {
|
||||
/// Configure an AI provider with API key/settings.
|
||||
#[tauri::command]
|
||||
pub fn ai_configure(provider: String, config: Value) -> Result<Value, String> {
|
||||
let manager = get_sidecar()?;
|
||||
let manager = sidecar();
|
||||
manager.ensure_running()?;
|
||||
|
||||
let request_id = uuid::Uuid::new_v4().to_string();
|
||||
let msg = IPCMessage::new(
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use serde_json::{json, Value};
|
||||
|
||||
use crate::sidecar::messages::IPCMessage;
|
||||
use crate::sidecar::SidecarManager;
|
||||
use crate::sidecar::sidecar;
|
||||
|
||||
/// Export transcript to caption/text format via the Python sidecar.
|
||||
#[tauri::command]
|
||||
@@ -12,16 +12,8 @@ pub fn export_transcript(
|
||||
output_path: String,
|
||||
title: Option<String>,
|
||||
) -> Result<Value, String> {
|
||||
let python_path = std::env::current_dir()
|
||||
.map_err(|e| e.to_string())?
|
||||
.join("../python")
|
||||
.canonicalize()
|
||||
.map_err(|e| format!("Cannot find python directory: {e}"))?;
|
||||
|
||||
let python_path_str = python_path.to_string_lossy().to_string();
|
||||
|
||||
let manager = SidecarManager::new();
|
||||
manager.start(&python_path_str)?;
|
||||
let manager = sidecar();
|
||||
manager.ensure_running()?;
|
||||
|
||||
let request_id = uuid::Uuid::new_v4().to_string();
|
||||
let msg = IPCMessage::new(
|
||||
|
||||
@@ -1,27 +1,23 @@
|
||||
use tauri::State;
|
||||
|
||||
use crate::db::models::Project;
|
||||
use crate::db::queries;
|
||||
use crate::state::AppState;
|
||||
|
||||
#[tauri::command]
|
||||
pub fn create_project(name: String) -> Result<Project, String> {
|
||||
// TODO: Use actual database connection from app state
|
||||
Ok(Project {
|
||||
id: uuid::Uuid::new_v4().to_string(),
|
||||
name,
|
||||
created_at: chrono::Utc::now().to_rfc3339(),
|
||||
updated_at: chrono::Utc::now().to_rfc3339(),
|
||||
settings: None,
|
||||
status: "active".to_string(),
|
||||
})
|
||||
pub fn create_project(name: String, state: State<AppState>) -> Result<Project, String> {
|
||||
let conn = state.db.lock().map_err(|e| e.to_string())?;
|
||||
queries::create_project(&conn, &name).map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub fn get_project(id: String) -> Result<Option<Project>, String> {
|
||||
// TODO: Use actual database connection from app state
|
||||
let _ = id;
|
||||
Ok(None)
|
||||
pub fn get_project(id: String, state: State<AppState>) -> Result<Option<Project>, String> {
|
||||
let conn = state.db.lock().map_err(|e| e.to_string())?;
|
||||
queries::get_project(&conn, &id).map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub fn list_projects() -> Result<Vec<Project>, String> {
|
||||
// TODO: Use actual database connection from app state
|
||||
Ok(vec![])
|
||||
pub fn list_projects(state: State<AppState>) -> Result<Vec<Project>, String> {
|
||||
let conn = state.db.lock().map_err(|e| e.to_string())?;
|
||||
queries::list_projects(&conn).map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
use serde_json::{json, Value};
|
||||
|
||||
use crate::sidecar::messages::IPCMessage;
|
||||
use crate::sidecar::SidecarManager;
|
||||
use crate::sidecar::sidecar;
|
||||
|
||||
/// Start transcription of an audio file via the Python sidecar.
|
||||
///
|
||||
/// This is a blocking command — it starts the sidecar if needed,
|
||||
/// sends the transcribe request, and waits for the result.
|
||||
#[tauri::command]
|
||||
pub fn transcribe_file(
|
||||
file_path: String,
|
||||
@@ -14,17 +11,8 @@ pub fn transcribe_file(
|
||||
device: Option<String>,
|
||||
language: Option<String>,
|
||||
) -> Result<Value, String> {
|
||||
// Determine Python sidecar path (relative to app)
|
||||
let python_path = std::env::current_dir()
|
||||
.map_err(|e| e.to_string())?
|
||||
.join("../python")
|
||||
.canonicalize()
|
||||
.map_err(|e| format!("Cannot find python directory: {e}"))?;
|
||||
|
||||
let python_path_str = python_path.to_string_lossy().to_string();
|
||||
|
||||
let manager = SidecarManager::new();
|
||||
manager.start(&python_path_str)?;
|
||||
let manager = sidecar();
|
||||
manager.ensure_running()?;
|
||||
|
||||
let request_id = uuid::Uuid::new_v4().to_string();
|
||||
let msg = IPCMessage::new(
|
||||
@@ -63,16 +51,8 @@ pub fn run_pipeline(
|
||||
max_speakers: Option<u32>,
|
||||
skip_diarization: Option<bool>,
|
||||
) -> Result<Value, String> {
|
||||
let python_path = std::env::current_dir()
|
||||
.map_err(|e| e.to_string())?
|
||||
.join("../python")
|
||||
.canonicalize()
|
||||
.map_err(|e| format!("Cannot find python directory: {e}"))?;
|
||||
|
||||
let python_path_str = python_path.to_string_lossy().to_string();
|
||||
|
||||
let manager = SidecarManager::new();
|
||||
manager.start(&python_path_str)?;
|
||||
let manager = sidecar();
|
||||
manager.ensure_running()?;
|
||||
|
||||
let request_id = uuid::Uuid::new_v4().to_string();
|
||||
let msg = IPCMessage::new(
|
||||
|
||||
Reference in New Issue
Block a user