From 3bb7cdae235efa55e37c96fc12e499c0cddda6c9 Mon Sep 17 00:00:00 2001 From: imeepos Date: Fri, 8 Aug 2025 18:16:52 +0800 Subject: [PATCH] fix: cargo check --lib error --- apps/desktop/src-tauri/mixvideo.db | Bin 0 -> 122880 bytes .../workflow_execution_record_repository.rs | 8 +- .../commands/comfyui_v2_commands.rs | 83 ++++++++++++++---- .../commands/comfyui_v2_queue_commands.rs | 32 +++---- .../comfyui/ComfyUIConnectionPanel.tsx | 8 +- .../components/comfyui/QueueStatusMonitor.tsx | 2 +- apps/desktop/src/pages/ComfyUIV2Dashboard.tsx | 2 +- apps/desktop/src/services/comfyuiV2Service.ts | 27 +++++- apps/desktop/src/store/comfyuiV2Store.ts | 28 +++++- cargos/comfyui-sdk/types/api.rs | 6 ++ 10 files changed, 152 insertions(+), 44 deletions(-) create mode 100644 apps/desktop/src-tauri/mixvideo.db diff --git a/apps/desktop/src-tauri/mixvideo.db b/apps/desktop/src-tauri/mixvideo.db new file mode 100644 index 0000000000000000000000000000000000000000..77bee66868f6ff11c18e27b91c5d3e2ad7b7131d GIT binary patch literal 122880 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 Q1bT_UaR0s`>jA?50)uME@Bjb+ literal 0 HcmV?d00001 diff --git a/apps/desktop/src-tauri/src/data/repositories/workflow_execution_record_repository.rs b/apps/desktop/src-tauri/src/data/repositories/workflow_execution_record_repository.rs index f31079e..9b83649 100644 --- a/apps/desktop/src-tauri/src/data/repositories/workflow_execution_record_repository.rs +++ b/apps/desktop/src-tauri/src/data/repositories/workflow_execution_record_repository.rs @@ -352,10 +352,10 @@ impl WorkflowExecutionRecordRepository { let sql = format!( "SELECT COUNT(*) as total_count, - SUM(CASE WHEN status = '\"completed\"' THEN 1 ELSE 0 END) as completed_count, - SUM(CASE WHEN status = '\"failed\"' THEN 1 ELSE 0 END) as failed_count, - SUM(CASE WHEN status = '\"running\"' THEN 1 ELSE 0 END) as running_count, - SUM(CASE WHEN status = '\"pending\"' THEN 1 ELSE 0 END) as pending_count, + COALESCE(SUM(CASE WHEN status = '\"completed\"' THEN 1 ELSE 0 END), 0) as completed_count, + COALESCE(SUM(CASE WHEN status = '\"failed\"' THEN 1 ELSE 0 END), 0) as failed_count, + COALESCE(SUM(CASE WHEN status = '\"running\"' THEN 1 ELSE 0 END), 0) as running_count, + COALESCE(SUM(CASE WHEN status = '\"pending\"' THEN 1 ELSE 0 END), 0) as pending_count, AVG(CASE WHEN duration_seconds IS NOT NULL THEN duration_seconds ELSE NULL END) as avg_duration, MIN(created_at) as earliest_execution, MAX(created_at) as latest_execution diff --git a/apps/desktop/src-tauri/src/presentation/commands/comfyui_v2_commands.rs b/apps/desktop/src-tauri/src/presentation/commands/comfyui_v2_commands.rs index 5144a3a..17629cb 100644 --- a/apps/desktop/src-tauri/src/presentation/commands/comfyui_v2_commands.rs +++ b/apps/desktop/src-tauri/src/presentation/commands/comfyui_v2_commands.rs @@ -24,6 +24,22 @@ use crate::data::models::comfyui::{ use comfyui_sdk::types::{ComfyUIWorkflow, ComfyUINode}; use crate::business::services::comfyui_manager::ComfyUIManager; +// ==================== 辅助函数 ==================== + +/// 将前端的 ComfyUIV2Config 转换为后端的 ComfyUIConfig +fn convert_v2_config_to_config(v2_config: ComfyUIV2Config) -> ComfyUIConfig { + ComfyUIConfig { + base_url: v2_config.base_url, + timeout_seconds: v2_config.timeout.unwrap_or(30000) / 1000, // 转换毫秒为秒 + retry_attempts: v2_config.retry_attempts.unwrap_or(3), + retry_delay_ms: 1000, // 默认重试延迟 + enable_websocket: true, // 默认启用 WebSocket + enable_cache: v2_config.enable_cache.unwrap_or(true), + max_concurrency: v2_config.max_concurrency.unwrap_or(4), + custom_headers: None, + } +} + // ==================== 请求类型定义 ==================== /// 创建工作流请求 @@ -128,16 +144,30 @@ pub struct HealthCheckResponse { /// 连接到 ComfyUI 服务 #[tauri::command] pub async fn comfyui_v2_connect( + config: Option, state: State<'_, AppState>, ) -> Result { info!("Command: comfyui_v2_connect"); // 获取配置管理器 let config_manager = get_config_manager(&state).await?; - let config = config_manager.get_comfyui_config().await; + + // 使用传入的配置或获取现有配置 + let final_config = if let Some(v2_config) = config { + info!("使用传入的配置: {}", v2_config.base_url); + // 转换为 ComfyUIConfig + let converted_config = convert_v2_config_to_config(v2_config); + // 先更新配置到配置管理器 + config_manager.update_comfyui_config(converted_config.clone()).await + .map_err(|e| format!("更新配置失败: {}", e))?; + converted_config + } else { + info!("使用现有配置"); + config_manager.get_comfyui_config().await + }; // 创建 ComfyUI 管理器 - let manager = ComfyUIManager::new(config) + let manager = ComfyUIManager::new(final_config) .map_err(|e| format!("创建管理器失败: {}", e))?; // 尝试连接 @@ -145,7 +175,7 @@ pub async fn comfyui_v2_connect( Ok(_) => { let stats = manager.get_connection_stats().await; info!("ComfyUI 连接成功"); - + Ok(ConnectionStatusResponse { connected: true, status: stats.status.to_string(), @@ -218,8 +248,14 @@ pub async fn comfyui_v2_get_system_info( ) -> Result { info!("Command: comfyui_v2_get_system_info"); - // TODO: 从管理器获取系统信息 - Err("功能暂未实现".to_string()) + let manager = state.comfyui_manager.read().await; + match manager.get_system_info().await { + Ok(stats) => Ok(convert_system_info(stats)), + Err(e) => { + error!("获取系统信息失败: {}", e); + Err(format!("获取系统信息失败: {}", e)) + } + } } /// 获取队列基本状态 @@ -229,15 +265,23 @@ pub async fn comfyui_v2_get_queue_basic_status( ) -> Result { info!("Command: comfyui_v2_get_queue_basic_status"); - // TODO: 从管理器获取队列状态 - Ok(QueueStatusResponse { - running_count: 0, - pending_count: 0, - running_tasks: Vec::new(), - pending_tasks: Vec::new(), - }) + let manager = state.comfyui_manager.read().await; + match manager.get_queue_status().await { + Ok(status) => Ok(QueueStatusResponse { + running_count: status.running_count, + pending_count: status.pending_count, + running_tasks: Vec::new(), // TODO: 实现详细任务信息 + pending_tasks: Vec::new(), // TODO: 实现详细任务信息 + }), + Err(e) => { + error!("获取队列状态失败: {}", e); + Err(format!("获取队列状态失败: {}", e)) + } + } } + + // ==================== 配置管理命令 ==================== /// 获取 ComfyUI 配置 @@ -256,14 +300,17 @@ pub async fn comfyui_v2_get_config( /// 更新 ComfyUI 配置 #[tauri::command] pub async fn comfyui_v2_update_config( - config: ComfyUIConfig, + config: ComfyUIV2Config, state: State<'_, AppState>, ) -> Result { info!("Command: comfyui_v2_update_config"); let config_manager = get_config_manager(&state).await?; - - match config_manager.update_comfyui_config(config).await { + + // 转换为 ComfyUIConfig + let converted_config = convert_v2_config_to_config(config); + + match config_manager.update_comfyui_config(converted_config).await { Ok(_) => { info!("ComfyUI 配置更新成功"); Ok("配置更新成功".to_string()) @@ -278,12 +325,14 @@ pub async fn comfyui_v2_update_config( /// 验证配置 #[tauri::command] pub async fn comfyui_v2_validate_config( - config: ComfyUIConfig, + config: ComfyUIV2Config, state: State<'_, AppState>, ) -> Result { info!("Command: comfyui_v2_validate_config"); - let validation = config.validate(); + // 转换为 ComfyUIConfig 进行验证 + let converted_config = convert_v2_config_to_config(config); + let validation = converted_config.validate(); Ok(validation) } diff --git a/apps/desktop/src-tauri/src/presentation/commands/comfyui_v2_queue_commands.rs b/apps/desktop/src-tauri/src/presentation/commands/comfyui_v2_queue_commands.rs index f9ca729..ffa297e 100644 --- a/apps/desktop/src-tauri/src/presentation/commands/comfyui_v2_queue_commands.rs +++ b/apps/desktop/src-tauri/src/presentation/commands/comfyui_v2_queue_commands.rs @@ -177,26 +177,28 @@ pub async fn comfyui_v2_cancel_queue_task( Ok("任务已取消".to_string()) } -/// 获取队列状态 +/// 获取队列状态 (简化版本，用于前端) #[tauri::command] pub async fn comfyui_v2_get_queue_status( state: State<'_, AppState>, -) -> Result { +) -> Result { info!("Command: comfyui_v2_get_queue_status"); - // TODO: 从队列管理器获取状态 - Ok(QueueStatisticsResponse { - total_tasks: 0, - pending_tasks: 0, - running_tasks: 0, - completed_tasks: 0, - failed_tasks: 0, - average_wait_time: 0.0, - average_execution_time: 0.0, - throughput: 0.0, - by_priority: HashMap::new(), - by_type: HashMap::new(), - }) + let manager = state.comfyui_manager.read().await; + match manager.get_queue_status().await { + Ok(status) => { + // 返回前端期望的简单格式 + Ok(serde_json::json!({ + "running_count": status.running_count, + "pending_count": status.pending_count, + "history_count": 0 // TODO: 从历史记录获取 + })) + }, + Err(e) => { + error!("获取队列状态失败: {}", e); + Err(format!("获取队列状态失败: {}", e)) + } + } } /// 获取队列中的任务列表 diff --git a/apps/desktop/src/components/comfyui/ComfyUIConnectionPanel.tsx b/apps/desktop/src/components/comfyui/ComfyUIConnectionPanel.tsx index 5f5b8a7..f77ef8e 100644 --- a/apps/desktop/src/components/comfyui/ComfyUIConnectionPanel.tsx +++ b/apps/desktop/src/components/comfyui/ComfyUIConnectionPanel.tsx @@ -35,6 +35,7 @@ export const ComfyUIConnectionPanel: React.FC = ({ refreshSystemInfo, refreshQueueStatus, updateConfig, + loadConfig, startRealtimeMonitor, subscribeRealtimeEvents, realtimeConnected, @@ -52,6 +53,11 @@ export const ComfyUIConnectionPanel: React.FC = ({ const [isConnecting, setIsConnecting] = useState(false); const [connectionError, setConnectionError] = useState(null); + // 组件挂载时加载配置 + useEffect(() => { + loadConfig(); + }, [loadConfig]); + // 初始化配置表单 useEffect(() => { if (config) { @@ -68,7 +74,7 @@ export const ComfyUIConnectionPanel: React.FC = ({ return () => clearInterval(interval); } - }, [isConnected, refreshQueueStatus]); + }, [isConnected]); // 移除 refreshQueueStatus 依赖，因为它是稳定的 Zustand action const handleConnect = async () => { setIsConnecting(true); diff --git a/apps/desktop/src/components/comfyui/QueueStatusMonitor.tsx b/apps/desktop/src/components/comfyui/QueueStatusMonitor.tsx index 8865d84..71bc369 100644 --- a/apps/desktop/src/components/comfyui/QueueStatusMonitor.tsx +++ b/apps/desktop/src/components/comfyui/QueueStatusMonitor.tsx @@ -303,7 +303,7 @@ export const QueueStatusMonitor: React.FC = ({
{queueEvents.map((event, index) => (
diff --git a/apps/desktop/src/pages/ComfyUIV2Dashboard.tsx b/apps/desktop/src/pages/ComfyUIV2Dashboard.tsx index 1909d80..05ca3a4 100644 --- a/apps/desktop/src/pages/ComfyUIV2Dashboard.tsx +++ b/apps/desktop/src/pages/ComfyUIV2Dashboard.tsx @@ -37,7 +37,7 @@ export const ComfyUIV2Dashboard: React.FC = () => { toast.error('连接断开', 'ComfyUI 服务连接已断开'); } } - }, [connectionStatus?.connected, isConnected, toast]); + }, [connectionStatus?.connected, isConnected]); // 移除 toast 依赖 const tabs = [ { diff --git a/apps/desktop/src/services/comfyuiV2Service.ts b/apps/desktop/src/services/comfyuiV2Service.ts index 3bb7e12..d57489a 100644 --- a/apps/desktop/src/services/comfyuiV2Service.ts +++ b/apps/desktop/src/services/comfyuiV2Service.ts @@ -173,7 +173,8 @@ export class ComfyUIV2Service { */ static async connect(config: ComfyUIV2Config): Promise { try { - return await invoke('comfyui_v2_connect', { config }); + const result = await invoke<{connected: boolean, status: string, base_url: string}>('comfyui_v2_connect', { config }); + return result.connected ? '连接成功' : '连接失败'; } catch (error) { console.error('Failed to connect to ComfyUI:', error); throw new Error(`连接 ComfyUI 失败: ${error}`); @@ -260,7 +261,29 @@ export class ComfyUIV2Service { */ static async updateConfig(config: Partial): Promise { try { - return await invoke('comfyui_v2_update_config', { config }); + // 获取当前配置，然后合并新配置 + let currentConfig: ComfyUIV2Config; + try { + currentConfig = await this.getConfig(); + } catch { + // 如果获取失败，使用默认配置 + currentConfig = { + base_url: 'http://192.168.0.193:8188', + timeout: 30000, + retry_attempts: 3, + enable_cache: true, + max_concurrency: 4, + websocket_url: 'ws://192.168.0.193:8188/ws', + }; + } + + // 合并配置 + const fullConfig: ComfyUIV2Config = { + ...currentConfig, + ...config, + }; + + return await invoke('comfyui_v2_update_config', { config: fullConfig }); } catch (error) { console.error('Failed to update config:', error); throw new Error(`更新配置失败: ${error}`); diff --git a/apps/desktop/src/store/comfyuiV2Store.ts b/apps/desktop/src/store/comfyuiV2Store.ts index 4bdebf9..32cf2a1 100644 --- a/apps/desktop/src/store/comfyuiV2Store.ts +++ b/apps/desktop/src/store/comfyuiV2Store.ts @@ -80,6 +80,7 @@ interface ComfyUIV2Actions { refreshConnectionStatus: () => Promise; refreshSystemInfo: () => Promise; refreshQueueStatus: () => Promise; + loadConfig: () => Promise; updateConfig: (config: Partial) => Promise; // ==================== 工作流管理 ==================== @@ -189,13 +190,15 @@ export const useComfyUIV2Store = create()( connect: async (config: ComfyUIV2Config) => { try { + // 先更新配置，然后连接 + await ComfyUIV2Service.updateConfig(config); await ComfyUIV2Service.connect(config); - set({ - isConnected: true, + set({ + isConnected: true, config, connectionStatus: await ComfyUIV2Service.getConnectionStatus() }); - + // 连接成功后加载基础数据 const { refreshSystemInfo, refreshQueueStatus, loadWorkflows, loadTemplates } = get(); await Promise.all([ @@ -257,6 +260,25 @@ export const useComfyUIV2Store = create()( } }, + loadConfig: async () => { + try { + const config = await ComfyUIV2Service.getConfig(); + set({ config }); + } catch (error) { + console.error('Failed to load config:', error); + // 如果加载失败，使用默认配置 + const defaultConfig: ComfyUIV2Config = { + base_url: 'http://192.168.0.193:8188', + timeout: 30000, + retry_attempts: 3, + enable_cache: true, + max_concurrency: 4, + websocket_url: 'ws://192.168.0.193:8188/ws', + }; + set({ config: defaultConfig }); + } + }, + updateConfig: async (configUpdate: Partial) => { try { await ComfyUIV2Service.updateConfig(configUpdate); diff --git a/cargos/comfyui-sdk/types/api.rs b/cargos/comfyui-sdk/types/api.rs index 716b87e..3dce9cb 100644 --- a/cargos/comfyui-sdk/types/api.rs +++ b/cargos/comfyui-sdk/types/api.rs @@ -80,6 +80,7 @@ pub struct SystemInfo { #[derive(Debug, Clone, Serialize, Deserialize)] pub struct DeviceInfo { pub name: String, + #[serde(default = "default_device_type")] pub device_type: String, pub vram_total: u64, pub vram_free: u64, @@ -87,6 +88,11 @@ pub struct DeviceInfo { pub torch_vram_free: u64, } +/// Default device type when not provided by ComfyUI +fn default_device_type() -> String { + "unknown".to_string() +} + /// Object info response #[derive(Debug, Clone, Serialize, Deserialize)] pub struct ObjectInfo {