From 7609c040cc6d3bccb665e76b2ffa84aec5c5fc59 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Fri, 5 Jul 2024 20:40:54 -0400 Subject: [PATCH] move module `routes` --- .../web/storyteller_web/src/http_server/mod.rs | 1 + .../src/{ => http_server}/routes/add_routes.rs | 12 ++++++------ .../src/{ => http_server}/routes/beta_key_routes.rs | 0 .../src/{ => http_server}/routes/job_routes.rs | 0 .../{ => http_server}/routes/media_files_routes.rs | 0 .../src/{ => http_server}/routes/mod.rs | 0 .../{ => http_server}/routes/moderation_routes.rs | 0 .../src/{ => http_server}/routes/user_routes.rs | 0 .../src/{ => http_server}/routes/weights_routes.rs | 0 crates/service/web/storyteller_web/src/main.rs | 3 +-- 10 files changed, 8 insertions(+), 8 deletions(-) rename crates/service/web/storyteller_web/src/{ => http_server}/routes/add_routes.rs (99%) rename crates/service/web/storyteller_web/src/{ => http_server}/routes/beta_key_routes.rs (100%) rename crates/service/web/storyteller_web/src/{ => http_server}/routes/job_routes.rs (100%) rename crates/service/web/storyteller_web/src/{ => http_server}/routes/media_files_routes.rs (100%) rename crates/service/web/storyteller_web/src/{ => http_server}/routes/mod.rs (100%) rename crates/service/web/storyteller_web/src/{ => http_server}/routes/moderation_routes.rs (100%) rename crates/service/web/storyteller_web/src/{ => http_server}/routes/user_routes.rs (100%) rename crates/service/web/storyteller_web/src/{ => http_server}/routes/weights_routes.rs (100%) diff --git a/crates/service/web/storyteller_web/src/http_server/mod.rs b/crates/service/web/storyteller_web/src/http_server/mod.rs index 17e258a56a..215c965d52 100644 --- a/crates/service/web/storyteller_web/src/http_server/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/mod.rs @@ -2,5 +2,6 @@ pub mod common_responses; pub mod endpoints; pub mod middleware; pub mod responses; +pub mod routes; pub mod validations; pub mod web_utils; diff --git a/crates/service/web/storyteller_web/src/routes/add_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/add_routes.rs similarity index 99% rename from crates/service/web/storyteller_web/src/routes/add_routes.rs rename to crates/service/web/storyteller_web/src/http_server/routes/add_routes.rs index 2a33344f28..bd3b02e552 100644 --- a/crates/service/web/storyteller_web/src/routes/add_routes.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/add_routes.rs @@ -131,12 +131,12 @@ use crate::http_server::endpoints::w2l::set_w2l_template_mod_approval::set_w2l_t use crate::http_server::endpoints::workflows::enqueue_comfy_ui_handler::enqueue_comfy_ui_handler; use crate::http_server::endpoints::workflows::enqueue_video_style_transfer_handler::enqueue_video_style_transfer_handler; use crate::http_server::endpoints::workflows::enqueue_workflow_upload_request::enqueue_workflow_upload_request; -use crate::routes::beta_key_routes::add_beta_key_routes; -use crate::routes::job_routes::add_job_routes; -use crate::routes::media_files_routes::add_media_file_routes; -use crate::routes::moderation_routes::add_moderator_routes; -use crate::routes::user_routes::add_user_routes; -use crate::routes::weights_routes::add_weights_routes; +use crate::http_server::routes::beta_key_routes::add_beta_key_routes; +use crate::http_server::routes::job_routes::add_job_routes; +use crate::http_server::routes::media_files_routes::add_media_file_routes; +use crate::http_server::routes::moderation_routes::add_moderator_routes; +use crate::http_server::routes::user_routes::add_user_routes; +use crate::http_server::routes::weights_routes::add_weights_routes; pub fn add_routes (app: App, server_environment: ServerEnvironment) -> App where diff --git a/crates/service/web/storyteller_web/src/routes/beta_key_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/beta_key_routes.rs similarity index 100% rename from crates/service/web/storyteller_web/src/routes/beta_key_routes.rs rename to crates/service/web/storyteller_web/src/http_server/routes/beta_key_routes.rs diff --git a/crates/service/web/storyteller_web/src/routes/job_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/job_routes.rs similarity index 100% rename from crates/service/web/storyteller_web/src/routes/job_routes.rs rename to crates/service/web/storyteller_web/src/http_server/routes/job_routes.rs diff --git a/crates/service/web/storyteller_web/src/routes/media_files_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/media_files_routes.rs similarity index 100% rename from crates/service/web/storyteller_web/src/routes/media_files_routes.rs rename to crates/service/web/storyteller_web/src/http_server/routes/media_files_routes.rs diff --git a/crates/service/web/storyteller_web/src/routes/mod.rs b/crates/service/web/storyteller_web/src/http_server/routes/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/routes/mod.rs rename to crates/service/web/storyteller_web/src/http_server/routes/mod.rs diff --git a/crates/service/web/storyteller_web/src/routes/moderation_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/moderation_routes.rs similarity index 100% rename from crates/service/web/storyteller_web/src/routes/moderation_routes.rs rename to crates/service/web/storyteller_web/src/http_server/routes/moderation_routes.rs diff --git a/crates/service/web/storyteller_web/src/routes/user_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/user_routes.rs similarity index 100% rename from crates/service/web/storyteller_web/src/routes/user_routes.rs rename to crates/service/web/storyteller_web/src/http_server/routes/user_routes.rs diff --git a/crates/service/web/storyteller_web/src/routes/weights_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/weights_routes.rs similarity index 100% rename from crates/service/web/storyteller_web/src/routes/weights_routes.rs rename to crates/service/web/storyteller_web/src/http_server/routes/weights_routes.rs diff --git a/crates/service/web/storyteller_web/src/main.rs b/crates/service/web/storyteller_web/src/main.rs index ce90c3775e..43a6195a74 100644 --- a/crates/service/web/storyteller_web/src/main.rs +++ b/crates/service/web/storyteller_web/src/main.rs @@ -78,7 +78,7 @@ use crate::configs::static_api_tokens::StaticApiTokenSet; use crate::http_server::middleware::pushback_filter_middleware::PushbackFilter; use crate::http_server::web_utils::handle_multipart_error::handle_multipart_error; use crate::memory_cache::model_token_to_info_cache::ModelTokenToInfoCache; -use crate::routes::add_routes::add_routes; +use crate::http_server::routes::add_routes::add_routes; use crate::server_state::{DurableInMemoryCaches, EnvConfig, EphemeralInMemoryCaches, InMemoryCaches, ServerInfo, ServerState, StaticFeatureFlags, StripeSettings, TrollBans}; use crate::threads::db_health_checker_thread::db_health_check_status::HealthCheckStatus; use crate::threads::db_health_checker_thread::db_health_checker_thread::db_health_checker_thread; @@ -96,7 +96,6 @@ pub mod configs; pub mod http_server; pub mod memory_cache; pub mod model; -pub mod routes; pub mod server_state; pub mod subscriptions; pub mod threads;