diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_comfy_ui.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_comfy_ui.rs index 178e83f438..284cd6894e 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_comfy_ui.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_comfy_ui.rs @@ -32,6 +32,8 @@ pub struct InsertArgs<'a> { pub worker_hostname: &'a str, pub worker_cluster: &'a str, pub media_file_type: MediaFileType, + + pub extra_file_modification_info: Option<&'a str>, } pub async fn insert_media_file_from_comfy_ui(args: InsertArgs<'_>) -> AnyhowResult<(MediaFileToken, u64)> @@ -92,6 +94,7 @@ SET creator_ip_address = ?, creator_set_visibility = ?, + extra_file_modification_info = ?, maybe_creator_file_synthetic_id = ?, maybe_creator_category_synthetic_id = ?, @@ -122,6 +125,7 @@ SET args.job.creator_ip_address, args.job.creator_set_visibility.to_str(), + args.extra_file_modification_info, maybe_creator_file_synthetic_id, maybe_creator_category_synthetic_id, diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_dependencies.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_dependencies.rs index 60733a8421..9b39c9877d 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_dependencies.rs +++ b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_dependencies.rs @@ -6,7 +6,6 @@ use crate::job::job_types::workflow::comfy_ui::comfy_ui_inference_command::Comfy pub struct ComfyDependencies { pub inference_command: ComfyInferenceCommand, pub dependency_tokens: RequiredModels, - pub workflow_bucket_path: String, } impl ComfyDependencies { @@ -14,7 +13,6 @@ impl ComfyDependencies { Ok(Self { inference_command: ComfyInferenceCommand::from_env()?, dependency_tokens: RequiredModels::init(), - workflow_bucket_path: easyenv::get_env_string_required("COMFY_WORKFLOW_BUCKET_PATH")?, }) } } @@ -133,6 +131,14 @@ impl RequiredModels { location: PathBuf::from("input/example.png"), url: "https://storage.googleapis.com/vocodes-public/comfyui-deps/example.png".to_string(), }, + ComfyDependency { + location: PathBuf::from("custom_nodes/ComfyUI-AnimateDiff-Evolved/models/sd15_t2v_beta_motion.ckpt"), + url: "https://storage.googleapis.com/vocodes-public/comfyui-deps/sd15_t2v_beta_motion.ckpt".to_string(), + }, + ComfyDependency { + location: PathBuf::from("loras/LCM_LoRA_Weights_SD15.safetensors"), + url: "https://storage.googleapis.com/vocodes-public/comfyui-deps/LCM_LoRA_Weights_SD15.safetensors".to_string(), + }, ], } } diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs index 8354ec7c07..75ddeb30de 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs @@ -149,7 +149,7 @@ pub async fn process_job(args: ComfyProcessJobArgs<'_>) -> Result) -> Result) -> Result) -> Result) -> Result { pub workflow_source: &'a ModelWeightToken, pub output_path: &'a String,