From e64c3dcdb6c964d32989670dabbc35f402bbdb38 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Fri, 27 Mar 2026 09:49:10 -0400 Subject: [PATCH] move modules --- .../src/http_server/endpoints/generate/mod.rs | 1 - .../src/http_server/endpoints/mod.rs | 1 + .../{generate => }/omni_gen/cost/mod.rs | 0 .../{generate => }/omni_gen/cost/video/mod.rs | 0 .../cost/video/omni_gen_video_cost_handler.rs | 0 .../{generate => }/omni_gen/generate/mod.rs | 0 .../omni_gen/generate/video/mod.rs | 0 .../video/omni_gen_video_generate_handler.rs | 0 .../endpoints/{generate => }/omni_gen/mod.rs | 0 .../{generate => }/omni_gen/models/mod.rs | 0 .../omni_gen/models/video/mod.rs | 0 .../video/omni_gen_video_models_handler.rs | 0 .../add_application_routes.rs | 2 + .../application_routes/generate_routes.rs | 23 ----------- .../routes/application_routes/mod.rs | 1 + .../application_routes/omni_gen_routes.rs | 41 +++++++++++++++++++ 16 files changed, 45 insertions(+), 24 deletions(-) rename crates/service/web/storyteller_web/src/http_server/endpoints/{generate => }/omni_gen/cost/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/{generate => }/omni_gen/cost/video/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/{generate => }/omni_gen/cost/video/omni_gen_video_cost_handler.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/{generate => }/omni_gen/generate/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/{generate => }/omni_gen/generate/video/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/{generate => }/omni_gen/generate/video/omni_gen_video_generate_handler.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/{generate => }/omni_gen/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/{generate => }/omni_gen/models/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/{generate => }/omni_gen/models/video/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/{generate => }/omni_gen/models/video/omni_gen_video_models_handler.rs (100%) create mode 100644 crates/service/web/storyteller_web/src/http_server/routes/application_routes/omni_gen_routes.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/mod.rs index e9fc8aab36..2f5f3a93e8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/mod.rs @@ -2,6 +2,5 @@ pub mod common; pub mod cost_estimate; pub mod image; pub mod object; -pub mod omni_gen; pub mod splat; pub mod video; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/mod.rs index f4d0df6a53..f5ec36bfc1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/mod.rs @@ -12,6 +12,7 @@ pub mod media_files; pub mod misc; pub mod model_download; pub mod moderation; +pub mod omni_gen; pub mod prompts; pub mod service; pub mod stats; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/cost/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/cost/mod.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/cost/video/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/cost/video/mod.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/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 similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/cost/video/omni_gen_video_cost_handler.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/omni_gen_video_cost_handler.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/generate/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/generate/mod.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/generate/video/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/generate/video/mod.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/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 similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/generate/video/omni_gen_video_generate_handler.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/mod.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/models/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/models/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/models/mod.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/models/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/models/video/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/models/video/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/models/video/mod.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/models/video/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/models/video/omni_gen_video_models_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/models/video/omni_gen_video_models_handler.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/generate/omni_gen/models/video/omni_gen_video_models_handler.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/models/video/omni_gen_video_models_handler.rs diff --git a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/add_application_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/add_application_routes.rs index 865738356e..cd4ac848ec 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/add_application_routes.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/add_application_routes.rs @@ -6,6 +6,7 @@ use crate::http_server::routes::application_routes::generate_routes::add_generat use crate::http_server::routes::application_routes::job_routes::add_job_routes; use crate::http_server::routes::application_routes::media_files_routes::add_media_file_routes; use crate::http_server::routes::application_routes::moderation_routes::add_moderator_routes; +use crate::http_server::routes::application_routes::omni_gen_routes::add_omni_gen_routes; use crate::http_server::routes::application_routes::prompts_routes::add_prompts_routes; use crate::http_server::routes::application_routes::stripe_artcraft_routes::add_stripe_artcraft_routes; use crate::http_server::routes::application_routes::subscription_routes::add_subscription_routes; @@ -40,6 +41,7 @@ where // Artcraft surface area app = add_generate_routes(app); // /v1/generate/... + app = add_omni_gen_routes(app); // /v1/omni_gen/... app = add_webhook_routes(app); // /v1/webhooks/... (fal) // Legacy FakeYou surface area that might be useful again one day diff --git a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/generate_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/generate_routes.rs index f5d14c992e..9c6bf9b0dc 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/generate_routes.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/generate_routes.rs @@ -46,9 +46,6 @@ use crate::http_server::endpoints::generate::video::multi_function::sora_2_multi use crate::http_server::endpoints::generate::video::multi_function::sora_2_pro_multi_function_video_gen_handler::sora_2_pro_multi_function_video_gen_handler; use crate::http_server::endpoints::generate::video::multi_function::veo_3p1_fast_multi_function_video_gen_handler::veo_3p1_fast_multi_function_video_gen_handler; use crate::http_server::endpoints::generate::video::multi_function::veo_3p1_multi_function_video_gen_handler::veo_3p1_multi_function_video_gen_handler; -use crate::http_server::endpoints::generate::omni_gen::cost::video::omni_gen_video_cost_handler::omni_gen_video_cost_handler; -use crate::http_server::endpoints::generate::omni_gen::generate::video::omni_gen_video_generate_handler::omni_gen_video_generate_handler; -use crate::http_server::endpoints::generate::omni_gen::models::video::omni_gen_video_models_handler::omni_gen_video_models_handler; use actix_http::body::MessageBody; use actix_service::ServiceFactory; use actix_web::dev::{ServiceRequest, ServiceResponse}; @@ -281,24 +278,4 @@ where ) ) ) - .service(web::scope("/v1/omni_gen") - .service(web::scope("/cost") - .service(web::resource("/video") - .route(web::post().to(omni_gen_video_cost_handler)) - .route(web::head().to(|| HttpResponse::Ok())) - ) - ) - .service(web::scope("/generate") - .service(web::resource("/video") - .route(web::post().to(omni_gen_video_generate_handler)) - .route(web::head().to(|| HttpResponse::Ok())) - ) - ) - .service(web::scope("/models") - .service(web::resource("/video") - .route(web::get().to(omni_gen_video_models_handler)) - .route(web::head().to(|| HttpResponse::Ok())) - ) - ) - ) } diff --git a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/mod.rs b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/mod.rs index 622f26c535..5df0870d66 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/mod.rs @@ -6,6 +6,7 @@ mod generate_routes; mod job_routes; mod media_files_routes; mod moderation_routes; +mod omni_gen_routes; mod prompts_routes; mod stripe_artcraft_routes; mod subscription_routes; diff --git a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/omni_gen_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/omni_gen_routes.rs new file mode 100644 index 0000000000..13e1802fee --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/omni_gen_routes.rs @@ -0,0 +1,41 @@ +use actix_http::body::MessageBody; +use actix_service::ServiceFactory; +use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::{web, App, Error, HttpResponse}; + +use crate::http_server::endpoints::omni_gen::cost::video::omni_gen_video_cost_handler::omni_gen_video_cost_handler; +use crate::http_server::endpoints::omni_gen::generate::video::omni_gen_video_generate_handler::omni_gen_video_generate_handler; +use crate::http_server::endpoints::omni_gen::models::video::omni_gen_video_models_handler::omni_gen_video_models_handler; + +pub fn add_omni_gen_routes(app: App) -> App +where + B: MessageBody, + T: ServiceFactory< + ServiceRequest, + Config = (), + Response = ServiceResponse, + Error = Error, + InitError = (), + >, +{ + app.service(web::scope("/v1/omni_gen") + .service(web::scope("/cost") + .service(web::resource("/video") + .route(web::post().to(omni_gen_video_cost_handler)) + .route(web::head().to(|| HttpResponse::Ok())) + ) + ) + .service(web::scope("/generate") + .service(web::resource("/video") + .route(web::post().to(omni_gen_video_generate_handler)) + .route(web::head().to(|| HttpResponse::Ok())) + ) + ) + .service(web::scope("/models") + .service(web::resource("/video") + .route(web::get().to(omni_gen_video_models_handler)) + .route(web::head().to(|| HttpResponse::Ok())) + ) + ) + ) +}