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 5446ccff4f..8a6b8db0eb 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 @@ -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() { diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/gptsovits_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/gptsovits_payload.rs similarity index 100% rename from crates/lib/mysql_queries/src/payloads/generic_inference_args/gptsovits_payload.rs rename to crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/gptsovits_payload.rs 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/inner_payloads/image_generation_payload.rs similarity index 100% rename from crates/lib/mysql_queries/src/payloads/generic_inference_args/image_generation_payload.rs rename to crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/image_generation_payload.rs diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/lipsync_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/lipsync_payload.rs similarity index 98% rename from crates/lib/mysql_queries/src/payloads/generic_inference_args/lipsync_payload.rs rename to crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/lipsync_payload.rs index 25963312f4..82962848e4 100644 --- a/crates/lib/mysql_queries/src/payloads/generic_inference_args/lipsync_payload.rs +++ b/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(); diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/live_portrait_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/live_portrait_payload.rs similarity index 100% rename from crates/lib/mysql_queries/src/payloads/generic_inference_args/live_portrait_payload.rs rename to crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/live_portrait_payload.rs diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/mocap_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/mocap_payload.rs similarity index 100% rename from crates/lib/mysql_queries/src/payloads/generic_inference_args/mocap_payload.rs rename to crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/mocap_payload.rs diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/mod.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/mod.rs new file mode 100644 index 0000000000..1ddffe5479 --- /dev/null +++ b/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; diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/render_engine_scene_to_video_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/render_engine_scene_to_video_payload.rs similarity index 100% rename from crates/lib/mysql_queries/src/payloads/generic_inference_args/render_engine_scene_to_video_payload.rs rename to crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/render_engine_scene_to_video_payload.rs diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/tts_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/tts_payload.rs similarity index 100% rename from crates/lib/mysql_queries/src/payloads/generic_inference_args/tts_payload.rs rename to crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/tts_payload.rs diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/videofilter_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/videofilter_payload.rs similarity index 100% rename from crates/lib/mysql_queries/src/payloads/generic_inference_args/videofilter_payload.rs rename to crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/videofilter_payload.rs diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/workflow_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/workflow_payload.rs similarity index 100% rename from crates/lib/mysql_queries/src/payloads/generic_inference_args/workflow_payload.rs rename to crates/lib/mysql_queries/src/payloads/generic_inference_args/inner_payloads/workflow_payload.rs diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/mod.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/mod.rs index 548c874ec4..03a40013d2 100644 --- a/crates/lib/mysql_queries/src/payloads/generic_inference_args/mod.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/gpt_sovits/upload_model/extract_gpt_sovits_payload_from_job.rs b/crates/service/job/inference_job/src/job/job_types/gpt_sovits/upload_model/extract_gpt_sovits_payload_from_job.rs index 63bdb291d5..74174d0b61 100644 --- a/crates/service/job/inference_job/src/job/job_types/gpt_sovits/upload_model/extract_gpt_sovits_payload_from_job.rs +++ b/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; 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 7ea0353e63..9e9dbe630a 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 @@ -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; diff --git a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/validate_inputs.rs b/crates/service/job/inference_job/src/job/job_types/image_generation/sd/validate_inputs.rs index c02279b225..a8b404bee8 100644 --- a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/validate_inputs.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/download_audio_file.rs b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/download_audio_file.rs index 6287f64407..43ed8366b3 100644 --- a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/download_audio_file.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/download_image_file.rs b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/download_image_file.rs index 6299b48722..11acdce6d2 100644 --- a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/download_image_file.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/validate_job.rs b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/validate_job.rs index fdd04d2b22..ca8cf138ce 100644 --- a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/validate_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/download_video_file.rs b/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/download_video_file.rs index 2be3bd8bc1..c23bd0ec55 100644 --- a/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/download_video_file.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/validate_job.rs b/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/validate_job.rs index 098361d655..07d4e2ba71 100644 --- a/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/validate_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_video_file.rs b/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_video_file.rs index 0fb5c170fe..3ff9cf54b6 100644 --- a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_video_file.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/validate_job.rs b/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/validate_job.rs index 1ac2b22bca..c3c33ef468 100644 --- a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/validate_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/live_portrait/extract_live_portrait_payload_from_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/live_portrait/extract_live_portrait_payload_from_job.rs index 0b5f50a160..d08c8c482c 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/live_portrait/extract_live_portrait_payload_from_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/live_portrait/process_live_portrait_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/live_portrait/process_live_portrait_job.rs index c1f07407d7..11791d37d3 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/live_portrait/process_live_portrait_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/extract_vst_workflow_payload_from_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/extract_vst_workflow_payload_from_job.rs index ff62f9064f..356a873379 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/extract_vst_workflow_payload_from_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/process_video_style_transfer_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/process_video_style_transfer_job.rs index c533e6fdd2..1e46b46208 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/process_video_style_transfer_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/check_and_validate_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/check_and_validate_job.rs index 1c5a0603bb..365f95d952 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/check_and_validate_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/post_process_restore_audio.rs b/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/post_process_restore_audio.rs index 0d3fd40d90..cccfcac0e9 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/post_process_restore_audio.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/preprocess_save_audio.rs b/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/preprocess_save_audio.rs index e7d1c93b63..d879dbb19e 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/preprocess_save_audio.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/preprocess_trim_and_resample_videos.rs b/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/preprocess_trim_and_resample_videos.rs index b3e18687f6..c604f8a84d 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/preprocess_trim_and_resample_videos.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs b/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs index 314de55d52..cae5761dfd 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs +++ b/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}; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/util/write_workflow_prompt.rs b/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/util/write_workflow_prompt.rs index 377f3b1a12..06450615bd 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/video_style_transfer/util/write_workflow_prompt.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/animation/enqueue_face_animation.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/animation/enqueue_face_animation.rs index d607a3ae8f..d48acac3c3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/animation/enqueue_face_animation.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/animation/enqueue_rerender_animation.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/animation/enqueue_rerender_animation.rs index e658edbbee..8dccb34a6f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/animation/enqueue_rerender_animation.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/conversion/enqueue_render_engine_scene_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/conversion/enqueue_render_engine_scene_to_video_handler.rs index 13f5a22f2b..bf0c493399 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/conversion/enqueue_render_engine_scene_to_video_handler.rs +++ b/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, 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 328d2b246a..56eab72377 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 @@ -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, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/estimates/comfy_workflow_estimate.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/estimates/comfy_workflow_estimate.rs index dbdc508572..d51f719e33 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/estimates/comfy_workflow_estimate.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/extractors/extract_comfy_workflow_args.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/extractors/extract_comfy_workflow_args.rs index 15f7eb5c30..f11a35d6c7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/extractors/extract_comfy_workflow_args.rs +++ b/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 { extract_comfy_workflow_args_fallible(args).ok().flatten() diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/extractors/extract_live_portrait_details.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/extractors/extract_live_portrait_details.rs index 5a0202bd23..d874f8bb32 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/extractors/extract_live_portrait_details.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/mocap/enqueue_mocapnet.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/mocap/enqueue_mocapnet.rs index 1b4b04df7f..9293b2633c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/mocap/enqueue_mocapnet.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs index edfae65ca2..256b3abf74 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs index 8d8954ea94..e4be12e0f6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs index 921636c173..8792aa1bf8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs +++ b/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, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs index fb6458b2ca..1f345d3114 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs +++ b/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, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs index e385e4e90d..56c574ae04 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs index 3641cdfb83..44fa2ac089 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs index 0847b10282..cb4a269edd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_comfy_ui_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_comfy_ui_handler.rs index 2ff31ea6ae..faf5afdf78 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_comfy_ui_handler.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_video_style_transfer_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_video_style_transfer_handler.rs index 9c77d976c2..faab78f9ca 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_video_style_transfer_handler.rs +++ b/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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_workflow_upload_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_workflow_upload_request.rs index df55d7be31..3a526f0198 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/workflows/enqueue_workflow_upload_request.rs +++ b/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,