From 93ce89e06095e54c5b51165b4c4c19fa7147a5b4 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 15 Jul 2024 22:54:22 -0400 Subject: [PATCH] cleanup job --- .../job_types/workflow/comfy_process_job_args.rs | 8 -------- .../workflow/get_workflow_args_from_job.rs | 6 +++--- .../src/job/job_types/workflow/mod.rs | 1 - .../job_types/workflow/process_single_wf_job.rs | 12 +++--------- .../workflow/upload_workflow/upload_prompt.rs | 11 +++++------ .../workflow/video_style_transfer/process_job.rs | 14 +++++--------- .../steps/validate_and_save_results.rs | 1 - 7 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 crates/service/job/inference_job/src/job/job_types/workflow/comfy_process_job_args.rs diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_process_job_args.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_process_job_args.rs deleted file mode 100644 index da422f9c89..0000000000 --- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_process_job_args.rs +++ /dev/null @@ -1,8 +0,0 @@ -use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; - -use crate::job_dependencies::JobDependencies; - -pub struct ComfyProcessJobArgs<'a> { - pub job_dependencies: &'a JobDependencies, - pub job: &'a AvailableInferenceJob, -} diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/get_workflow_args_from_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/get_workflow_args_from_job.rs index 3045b307ca..5b7f3f0f07 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/get_workflow_args_from_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/workflow/get_workflow_args_from_job.rs @@ -1,15 +1,15 @@ use errors::anyhow; use mysql_queries::payloads::generic_inference_args::{generic_inference_args::PolymorphicInferenceArgs, workflow_payload::WorkflowArgs}; use mysql_queries::payloads::generic_inference_args::generic_inference_args::GenericInferenceArgs; +use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; -use crate::job::job_types::workflow::comfy_process_job_args::ComfyProcessJobArgs; pub fn get_workflow_args_from_job( - args: &ComfyProcessJobArgs<'_> + job: &AvailableInferenceJob, ) -> Result { - let inference_args = args.job.maybe_inference_args + let inference_args = job.maybe_inference_args .as_ref() .map(|args: &GenericInferenceArgs| args.args.as_ref()) .flatten(); diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/mod.rs b/crates/service/job/inference_job/src/job/job_types/workflow/mod.rs index 0a3102a83c..d19ca1ef5e 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/mod.rs +++ b/crates/service/job/inference_job/src/job/job_types/workflow/mod.rs @@ -1,4 +1,3 @@ -pub mod comfy_process_job_args; pub mod comfy_ui_dependencies; pub mod get_workflow_args_from_job; pub mod process_single_wf_job; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/process_single_wf_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/process_single_wf_job.rs index 2bfa3b25a6..67e2379597 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/process_single_wf_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/workflow/process_single_wf_job.rs @@ -2,7 +2,6 @@ use mysql_queries::queries::generic_inference::job::list_available_generic_infer use crate::job::job_loop::job_success_result::JobSuccessResult; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; -use crate::job::job_types::workflow::comfy_process_job_args::ComfyProcessJobArgs; use crate::job::job_types::workflow::get_workflow_args_from_job::get_workflow_args_from_job; use crate::job::job_types::workflow::upload_workflow; use crate::job::job_types::workflow::video_style_transfer; @@ -13,19 +12,14 @@ pub async fn process_single_wf_job( job: &AvailableInferenceJob ) -> Result { - let args = ComfyProcessJobArgs { - job_dependencies, - job, - }; - - let workflow_args = get_workflow_args_from_job(&args)?; + let workflow_args = get_workflow_args_from_job(&job)?; let job_success_result = match workflow_args.maybe_google_drive_link { Some(_link) => { - upload_workflow::upload_prompt::upload_prompt(args).await? + upload_workflow::upload_prompt::upload_prompt(job_dependencies, job).await? } None => { - video_style_transfer::process_job::process_job(args).await? + video_style_transfer::process_job::process_job(job_dependencies, job).await? } }; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/upload_workflow/upload_prompt.rs b/crates/service/job/inference_job/src/job/job_types/workflow/upload_workflow/upload_prompt.rs index 783a99494e..25e4e539ef 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/upload_workflow/upload_prompt.rs +++ b/crates/service/job/inference_job/src/job/job_types/workflow/upload_workflow/upload_prompt.rs @@ -11,6 +11,7 @@ use enums::by_table::model_weights::weights_types::WeightsType; use enums::common::visibility::Visibility; use filesys::file_exists::file_exists; use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; +use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use mysql_queries::queries::model_weights::create::create_weight; use mysql_queries::queries::model_weights::create::create_weight::CreateModelWeightsArgs; use tokens::tokens::model_weights::ModelWeightToken; @@ -18,15 +19,13 @@ use tokens::tokens::users::UserToken; use crate::job::job_loop::job_success_result::{JobSuccessResult, ResultEntity}; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; -use crate::job::job_types::workflow::comfy_process_job_args::ComfyProcessJobArgs; use crate::job::job_types::workflow::get_workflow_args_from_job::get_workflow_args_from_job; +use crate::job_dependencies::JobDependencies; -pub async fn upload_prompt(args: ComfyProcessJobArgs<'_>) -> Result{ - let job = args.job; - let deps = args.job_dependencies; +pub async fn upload_prompt(deps: &JobDependencies, job: &AvailableInferenceJob) -> Result{ let mysql_pool = &deps.db.mysql_pool; - let wf_args = get_workflow_args_from_job(&args)?; + let wf_args = get_workflow_args_from_job(&job)?; let title = match wf_args.maybe_title { Some(val) => { @@ -86,7 +85,7 @@ pub async fn upload_prompt(args: ComfyProcessJobArgs<'_>) -> Result) -> Result { - let job = args.job; - let deps = args.job_dependencies; +pub async fn process_job(deps: &JobDependencies, job: &AvailableInferenceJob) -> Result { - let mut job_progress_reporter = args.job_dependencies + let mut job_progress_reporter = deps .clients .job_progress_reporter .new_generic_inference(job.inference_job_token.as_str()) .map_err(|e| ProcessSingleJobError::Other(anyhow!(e)))?; - let comfy_deps = args - .job_dependencies + let comfy_deps = deps .job .job_specific_dependencies .maybe_comfy_ui_dependencies @@ -88,7 +84,7 @@ pub async fn process_job(args: ComfyProcessJobArgs<'_>) -> Result) -> Result