refactor modules

crates/service/web/storyteller_web/src/docs/api_doc.rs

@@ -40,26 +40,26 @@ use tokens::tokens::zs_voice_datasets::*;
 
 use crate::http_server::common_requests::auto_product_category::AutoProductCategory;
 use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo;
-use crate::http_server::common_responses::media_file_cover_image_details::MediaFileCoverImageDetails;
-use crate::http_server::common_responses::media_file_cover_image_details::MediaFileDefaultCover;
+use crate::http_server::common_responses::media::cover_image_links::CoverImageLinks;
+use crate::http_server::common_responses::media::media_file_cover_image_details::MediaFileCoverImageDetails;
+use crate::http_server::common_responses::media::media_file_cover_image_details::MediaFileDefaultCover;
+use crate::http_server::common_responses::media::weights_cover_image_details::*;
 use crate::http_server::common_responses::media_file_origin_details::*;
 use crate::http_server::common_responses::media_file_social_meta_lite::MediaFileSocialMetaLight;
 use crate::http_server::common_responses::media_links::*;
 use crate::http_server::common_responses::pagination_cursors::PaginationCursors;
 use crate::http_server::common_responses::pagination_page::PaginationPage;
-use crate::http_server::common_responses::media::cover_image_links::CoverImageLinks;
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::common_responses::simple_response::SimpleResponse;
 use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight};
-use crate::http_server::common_responses::weights_cover_image_details::*;
 use crate::http_server::endpoints::analytics::log_browser_session_handler::*;
 use crate::http_server::endpoints::app_state::components::get_permissions::AppStateLegacyPermissionFlags;
 use crate::http_server::endpoints::app_state::components::get_permissions::AppStatePermissions;
 use crate::http_server::endpoints::app_state::components::get_premium_info::AppStatePremiumInfo;
 use crate::http_server::endpoints::app_state::components::get_premium_info::AppStateSubscriptionProductKey;
 use crate::http_server::endpoints::app_state::components::get_server_info::AppStateServerInfo;
-use crate::http_server::endpoints::app_state::components::get_status_alert::AppStateStatusAlertInfo;
 use crate::http_server::endpoints::app_state::components::get_status_alert::AppStateStatusAlertCategory;
+use crate::http_server::endpoints::app_state::components::get_status_alert::AppStateStatusAlertInfo;
 use crate::http_server::endpoints::app_state::components::get_user_info::AppStateUserInfo;
 use crate::http_server::endpoints::app_state::components::get_user_locale::AppStateUserLocale;
 use crate::http_server::endpoints::app_state::get_app_state_handler::*;

crates/service/web/storyteller_web/src/http_server/common_responses/media/media_file_cover_image_details.rs

@@ -3,11 +3,11 @@ use std::hash::{Hash, Hasher};
 use url::Url;
 use utoipa::ToSchema;
 
+use crate::http_server::common_responses::media::cover_image_links::CoverImageLinks;
+use crate::http_server::common_responses::media_links::MediaDomain;
+use crate::http_server::web_utils::bucket_urls::bucket_url_from_media_path::bucket_url_from_media_path;
 use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use tokens::tokens::media_files::MediaFileToken;
-use crate::http_server::common_responses::media::cover_image_links::CoverImageLinks;
-use crate::http_server::common_responses::media_links::{MediaDomain, MediaLinks};
-use crate::http_server::web_utils::bucket_urls::bucket_url_from_media_path::bucket_url_from_media_path;
 
 /// There are currently 25 cover images numbered 0 to 24 (0-indexed).
 /// The original dataset was numbered 1 - 25, but I renamed 25 to 0.
@@ -162,7 +162,7 @@ fn hash(token: &str, max_number: u64, salt: u8) -> u8 {
 mod tests {
   use tokens::tokens::media_files::MediaFileToken;
 
-  use crate::http_server::common_responses::media_file_cover_image_details::MediaFileDefaultCover;
+  use crate::http_server::common_responses::media::media_file_cover_image_details::MediaFileDefaultCover;
 
   #[test]
   fn test() {

crates/service/web/storyteller_web/src/http_server/common_responses/media/mod.rs

@@ -1 +1,3 @@
-pub mod cover_image_links;
+pub mod cover_image_links;
+pub mod media_file_cover_image_details;
+pub mod weights_cover_image_details;

crates/service/web/storyteller_web/src/http_server/common_responses/media/weights_cover_image_details.rs

@@ -95,7 +95,7 @@ impl WeightsDefaultCoverInfo {
 #[cfg(test)]
 mod tests {
   use crate::http_server::common_responses::media_links::MediaDomain;
-  use crate::http_server::common_responses::weights_cover_image_details::WeightsCoverImageDetails;
+  use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails;
   use tokens::tokens::model_weights::ModelWeightToken;
   use url::Url;
 

crates/service/web/storyteller_web/src/http_server/common_responses/mod.rs

@@ -1,5 +1,4 @@
 pub mod media;
-pub mod media_file_cover_image_details;
 pub mod media_file_origin_details;
 pub mod media_file_social_meta_lite;
 pub mod media_links;
@@ -9,4 +8,3 @@ pub mod simple_entity_stats;
 pub mod simple_response;
 pub mod user_avatars;
 pub mod user_details_lite;
-pub mod weights_cover_image_details;

crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs

@@ -18,7 +18,7 @@ use mysql_queries::queries::beta_keys::list_beta_keys::{FilterToKeys, list_beta_
 use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username;
 use tokens::tokens::beta_keys::BetaKeyToken;
 
-use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
+use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails;
 use crate::http_server::common_responses::pagination_cursors::PaginationCursors;
 use crate::http_server::common_responses::pagination_page::PaginationPage;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs

@@ -31,7 +31,7 @@ use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::prompts::PromptToken;
 
-use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
+use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_links::MediaLinks;
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::common_responses::user_details_lite::UserDetailsLight;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs

@@ -28,7 +28,7 @@ use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::prompts::PromptToken;
 
-use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
+use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_links::{MediaDomain, MediaLinks};
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::common_responses::user_details_lite::UserDetailsLight;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs

@@ -26,7 +26,7 @@ use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::b
 use mysql_queries::queries::media_files::list::list_featured_media_files::{list_featured_media_files, FeaturedMediaFileListPage, ListFeaturedMediaFilesArgs};
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
+use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails;
 use crate::http_server::common_responses::media_links::MediaLinks;
 use crate::http_server::common_responses::pagination_cursors::PaginationCursors;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs

@@ -24,7 +24,7 @@ use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_
 use tokens::tokens::batch_generations::BatchGenerationToken;
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
+use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails;
 use crate::http_server::common_responses::media_links::MediaLinks;
 use crate::http_server::common_responses::pagination_page::PaginationPage;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs

@@ -23,7 +23,7 @@ use enums_public::by_table::media_files::public_media_file_model_type::PublicMed
 use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs};
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
+use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails;
 use crate::http_server::common_responses::media_links::MediaLinks;
 use crate::http_server::common_responses::pagination_page::PaginationPage;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs

@@ -22,7 +22,7 @@ use enums_public::by_table::media_files::public_media_file_model_type::PublicMed
 use mysql_queries::queries::media_files::list::list_media_files::{list_media_files, ListMediaFilesArgs};
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
+use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails;
 use crate::http_server::common_responses::media_links::MediaLinks;
 use crate::http_server::common_responses::pagination_cursors::PaginationCursors;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs

@@ -20,7 +20,7 @@ use enums_public::by_table::media_files::public_media_file_model_type::PublicMed
 use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens;
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
+use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails;
 use crate::http_server::common_responses::media_links::MediaLinks;
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs

@@ -19,7 +19,7 @@ use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
+use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails;
 use crate::http_server::common_responses::media_links::MediaLinks;
 use crate::http_server::common_responses::pagination_cursors::PaginationCursors;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs

@@ -21,7 +21,7 @@ use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::users::UserToken;
 
-use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
+use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails;
 use crate::http_server::common_responses::media_links::MediaLinks;
 use crate::http_server::common_responses::pagination_cursors::PaginationCursors;

crates/service/web/storyteller_web/src/http_server/endpoints/weights/get/get_weight_handler.rs

@@ -20,7 +20,7 @@ use tokens::tokens::model_weights::ModelWeightToken;
 
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::common_responses::user_details_lite::UserDetailsLight;
-use crate::http_server::common_responses::weights_cover_image_details::WeightsCoverImageDetails;
+use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails;
 use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
 use crate::state::server_state::ServerState;
 use crate::util::title_to_url_slug::title_to_url_slug;

crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_available_weights_handler.rs

@@ -22,7 +22,7 @@ use tokens::tokens::model_weights::ModelWeightToken;
 use crate::http_server::common_responses::pagination_cursors::PaginationCursors;
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::common_responses::user_details_lite::UserDetailsLight;
-use crate::http_server::common_responses::weights_cover_image_details::WeightsCoverImageDetails;
+use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails;
 use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
 use crate::state::server_state::ServerState;
 use crate::util::title_to_url_slug::title_to_url_slug;

crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_featured_weights_handler.rs

@@ -21,7 +21,7 @@ use tokens::tokens::model_weights::ModelWeightToken;
 
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::common_responses::user_details_lite::UserDetailsLight;
-use crate::http_server::common_responses::weights_cover_image_details::WeightsCoverImageDetails;
+use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails;
 use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_classes::get_scoped_media_classes;
 use crate::http_server::endpoints::media_files::list::list_featured_media_files_handler::ListFeaturedMediaFilesError;

crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_pinned_weights_handler.rs

@@ -17,7 +17,7 @@ use tokens::tokens::model_weights::ModelWeightToken;
 
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::common_responses::user_details_lite::UserDetailsLight;
-use crate::http_server::common_responses::weights_cover_image_details::WeightsCoverImageDetails;
+use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails;
 use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
 use crate::state::server_state::ServerState;
 use crate::util::title_to_url_slug::title_to_url_slug;

crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_weights_by_user_handler.rs

@@ -21,7 +21,7 @@ use tokens::tokens::model_weights::ModelWeightToken;
 use crate::http_server::common_responses::pagination_page::PaginationPage;
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::common_responses::user_details_lite::UserDetailsLight;
-use crate::http_server::common_responses::weights_cover_image_details::WeightsCoverImageDetails;
+use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails;
 use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
 use crate::state::server_state::ServerState;
 use crate::util::title_to_url_slug::title_to_url_slug;

crates/service/web/storyteller_web/src/http_server/endpoints/weights/search/search_model_weights_impl.rs

@@ -17,7 +17,7 @@ use utoipa::ToSchema;
 
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::common_responses::user_details_lite::UserDetailsLight;
-use crate::http_server::common_responses::weights_cover_image_details::WeightsCoverImageDetails;
+use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails;
 use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;