From 0b4e3a6640bc87304c0698305ef0de6fb055d667 Mon Sep 17 00:00:00 2001 From: Michael Chung Date: Mon, 11 Dec 2023 21:53:25 -0500 Subject: [PATCH] Add template test files. --- .../src/job_types/dispatch_job_to_handler.rs | 11 +++++++++++ .../download_job/src/job_types/imagegen/sd15/mod.rs | 0 .../job_types/imagegen/sd15/process_sd_15_model.rs | 0 .../inference_job/src/job/job_types/imagegen/sd15.rs | 0 .../src/job/job_types/imagegen/sd15/mod.rs | 5 +++++ .../job/job_types/imagegen/sd15/model_downloaders.rs | 0 .../job_types/imagegen/sd15/pretrained_sd15_model.rs | 0 .../src/job/job_types/imagegen/sd15/process_job.rs | 0 .../job/job_types/imagegen/sd15/sd15_dependencies.rs | 0 .../job_types/imagegen/sd15/sd15_inference_command.rs | 0 .../http_server/endpoints/weights/upload_weight.rs | 1 - 11 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 crates/service/job/download_job/src/job_types/imagegen/sd15/mod.rs create mode 100644 crates/service/job/download_job/src/job_types/imagegen/sd15/process_sd_15_model.rs create mode 100644 crates/service/job/inference_job/src/job/job_types/imagegen/sd15.rs create mode 100644 crates/service/job/inference_job/src/job/job_types/imagegen/sd15/mod.rs create mode 100644 crates/service/job/inference_job/src/job/job_types/imagegen/sd15/model_downloaders.rs create mode 100644 crates/service/job/inference_job/src/job/job_types/imagegen/sd15/pretrained_sd15_model.rs create mode 100644 crates/service/job/inference_job/src/job/job_types/imagegen/sd15/process_job.rs create mode 100644 crates/service/job/inference_job/src/job/job_types/imagegen/sd15/sd15_dependencies.rs create mode 100644 crates/service/job/inference_job/src/job/job_types/imagegen/sd15/sd15_inference_command.rs diff --git a/crates/service/job/download_job/src/job_types/dispatch_job_to_handler.rs b/crates/service/job/download_job/src/job_types/dispatch_job_to_handler.rs index 7380e49dc7..64d792b050 100644 --- a/crates/service/job/download_job/src/job_types/dispatch_job_to_handler.rs +++ b/crates/service/job/download_job/src/job_types/dispatch_job_to_handler.rs @@ -112,6 +112,17 @@ pub async fn dispatch_job_to_handler<'a, 'b: 'a>(args: DispatchJobToHandlerArgs< ).await?; entity_token = results.entity_token.clone(); entity_type = results.entity_type.clone(); + }, + GenericDownloadType::StableDiffusion15 => { + let results = process_vits_model( + args.job_runner_state, + args.job, + args.temp_dir, + args.download_filename, + args.redis_logger, + ).await?; + entity_token = results.entity_token.clone(); + entity_type = results.entity_type.clone(); } } diff --git a/crates/service/job/download_job/src/job_types/imagegen/sd15/mod.rs b/crates/service/job/download_job/src/job_types/imagegen/sd15/mod.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/service/job/download_job/src/job_types/imagegen/sd15/process_sd_15_model.rs b/crates/service/job/download_job/src/job_types/imagegen/sd15/process_sd_15_model.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/service/job/inference_job/src/job/job_types/imagegen/sd15.rs b/crates/service/job/inference_job/src/job/job_types/imagegen/sd15.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/mod.rs b/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/mod.rs new file mode 100644 index 0000000000..9da0582c6c --- /dev/null +++ b/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/mod.rs @@ -0,0 +1,5 @@ +pub mod model_downloaders; +pub mod pretrained_sd15_model; +pub mod process_job; +pub mod sd15_dependencies; +pub mod sd15_inference_command; \ No newline at end of file diff --git a/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/model_downloaders.rs b/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/model_downloaders.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/pretrained_sd15_model.rs b/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/pretrained_sd15_model.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/process_job.rs b/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/process_job.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/sd15_dependencies.rs b/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/sd15_dependencies.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/sd15_inference_command.rs b/crates/service/job/inference_job/src/job/job_types/imagegen/sd15/sd15_inference_command.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/upload_weight.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/upload_weight.rs index f872e7f192..1110223978 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/upload_weight.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/upload_weight.rs @@ -149,7 +149,6 @@ pub async fn upload_weights_handler( let job_token; let download_job_type; - let generic_download_type = match supported_model_weights_type { WeightsType::HifiGan => GenericDownloadType::HifiGan, WeightsType::RvcV2 => GenericDownloadType::RvcV2,