diff --git a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs index a50c3f9c54..a7945f166f 100644 --- a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs +++ b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs @@ -56,7 +56,7 @@ impl InferenceModelType { Self::Vits => "vits", Self::VallEX => "vall_e_x", Self::RerenderAVideo => "rerender_a_video", - Self::StableDiffusion => "stable_diffusion" + Self::StableDiffusion => "stable_diffusion", Self::MocapNet => "mocap_net", Self::StyleTTS2 => "styletts2", } diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs index 1f1397a0fd..46aa3caad9 100644 --- a/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs +++ b/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs @@ -138,7 +138,7 @@ impl InferenceCategoryAbbreviated { Self::TextToSpeech => InferenceCategory::TextToSpeech, Self::VoiceConversion => InferenceCategory::VoiceConversion, Self::VideoFilter => InferenceCategory::VideoFilter, - Self::ImageGeneration =>InferenceCategory::ImageGeneration + Self::ImageGeneration =>InferenceCategory::ImageGeneration, Self::Mocap => InferenceCategory::Mocap, } } diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/image_generation_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/image_generation_payload.rs index e14d49ec33..3fbdb1034e 100644 --- a/crates/lib/mysql_queries/src/payloads/generic_inference_args/image_generation_payload.rs +++ b/crates/lib/mysql_queries/src/payloads/generic_inference_args/image_generation_payload.rs @@ -77,9 +77,11 @@ pub struct StableDiffusionArgs { // loRA / checkpoint description #[serde(rename = "de")] + #[serde(skip_serializing_if = "Option::is_none")] pub description: Option, // loRA / checkpoint name and description #[serde(rename = "na")] + #[serde(skip_serializing_if = "Option::is_none")] pub name: Option } diff --git a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job.rs b/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job.rs index 2056c21327..062c09eb05 100644 --- a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job.rs @@ -434,10 +434,6 @@ pub async fn process_job_inference( public_bucket_hash: "".to_string(), maybe_public_bucket_prefix: None, maybe_public_bucket_extension: None, - cached_user_ratings_total_count: 0, - cached_user_ratings_positive_count: 0, - cached_user_ratings_negative_count: 0, - maybe_cached_user_ratings_ratio: None, version: 0, mysql_pool, }).await?; diff --git a/crates/service/job/inference_job/src/job_specific_dependencies.rs b/crates/service/job/inference_job/src/job_specific_dependencies.rs index 2ec984dc97..c0b1969bc8 100644 --- a/crates/service/job/inference_job/src/job_specific_dependencies.rs +++ b/crates/service/job/inference_job/src/job_specific_dependencies.rs @@ -100,7 +100,7 @@ impl JobSpecificDependencies { maybe_vall_e_x_dependencies, maybe_vits_dependencies, maybe_rerender_dependencies, - maybe_stable_diffusion_dependencies + maybe_stable_diffusion_dependencies, maybe_mocapnet_dependencies, maybe_styletts2_dependencies, }) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/image_gen/enqueue_image_generation.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/image_gen/enqueue_image_generation.rs index 9f09505293..9660a17c0e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/image_gen/enqueue_image_generation.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/image_gen/enqueue_image_generation.rs @@ -1,4 +1,4 @@ -#![forbid(unused_imports)] +// #![forbid(unused_imports)] #![forbid(unused_mut)] #![forbid(unused_variables)] @@ -119,6 +119,8 @@ pub struct EnqueueImageGenRequest { maybe_cfg_scale: Option, maybe_number_of_samples: Option, maybe_batch_count: Option, + name: String, + description: String, } #[derive(Serialize,ToSchema)] @@ -332,7 +334,8 @@ pub async fn enqueue_image_generation_request( } let type_of_inference = request.type_of_inference.to_string().clone(); - + let description = request.description.to_string().clone(); + let name = request.name.to_string().clone(); let inference_args = StableDiffusionArgs { maybe_sd_model_token: Some(sd_weight_token), maybe_lora_model_token: Some(lora_token), @@ -347,7 +350,9 @@ pub async fn enqueue_image_generation_request( maybe_batch_count: Some(batch_count), maybe_width: Some(width), maybe_height: Some(height), - maybe_sampler: Some(sampler) + maybe_sampler: Some(sampler), + description: Some(description), + name: Some(name), }; // create the inference args here