From ce186179ce262e7bff29ecbfa7abba4de2c07ba4 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 7 Jul 2024 17:23:19 -0400 Subject: [PATCH] move api docs into module --- .../web/storyteller_web/src/api_doc_cli.rs | 31 ++++--------------- .../web/storyteller_web/src/api_doc_server.rs | 4 +-- .../stripe_internal_user_lookup_impl.rs | 3 +- .../storyteller_web/src/{ => docs}/api_doc.rs | 0 .../web/storyteller_web/src/docs/mod.rs | 1 + .../disable_design_refresh_flag_handler.rs | 2 +- .../enable_design_refresh_flag_handler.rs | 2 +- ...get_pending_inference_job_count_handler.rs | 2 +- .../stats/get_on_prem_worker_stats.rs | 2 +- .../stats/get_unified_queue_stats.rs | 2 +- .../get_pending_tts_inference_job_count.rs | 2 +- .../storyteller_web/src/state/server_state.rs | 2 +- 12 files changed, 17 insertions(+), 36 deletions(-) rename crates/service/web/storyteller_web/src/{ => docs}/api_doc.rs (100%) create mode 100644 crates/service/web/storyteller_web/src/docs/mod.rs diff --git a/crates/service/web/storyteller_web/src/api_doc_cli.rs b/crates/service/web/storyteller_web/src/api_doc_cli.rs index 9b68a18c58..50ca96933b 100644 --- a/crates/service/web/storyteller_web/src/api_doc_cli.rs +++ b/crates/service/web/storyteller_web/src/api_doc_cli.rs @@ -17,23 +17,16 @@ #[macro_use] extern crate magic_crypt; #[macro_use] extern crate serde_derive; -use utoipa_swagger_ui::SwaggerUi; +use std::error::Error; +use std::fs::File; +use std::io::Write; -use actix_web::{App, HttpServer, middleware, web}; -use actix_web::middleware::{DefaultHeaders, Logger}; - -use r2d2_redis::r2d2; use r2d2_redis::redis::Commands; -use r2d2_redis::RedisConnectionManager; -use sqlx::mysql::MySqlPoolOptions; -use sqlx::MySqlPool; -use tokio::runtime::Runtime; +use utoipa::OpenApi; +use docs::api_doc::ApiDoc; use errors::AnyhowResult; -use crate::configs::static_api_tokens::{StaticApiTokenConfig, StaticApiTokens, StaticApiTokenSet}; -use crate::state::server_state::{DurableInMemoryCaches, EnvConfig, EphemeralInMemoryCaches, InMemoryCaches, RedisRateLimiters, ServerInfo, ServerState, StaticFeatureFlags, StripeSettings, TrollBans}; - pub mod billing; pub mod configs; pub mod http_server; @@ -42,19 +35,7 @@ pub mod state; pub mod threads; pub mod util; -use std::{ - error::Error, - future::{self, Ready}, - net::Ipv4Addr, -}; -use std::fs::File; -use std::io::Write; - -pub mod api_doc; -use api_doc::ApiDoc; - -use futures::future::LocalBoxFuture; -use utoipa::OpenApi; +pub mod docs; #[actix_web::main] async fn main() -> AnyhowResult<()> { diff --git a/crates/service/web/storyteller_web/src/api_doc_server.rs b/crates/service/web/storyteller_web/src/api_doc_server.rs index f68953cf03..69f0808fe5 100644 --- a/crates/service/web/storyteller_web/src/api_doc_server.rs +++ b/crates/service/web/storyteller_web/src/api_doc_server.rs @@ -25,7 +25,7 @@ use sqlx::MySqlPool; use utoipa::OpenApi; use utoipa_swagger_ui::SwaggerUi; -use api_doc::ApiDoc; +use docs::api_doc::ApiDoc; use errors::AnyhowResult; use crate::configs::static_api_tokens::StaticApiTokenSet; @@ -39,7 +39,7 @@ pub mod state; pub mod threads; pub mod util; -pub mod api_doc; +pub mod docs; #[actix_web::main] async fn main() -> Result<(), impl Error> { diff --git a/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs b/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs index 4c746b0653..f26f0b3290 100644 --- a/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs +++ b/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs @@ -2,12 +2,11 @@ use actix_web::HttpRequest; use async_trait::async_trait; use chrono::Utc; use log::warn; +use sqlx::MySqlPool; use billing_component::stripe::traits::internal_user_lookup::{InternalUserLookup, InternalUserLookupError, SubscriptionKey, UserMetadata}; use users_component::session::session_checker::SessionChecker; -use crate::MySqlPool; - /// A simple Actix injectable action #[derive(Clone)] pub struct StripeInternalUserLookupImpl { diff --git a/crates/service/web/storyteller_web/src/api_doc.rs b/crates/service/web/storyteller_web/src/docs/api_doc.rs similarity index 100% rename from crates/service/web/storyteller_web/src/api_doc.rs rename to crates/service/web/storyteller_web/src/docs/api_doc.rs diff --git a/crates/service/web/storyteller_web/src/docs/mod.rs b/crates/service/web/storyteller_web/src/docs/mod.rs new file mode 100644 index 0000000000..beb21dde07 --- /dev/null +++ b/crates/service/web/storyteller_web/src/docs/mod.rs @@ -0,0 +1 @@ +pub mod api_doc; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/disable_design_refresh_flag_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/disable_design_refresh_flag_handler.rs index 30e4994925..49bf4f7ab3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/disable_design_refresh_flag_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/disable_design_refresh_flag_handler.rs @@ -5,7 +5,7 @@ use actix_web::{HttpRequest, HttpResponse, Responder, web}; use crate::http_server::endpoints::flags::design_refresh_flag::build_design_refresh_cookie::build_design_refresh_cookie; use crate::http_server::endpoints::flags::get_cookie_domain::get_set_cookie_domain; -use crate::ServerState; +use crate::state::server_state::ServerState; pub async fn disable_design_refresh_flag_handler( http_request: HttpRequest, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/enable_design_refresh_flag_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/enable_design_refresh_flag_handler.rs index f9f9f2761b..5218ffdd76 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/enable_design_refresh_flag_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/enable_design_refresh_flag_handler.rs @@ -5,7 +5,7 @@ use actix_web::{HttpRequest, HttpResponse, Responder, web}; use crate::http_server::endpoints::flags::design_refresh_flag::build_design_refresh_cookie::build_design_refresh_cookie; use crate::http_server::endpoints::flags::get_cookie_domain::get_set_cookie_domain; -use crate::ServerState; +use crate::state::server_state::ServerState; pub async fn enable_design_refresh_flag_handler( http_request: HttpRequest, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_pending_inference_job_count_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_pending_inference_job_count_handler.rs index 334f86db8d..06c05a086c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_pending_inference_job_count_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_pending_inference_job_count_handler.rs @@ -8,7 +8,7 @@ use log::{debug, error, warn}; use mysql_queries::queries::generic_inference::web::get_pending_inference_job_count::get_pending_inference_job_count; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::ServerState; +use crate::state::server_state::ServerState; #[derive(Serialize)] pub struct GetPendingInferenceJobSuccessResponse { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_on_prem_worker_stats.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_on_prem_worker_stats.rs index e409affaba..ae7d469043 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_on_prem_worker_stats.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_on_prem_worker_stats.rs @@ -7,7 +7,7 @@ use log::warn; use mysql_queries::queries::stats::get_on_prem_worker_stats::get_on_prem_worker_stats; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; -use crate::ServerState; +use crate::state::server_state::ServerState; const MIN_SAMPLE_SIZE : u32 = 100; const MAX_SAMPLE_SIZE : u32 = 10_000; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/stats/get_unified_queue_stats.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/stats/get_unified_queue_stats.rs index af786f466b..841a9669aa 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/stats/get_unified_queue_stats.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/stats/get_unified_queue_stats.rs @@ -9,7 +9,7 @@ use redis_common::redis_cache_keys::RedisCacheKeys; use crate::http_server::endpoints::stats::result_transformer::{CacheableQueueStats, database_result_to_cacheable}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::ServerState; +use crate::state::server_state::ServerState; #[derive(Serialize)] pub struct GetUnifiedQueueStatsSuccessResponse { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_pending_tts_inference_job_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_pending_tts_inference_job_count.rs index 4d59944827..c0f745b652 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_pending_tts_inference_job_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_pending_tts_inference_job_count.rs @@ -8,7 +8,7 @@ use log::{debug, error, warn}; use mysql_queries::queries::tts::tts_inference_jobs::get_pending_tts_inference_job_count::get_pending_tts_inference_job_count; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::ServerState; +use crate::state::server_state::ServerState; #[derive(Serialize)] pub struct Response { diff --git a/crates/service/web/storyteller_web/src/state/server_state.rs b/crates/service/web/storyteller_web/src/state/server_state.rs index 209f1868d2..38e998f608 100644 --- a/crates/service/web/storyteller_web/src/state/server_state.rs +++ b/crates/service/web/storyteller_web/src/state/server_state.rs @@ -22,6 +22,7 @@ use users_component::session::http::http_user_session_manager::HttpUserSessionMa use users_component::session::session_checker::SessionChecker; use crate::configs::app_startup::username_set::UsernameSet; +use crate::configs::static_api_tokens::StaticApiTokenSet; use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::list_fully_computed_assigned_tts_categories::ModelTokensByCategoryToken; use crate::http_server::endpoints::leaderboard::get_leaderboard::LeaderboardInfo; use crate::http_server::endpoints::stats::result_transformer::CacheableQueueStats; @@ -29,7 +30,6 @@ use crate::http_server::endpoints::tts::list_tts_models::TtsModelRecordForRespon use crate::http_server::endpoints::voice_conversion::models::list_voice_conversion_models::VoiceConversionModel; use crate::http_server::web_utils::redis_rate_limiter::RedisRateLimiter; use crate::state::memory_cache::model_token_to_info_cache::ModelTokenToInfoCache; -use crate::StaticApiTokenSet; use crate::threads::db_health_checker_thread::db_health_check_status::HealthCheckStatus; use crate::util::encrypted_sort_id::SortKeyCrypto; use crate::util::troll_user_bans::troll_user_ban_list::TrollUserBanList;