move modules

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;

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;

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

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()))
-          )
-      )
-  )
 }

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;

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<T, B>(app: App<T>) -> App<T>
+where
+    B: MessageBody,
+    T: ServiceFactory<
+      ServiceRequest,
+      Config = (),
+      Response = ServiceResponse<B>,
+      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()))
+          )
+      )
+  )
+}