refactor inference args module

crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs

@@ -1,13 +1,14 @@
 use errors::AnyhowResult;
-use crate::payloads::generic_inference_args::gptsovits_payload::GptSovitsPayload;
-use crate::payloads::generic_inference_args::image_generation_payload::StableDiffusionArgs;
-use crate::payloads::generic_inference_args::lipsync_payload::LipsyncArgs;
-use crate::payloads::generic_inference_args::live_portrait_payload::LivePortraitPayload;
-use crate::payloads::generic_inference_args::mocap_payload::MocapArgs;
-use crate::payloads::generic_inference_args::render_engine_scene_to_video_payload::RenderEngineSceneToVideoArgs;
-use crate::payloads::generic_inference_args::tts_payload::TTSArgs;
-use crate::payloads::generic_inference_args::videofilter_payload::RerenderArgs;
-use crate::payloads::generic_inference_args::workflow_payload::WorkflowArgs;
+
+use crate::payloads::generic_inference_args::inner_payloads::gptsovits_payload::GptSovitsPayload;
+use crate::payloads::generic_inference_args::inner_payloads::image_generation_payload::StableDiffusionArgs;
+use crate::payloads::generic_inference_args::inner_payloads::lipsync_payload::LipsyncArgs;
+use crate::payloads::generic_inference_args::inner_payloads::live_portrait_payload::LivePortraitPayload;
+use crate::payloads::generic_inference_args::inner_payloads::mocap_payload::MocapArgs;
+use crate::payloads::generic_inference_args::inner_payloads::render_engine_scene_to_video_payload::RenderEngineSceneToVideoArgs;
+use crate::payloads::generic_inference_args::inner_payloads::tts_payload::TTSArgs;
+use crate::payloads::generic_inference_args::inner_payloads::videofilter_payload::RerenderArgs;
+use crate::payloads::generic_inference_args::inner_payloads::workflow_payload::WorkflowArgs;
 
 /// Used to encode extra state for the `generic_inference_jobs` table.
 /// This should act somewhat like a serialized protobuf stored inside a record.
@@ -159,9 +160,9 @@ mod tests {
   use tokens::tokens::{media_files::MediaFileToken, model_weights::ModelWeightToken};
 
   use crate::payloads::generic_inference_args::generic_inference_args::{FundamentalFrequencyMethodForJob, GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-  use crate::payloads::generic_inference_args::image_generation_payload::StableDiffusionArgs;
-  use crate::payloads::generic_inference_args::lipsync_payload::{LipsyncAnimationAudioSource, LipsyncAnimationImageSource, LipsyncArgs};
-  use crate::payloads::generic_inference_args::tts_payload::TTSArgs;
+  use crate::payloads::generic_inference_args::inner_payloads::image_generation_payload::StableDiffusionArgs;
+  use crate::payloads::generic_inference_args::inner_payloads::lipsync_payload::{LipsyncAnimationAudioSource, LipsyncAnimationImageSource, LipsyncArgs};
+  use crate::payloads::generic_inference_args::inner_payloads::tts_payload::TTSArgs;
 
   #[test]
   fn typical_lipsync_animation_args_serialize() {

crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/lipsync_payload.rs

@@ -152,7 +152,7 @@ impl LipsyncAnimationImageSource {
 
 #[cfg(test)]
 mod tests {
-  use crate::payloads::generic_inference_args::lipsync_payload::{FaceEnhancer, LipsyncAnimationAudioSource, LipsyncAnimationImageSource, LipsyncArgs};
+  use crate::payloads::generic_inference_args::inner_payloads::lipsync_payload::{FaceEnhancer, LipsyncAnimationAudioSource, LipsyncAnimationImageSource, LipsyncArgs};
 
   fn assert_json_deserializes_to_match(json: &str, original: &LipsyncArgs) {
     let duplicate : LipsyncArgs = serde_json::de::from_str(json).unwrap();

crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/mod.rs

@@ -0,0 +1,9 @@
+pub mod gptsovits_payload;
+pub mod image_generation_payload;
+pub mod lipsync_payload;
+pub mod live_portrait_payload;
+pub mod mocap_payload;
+pub mod render_engine_scene_to_video_payload;
+pub mod tts_payload;
+pub mod videofilter_payload;
+pub mod workflow_payload;

crates/lib/mysql_queries/src/payloads/generic_inference_args/mod.rs

@@ -1,11 +1,3 @@
 pub mod common;
 pub mod generic_inference_args;
-pub mod image_generation_payload;
-pub mod lipsync_payload;
-pub mod live_portrait_payload;
-pub mod mocap_payload;
-pub mod render_engine_scene_to_video_payload;
-pub mod tts_payload;
-pub mod videofilter_payload;
-pub mod workflow_payload;
-pub mod gptsovits_payload;
+pub mod inner_payloads;

crates/service/job/inference_job/src/job/job_types/gpt_sovits/upload_model/extract_gpt_sovits_payload_from_job.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs;
-use mysql_queries::payloads::generic_inference_args::gptsovits_payload::GptSovitsPayload;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::gptsovits_payload::GptSovitsPayload;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;

crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs;
-use mysql_queries::payloads::generic_inference_args::image_generation_payload::StableDiffusionArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::image_generation_payload::StableDiffusionArgs;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 
 use crate::job::job_loop::job_success_result::JobSuccessResult;

crates/service/job/inference_job/src/job/job_types/image_generation/sd/validate_inputs.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs;
-use mysql_queries::payloads::generic_inference_args::image_generation_payload::StableDiffusionArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::image_generation_payload::StableDiffusionArgs;
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
 use crate::job::job_types::image_generation::sd::process_job::StableDiffusionProcessArgs;

crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/download_audio_file.rs

@@ -10,7 +10,7 @@ use buckets::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePat
 use buckets::public::voice_conversion_results::bucket_file_path::VoiceConversionResultOriginalFilePath;
 use cloud_storage::bucket_client::BucketClient;
 use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporter;
-use mysql_queries::payloads::generic_inference_args::lipsync_payload::LipsyncAnimationAudioSource;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::lipsync_payload::LipsyncAnimationAudioSource;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
 use mysql_queries::queries::media_uploads::get_media_upload_for_inference::get_media_upload_for_inference;

crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/download_image_file.rs

@@ -9,7 +9,7 @@ use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use buckets::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePath;
 use cloud_storage::bucket_client::BucketClient;
 use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporter;
-use mysql_queries::payloads::generic_inference_args::lipsync_payload::LipsyncAnimationImageSource;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::lipsync_payload::LipsyncAnimationImageSource;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
 use mysql_queries::queries::media_uploads::get_media_upload_for_inference::get_media_upload_for_inference;

crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/validate_job.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::lipsync_payload::{FaceEnhancer, LipsyncAnimationAudioSource, LipsyncAnimationImageSource, Preprocess};
+use mysql_queries::payloads::generic_inference_args::inner_payloads::lipsync_payload::{FaceEnhancer, LipsyncAnimationAudioSource, LipsyncAnimationImageSource, Preprocess};
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;

crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/download_video_file.rs

@@ -9,7 +9,7 @@ use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use buckets::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePath;
 use cloud_storage::bucket_client::BucketClient;
 use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporter;
-use mysql_queries::payloads::generic_inference_args::mocap_payload::MocapVideoSource;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::mocap_payload::MocapVideoSource;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
 use mysql_queries::queries::media_uploads::get_media_upload_for_inference::get_media_upload_for_inference;

crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/validate_job.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::mocap_payload::MocapVideoSource;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::mocap_payload::MocapVideoSource;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;

crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_video_file.rs

@@ -9,7 +9,7 @@ use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use buckets::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePath;
 use cloud_storage::bucket_client::BucketClient;
 use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporter;
-use mysql_queries::payloads::generic_inference_args::videofilter_payload::VideofilterVideoSource;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::videofilter_payload::VideofilterVideoSource;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
 use mysql_queries::queries::media_uploads::get_media_upload_for_inference::get_media_upload_for_inference;

crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/validate_job.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::videofilter_payload::VideofilterVideoSource;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::videofilter_payload::VideofilterVideoSource;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use tokens::tokens::model_weights::ModelWeightToken;
 

crates/service/job/inference_job/src/job/job_types/workflow/live_portrait/extract_live_portrait_payload_from_job.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs;
-use mysql_queries::payloads::generic_inference_args::live_portrait_payload::LivePortraitPayload;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::live_portrait_payload::LivePortraitPayload;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;

crates/service/job/inference_job/src/job/job_types/workflow/live_portrait/process_live_portrait_job.rs

@@ -29,7 +29,7 @@ use filesys::safe_recursively_delete_files::safe_recursively_delete_files;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use mimetypes::mimetype_for_file::get_mimetype_for_file;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs::Cu;
-use mysql_queries::payloads::generic_inference_args::workflow_payload::NewValue;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::NewValue;
 use mysql_queries::payloads::prompt_args::encoded_style_transfer_name::EncodedStyleTransferName;
 use mysql_queries::payloads::prompt_args::prompt_inner_payload::{PromptInnerPayload, PromptInnerPayloadBuilder};
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;

crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/extract_vst_workflow_payload_from_job.rs

@@ -1,5 +1,6 @@
 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::PolymorphicInferenceArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::WorkflowArgs;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;

crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/process_video_style_transfer_job.rs

@@ -33,7 +33,7 @@ use filesys::safe_recursively_delete_files::safe_recursively_delete_files;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use mimetypes::mimetype_for_file::get_mimetype_for_file;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs::Cu;
-use mysql_queries::payloads::generic_inference_args::workflow_payload::NewValue;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::NewValue;
 use mysql_queries::payloads::prompt_args::encoded_style_transfer_name::EncodedStyleTransferName;
 use mysql_queries::payloads::prompt_args::prompt_inner_payload::{PromptInnerPayload, PromptInnerPayloadBuilder};
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;

crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/check_and_validate_job.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::workflow_payload::NewValue;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::NewValue;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::model_weights::ModelWeightToken;

crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/post_process_restore_audio.rs

@@ -1,7 +1,7 @@
 use log::{error, info};
 
 use filesys::check_file_exists::check_file_exists;
-use mysql_queries::payloads::generic_inference_args::workflow_payload::WorkflowArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::WorkflowArgs;
 use subprocess_common::command_runner::command_runner_args::{RunAsSubprocessArgs, StreamRedirection};
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;

crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/preprocess_save_audio.rs

@@ -2,7 +2,7 @@ use anyhow::anyhow;
 use log::{error, info};
 
 use filesys::check_file_exists::check_file_exists;
-use mysql_queries::payloads::generic_inference_args::workflow_payload::WorkflowArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::WorkflowArgs;
 use subprocess_common::command_runner::command_runner_args::{RunAsSubprocessArgs, StreamRedirection};
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;

crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/preprocess_trim_and_resample_videos.rs

@@ -7,7 +7,7 @@ use sqlx::MySqlPool;
 
 use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient;
 use filesys::path_to_string::path_to_string;
-use mysql_queries::payloads::generic_inference_args::workflow_payload::WorkflowArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::WorkflowArgs;
 use tokens::tokens::media_files::MediaFileToken;
 use videos::ffprobe_get_dimensions::ffprobe_get_dimensions;
 

crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs

@@ -21,7 +21,7 @@ use filesys::safe_recursively_delete_files::safe_recursively_delete_files;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporter;
 use mimetypes::mimetype_for_file::get_mimetype_for_file;
-use mysql_queries::payloads::generic_inference_args::workflow_payload::{WorkflowArgs, WorkflowType};
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::{WorkflowArgs, WorkflowType};
 use mysql_queries::payloads::prompt_args::prompt_inner_payload::PromptInnerPayloadBuilder;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use mysql_queries::queries::media_files::create::insert_media_file_from_comfy_ui::{insert_media_file_from_comfy_ui, InsertArgs};

crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/util/write_workflow_prompt.rs

@@ -7,7 +7,7 @@ use log::info;
 use serde_json::Value;
 
 use errors::AnyhowResult;
-use mysql_queries::payloads::generic_inference_args::workflow_payload::{NewValue, WorkflowArgs};
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::{NewValue, WorkflowArgs};
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
 use crate::job::job_types::workflow::comfy_ui_dependencies::ComfyDependencies;

crates/service/web/storyteller_web/src/http_server/endpoints/animation/enqueue_face_animation.rs

@@ -16,7 +16,7 @@ use enums::by_table::generic_inference_jobs::inference_model_type::InferenceMode
 use enums::common::visibility::Visibility;
 use http_server_common::request::get_request_ip::get_request_ip;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::lipsync_payload::{FaceEnhancer, LipsyncAnimationAudioSource, LipsyncAnimationImageSource, LipsyncArgs};
+use mysql_queries::payloads::generic_inference_args::inner_payloads::lipsync_payload::{FaceEnhancer, LipsyncAnimationAudioSource, LipsyncAnimationImageSource, LipsyncArgs};
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs};
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 use tokens::tokens::media_files::MediaFileToken;

crates/service/web/storyteller_web/src/http_server/endpoints/animation/enqueue_rerender_animation.rs

@@ -17,7 +17,7 @@ use enums::common::visibility::Visibility;
 use http_server_common::request::get_request_header_optional::get_request_header_optional;
 use http_server_common::request::get_request_ip::get_request_ip;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::videofilter_payload::{RerenderArgs, VideofilterVideoSource};
+use mysql_queries::payloads::generic_inference_args::inner_payloads::videofilter_payload::{RerenderArgs, VideofilterVideoSource};
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs};
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 use tokens::tokens::media_files::MediaFileToken;

crates/service/web/storyteller_web/src/http_server/endpoints/conversion/enqueue_render_engine_scene_to_video_handler.rs

@@ -20,7 +20,7 @@ use enums::common::visibility::Visibility;
 use http_server_common::request::get_request_header_optional::get_request_header_optional;
 use http_server_common::request::get_request_ip::get_request_ip;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::render_engine_scene_to_video_payload::RenderEngineSceneToVideoArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::render_engine_scene_to_video_payload::RenderEngineSceneToVideoArgs;
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{
   insert_generic_inference_job,
   InsertGenericInferenceArgs,

crates/service/web/storyteller_web/src/http_server/endpoints/image_gen/enqueue_image_generation.rs

@@ -25,7 +25,7 @@ use mysql_queries::payloads::generic_inference_args::generic_inference_args::{
   InferenceCategoryAbbreviated,
   PolymorphicInferenceArgs,
 };
-use mysql_queries::payloads::generic_inference_args::image_generation_payload::StableDiffusionArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::image_generation_payload::StableDiffusionArgs;
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{
   insert_generic_inference_job,
   InsertGenericInferenceArgs,

crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/estimates/comfy_workflow_estimate.rs

@@ -1,7 +1,7 @@
 use std::cmp::max;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs;
-use mysql_queries::payloads::generic_inference_args::workflow_payload::WorkflowArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::WorkflowArgs;
 
 use crate::http_server::endpoints::inference_job::utils::estimates::percent::percent;
 use crate::http_server::endpoints::inference_job::utils::extractors::extract_comfy_workflow_args::extract_comfy_workflow_args;

crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/extractors/extract_comfy_workflow_args.rs

@@ -2,7 +2,7 @@ use anyhow::anyhow;
 
 use errors::AnyhowResult;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs;
-use mysql_queries::payloads::generic_inference_args::workflow_payload::WorkflowArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::WorkflowArgs;
 
 pub fn extract_comfy_workflow_args(args: &PolymorphicInferenceArgs) -> Option<WorkflowArgs> {
   extract_comfy_workflow_args_fallible(args).ok().flatten()

crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/extractors/extract_live_portrait_details.rs

@@ -24,7 +24,7 @@ pub fn extract_live_portrait_details(args: &PolymorphicInferenceArgs) -> Option<
 #[cfg(test)]
 mod tests {
   use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs;
-  use mysql_queries::payloads::generic_inference_args::live_portrait_payload::LivePortraitPayload;
+  use mysql_queries::payloads::generic_inference_args::inner_payloads::live_portrait_payload::LivePortraitPayload;
   use tokens::tokens::media_files::MediaFileToken;
 
   use super::extract_live_portrait_details;

crates/service/web/storyteller_web/src/http_server/endpoints/mocap/enqueue_mocapnet.rs

@@ -17,7 +17,7 @@ use enums::common::visibility::Visibility;
 use http_server_common::request::get_request_header_optional::get_request_header_optional;
 use http_server_common::request::get_request_ip::get_request_ip;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::mocap_payload::{MocapArgs, MocapVideoSource};
+use mysql_queries::payloads::generic_inference_args::inner_payloads::mocap_payload::{MocapArgs, MocapVideoSource};
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs};
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;

crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs

@@ -17,7 +17,7 @@ use enums::common::visibility::Visibility;
 use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::gptsovits_payload::GptSovitsPayload;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::gptsovits_payload::GptSovitsPayload;
 use mysql_queries::queries::generic_download::web::insert_generic_download_job::{insert_generic_download_job, InsertGenericDownloadJobArgs};
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs};
 use primitives::traits::trim_or_emptyable::TrimOrEmptyable;

crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs

@@ -25,7 +25,7 @@ use http_server_common::request::get_request_header_optional::get_request_header
 use http_server_common::request::get_request_ip::get_request_ip;
 use migration::text_to_speech::get_tts_model_for_enqueue_inference_migration::TtsModelForEnqueueInferenceMigrationWrapper;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::gptsovits_payload::GptSovitsPayload;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::gptsovits_payload::GptSovitsPayload;
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs};
 use redis_common::redis_keys::RedisKeys;
 use tokens::tokens::users::UserToken;

crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs

@@ -24,7 +24,7 @@ use mysql_queries::payloads::generic_inference_args::generic_inference_args::{
     InferenceCategoryAbbreviated,
     PolymorphicInferenceArgs,
 };
-use mysql_queries::payloads::generic_inference_args::tts_payload::TTSArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::tts_payload::TTSArgs;
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{
     insert_generic_inference_job,
     InsertGenericInferenceArgs,

crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs

@@ -22,7 +22,7 @@ use mysql_queries::payloads::generic_inference_args::generic_inference_args::{
   InferenceCategoryAbbreviated,
   PolymorphicInferenceArgs,
 };
-use mysql_queries::payloads::generic_inference_args::tts_payload::TTSArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::tts_payload::TTSArgs;
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{
   insert_generic_inference_job,
   InsertGenericInferenceArgs,

crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs

@@ -20,7 +20,7 @@ use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use http_server_common::request::get_request_ip::get_request_ip;
 use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::live_portrait_payload::{CropDimensions, LivePortraitPayload};
+use mysql_queries::payloads::generic_inference_args::inner_payloads::live_portrait_payload::{CropDimensions, LivePortraitPayload};
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs};
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
 use primitives::traits::trim_or_emptyable::TrimOrEmptyable;

crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs

@@ -20,7 +20,7 @@ use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use http_server_common::request::get_request_header_optional::get_request_header_optional;
 use http_server_common::request::get_request_ip::get_request_ip;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::workflow_payload::{WorkflowArgs, WorkflowType};
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::{WorkflowArgs, WorkflowType};
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs};
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
 use primitives::lazy_any_option_true::lazy_any_option_true;

crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs

@@ -21,7 +21,7 @@ use http_server_common::request::get_request_header_optional::get_request_header
 use http_server_common::request::get_request_ip::get_request_ip;
 use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::workflow_payload::{WorkflowArgs, WorkflowType};
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::{WorkflowArgs, WorkflowType};
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs};
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
 use primitives::lazy_any_option_true::lazy_any_option_true;

crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_comfy_ui_handler.rs

@@ -19,7 +19,7 @@ use enums::common::visibility::Visibility;
 use http_server_common::request::get_request_header_optional::get_request_header_optional;
 use http_server_common::request::get_request_ip::get_request_ip;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::workflow_payload::{NewValue, WorkflowArgs};
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::{NewValue, WorkflowArgs};
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs};
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
 use primitives::str_to_bool::str_to_bool;

crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_video_style_transfer_handler.rs

@@ -19,7 +19,7 @@ use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use http_server_common::request::get_request_header_optional::get_request_header_optional;
 use http_server_common::request::get_request_ip::get_request_ip;
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::workflow_payload::WorkflowArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::WorkflowArgs;
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs};
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
 use primitives::lazy_any_option_true::lazy_any_option_true;

crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_workflow_upload_request.rs

@@ -26,7 +26,7 @@ use mysql_queries::payloads::generic_inference_args::generic_inference_args::{
     InferenceCategoryAbbreviated,
     PolymorphicInferenceArgs,
 };
-use mysql_queries::payloads::generic_inference_args::workflow_payload::WorkflowArgs;
+use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::WorkflowArgs;
 use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{
     insert_generic_inference_job,
     InsertGenericInferenceArgs,