Fixed build issues ready to merge to master after review.

This commit is contained in:
ArEnSc committed 2024-01-17 17:33:55 -05:00
1 parent fc154c4a31
commit 7b90b11ce6
6 files changed
+13 -10

No files matched your search

@@ -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",
}
@@ -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,
}
}
@@ -77,9 +77,11 @@ pub struct StableDiffusionArgs {
// loRA / checkpoint description
#[serde(rename = "de")]
#[serde(skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
// loRA / checkpoint name and description
#[serde(rename = "na")]
#[serde(skip_serializing_if = "Option::is_none")]
pub name: Option<String>
}
@@ -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?;
@@ -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,
})
@@ -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<i32>,
maybe_number_of_samples: Option<i32>,
maybe_batch_count: Option<i32>,
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