From 0663fd77d1f9fa1d2ecff053fcf737831fb97fc6 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 5 Sep 2024 12:41:02 -0400 Subject: [PATCH] fix inference category for face fusion --- .../src/by_table/generic_inference_jobs/inference_category.rs | 3 ++- .../generic_inference/web/insert_generic_inference_job.rs | 2 ++ .../workflows/enqueue/enqueue_face_fusion_workflow_handler.rs | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_category.rs b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_category.rs index b0a385e15..efed24461 100644 --- a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_category.rs +++ b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_category.rs @@ -18,10 +18,11 @@ use utoipa::ToSchema; pub enum InferenceCategory { /// Deprecate this field !!! /// We should drain all jobs from using this database field, then remove it. + #[deprecated(note = "NB(bt,2024-09-05): The frontend still needs this")] #[serde(rename = "deprecated_field")] DeprecatedField, - /// Facial lipsync animation (eg. SadTalker, Wav2Lip) + /// Facial lipsync animation (eg. SadTalker, Wav2Lip, FaceFusion) #[serde(rename = "lipsync_animation")] #[default] LipsyncAnimation, diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs b/crates/lib/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs index 7a9b6c593..a55ebfeb9 100644 --- a/crates/lib/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs +++ b/crates/lib/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs @@ -26,7 +26,9 @@ pub struct InsertGenericInferenceArgs<'a> { pub maybe_product_category: Option, + // TODO(bt,2024-09-05): We really need to kill this, but the frontend depends on it. pub inference_category: InferenceCategory, + pub maybe_model_type: Option, pub maybe_model_token: Option<&'a str>, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs index 011b8baa5..09136fc20 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs @@ -250,7 +250,7 @@ pub async fn enqueue_face_fusion_workflow_handler( uuid_idempotency_token: &request.uuid_idempotency_token, job_type: InferenceJobType::FaceFusion, maybe_product_category: Some(InferenceJobProductCategory::VidFaceFusion), - inference_category: InferenceCategory::DeprecatedField, + inference_category: InferenceCategory::LipsyncAnimation, maybe_model_type: None, maybe_model_token: None, maybe_input_source_token: None,