diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/omni_gen_video_cost_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/omni_gen_video_cost_handler.rs index 2dfc8d6f19..926de9ed9a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/omni_gen_video_cost_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/omni_gen_video_cost_handler.rs @@ -9,7 +9,7 @@ use artcraft_router::errors::artcraft_router_error::ArtcraftRouterError; use log::warn; use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError; -use crate::http_server::endpoints::omni_gen::generate::video::hydrate_router_request::hydrate_to_router_request; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::hydrate_router_request::hydrate_to_router_request; use crate::state::server_state::ServerState; /// Estimate the cost of a video generation. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/hydrate_router_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/hydrate_router_request.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/hydrate_router_request.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/hydrate_router_request.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/mod.rs index b0d3687ee2..56439eef0e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/mod.rs @@ -1,4 +1,7 @@ pub mod bill_wallet; pub mod build_router_client; +pub(crate) mod hydrate_router_request; pub mod insert_fal_job; pub mod insert_seedance2pro_jobs; +pub mod pipeline_result; +pub mod resolve_kinovi_character_ids; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/pipeline_result.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_result.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/pipeline_result.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/request_helper/resolve_kinovi_character_ids.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/resolve_kinovi_character_ids.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/request_helper/resolve_kinovi_character_ids.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/resolve_kinovi_character_ids.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/mod.rs index 9cc545fefb..ddd6e4286c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/mod.rs @@ -1,7 +1,4 @@ pub mod omni_gen_video_generate_handler; pub mod helpers; -pub(crate) mod hydrate_router_request; -pub mod pipeline_result; pub mod pipeline_v1; pub mod pipeline_v2; -mod request_helper; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs index 345b71b41e..689e13832c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs @@ -30,7 +30,7 @@ use crate::http_server::endpoints::omni_gen::generate::video::helpers::insert_fa use crate::http_server::endpoints::omni_gen::generate::video::helpers::insert_seedance2pro_jobs::insert_seedance2pro_jobs; use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::run_pipeline_v1::{run_pipeline_v1, RunPipelineV1Args}; use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v2::run_pipeline_v2::{run_pipeline_v2, RunPipelineV2Args}; -use crate::http_server::endpoints::omni_gen::generate::video::request_helper::resolve_kinovi_character_ids::resolve_kinovi_character_ids; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::resolve_kinovi_character_ids::resolve_kinovi_character_ids; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; use crate::util::lookup::lookup_image_urls_as_map::lookup_image_urls_as_map; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/run_pipeline_v1.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/run_pipeline_v1.rs index fed9a1478d..4b4ee89f3e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/run_pipeline_v1.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/run_pipeline_v1.rs @@ -17,8 +17,8 @@ use tokens::tokens::users::UserToken; use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError; use crate::http_server::endpoints::omni_gen::generate::video::helpers::bill_wallet::bill_wallet; -use crate::http_server::endpoints::omni_gen::generate::video::hydrate_router_request::hydrate_to_router_request; -use crate::http_server::endpoints::omni_gen::generate::video::pipeline_result::PipelineResult; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::hydrate_router_request::hydrate_to_router_request; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::pipeline_result::PipelineResult; use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::execute::execute_fal::execute_generation_fal; use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::execute::execute_kinovi::execute_generation_kinovi; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs index 2eef1db533..d583e47191 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs @@ -18,8 +18,8 @@ use crate::http_server::common_responses::advanced_common_web_error::AdvancedCom use crate::http_server::endpoint_helpers::refund_wallet_after_api_failure::refund_wallet_after_api_failure; use crate::http_server::endpoints::omni_gen::generate::video::helpers::bill_wallet::bill_wallet; use crate::http_server::endpoints::omni_gen::generate::video::helpers::build_router_client::build_router_client; -use crate::http_server::endpoints::omni_gen::generate::video::hydrate_router_request::hydrate_to_router_request; -use crate::http_server::endpoints::omni_gen::generate::video::pipeline_result::PipelineResult; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::hydrate_router_request::hydrate_to_router_request; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::pipeline_result::PipelineResult; use crate::state::server_state::ServerState; pub struct RunPipelineV2Args<'a> { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/request_helper/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/request_helper/mod.rs deleted file mode 100644 index 7a88596209..0000000000 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/request_helper/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod resolve_kinovi_character_ids;