begin deprecating old endpoints

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/add_synthetic_categories.rs

@@ -10,8 +10,8 @@ use mysql_queries::queries::trending_model_analytics::list_trending_tts_models::
 use tokens::tokens::model_categories::ModelCategoryToken;
 use tokens::tokens::tts_models::TtsModelToken;
 
-use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::{CategoryTokenToModelTokensMap, TtsModelInfoLite};
 use crate::configs::static_model::categories::synthetic_category_list::{SYNTHETIC_CATEGORY_LATEST_TTS_MODELS, SYNTHETIC_CATEGORY_TRENDING_TTS_MODELS};
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::{CategoryTokenToModelTokensMap, TtsModelInfoLite};
 
 pub fn add_recent_models(recursive_category_to_model_map: &mut CategoryTokenToModelTokensMap, models: &Vec<TtsModelInfoLite>) {
   let mut model_refs : Vec<&TtsModelInfoLite> = models.iter()

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/list_fully_computed_assigned_tts_categories.rs

@@ -16,8 +16,8 @@ use log::{error, info};
 use tokens::tokens::model_categories::ModelCategoryToken;
 use tokens::tokens::tts_models::TtsModelToken;
 
-use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::error::ListFullyComputedAssignedTtsCategoriesError;
-use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::query_and_construct_payload;
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::error::ListFullyComputedAssignedTtsCategoriesError;
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::query_and_construct_payload;
 use crate::state::server_state::ServerState;
 
 // =============== Success Response ===============

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/query_and_construct_payload.rs

@@ -8,8 +8,8 @@ use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use chrono::{DateTime, Utc};
 use lexical_sort::natural_lexical_cmp;
 use log::error;
-use sqlx::{MySql, MySqlPool};
 use sqlx::pool::PoolConnection;
+use sqlx::{MySql, MySqlPool};
 
 use errors::AnyhowResult;
 use memory_caching::single_item_ttl_cache::SingleItemTtlCache;
@@ -20,11 +20,11 @@ use mysql_queries::queries::tts::tts_models::list_tts_models::list_tts_models_wi
 use tokens::tokens::model_categories::ModelCategoryToken;
 use tokens::tokens::tts_models::TtsModelToken;
 
-use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::add_synthetic_categories::{add_recent_models, add_trending_models};
-use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::error::ListFullyComputedAssignedTtsCategoriesError;
-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::categories::tts::list_fully_computed_assigned_tts_categories::recursively_build_category_map::recursive_category_to_model_map;
-use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::sort_models::sort_models;
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::add_synthetic_categories::{add_recent_models, add_trending_models};
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::error::ListFullyComputedAssignedTtsCategoriesError;
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::list_fully_computed_assigned_tts_categories::ModelTokensByCategoryToken;
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::recursively_build_category_map::recursive_category_to_model_map;
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::sort_models::sort_models;
 use crate::state::cached_queries::list_cached_tts_categories_for_public_dropdown::list_cached_tts_categories_for_public_dropdown;
 
 #[derive(Clone)]

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/recursively_build_category_map.rs

@@ -7,7 +7,7 @@ use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 
 use tokens::tokens::model_categories::ModelCategoryToken;
 
-use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::{CategoryInfoLite, CategoryTokenToCategoryMap, CategoryTokenToModelTokensMap, ModelTokenToCategoryTokensMap};
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::{CategoryInfoLite, CategoryTokenToCategoryMap, CategoryTokenToModelTokensMap, ModelTokenToCategoryTokensMap};
 
 fn recursive_category_tokens(model_category_map: &ModelTokenToCategoryTokensMap, all_categories: &Vec<CategoryInfoLite>) -> BTreeSet<ModelCategoryToken> {
   let mut category_tokens = leaf_category_tokens(model_category_map);

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/sort_models.rs

@@ -5,7 +5,7 @@ use lexical_sort::natural_lexical_cmp;
 use tokens::tokens::model_categories::ModelCategoryToken;
 use tokens::tokens::tts_models::TtsModelToken;
 
-use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::{CategoryTokenToModelTokensMap, TtsModelInfoLite};
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::{CategoryTokenToModelTokensMap, TtsModelInfoLite};
 
 const UNNAMED_MODEL_SORT_VALUE : &str = "unnamed";
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_fbx_to_gltf_handler.rs

@@ -3,9 +3,9 @@
 use std::fmt::Debug;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use log::warn;
 use serde::Deserialize;
 use serde::Serialize;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_render_engine_scene_to_video_handler.rs

@@ -3,10 +3,10 @@
 use std::fmt::Debug;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Json;
+use actix_web::{web, HttpRequest, HttpResponse};
 use log::warn;
 use serde::Deserialize;
 use serde::Serialize;
@@ -30,7 +30,6 @@ use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::users::UserToken;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
-use crate::http_server::endpoints::conversion::enqueue_fbx_to_gltf_handler::EnqueueFbxToGltfRequestError;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;
 use crate::util::allowed_studio_access::allowed_studio_access;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/flags/design_refresh_flag/disable_design_refresh_flag_handler.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
 use actix_http::StatusCode;
-use actix_web::{HttpRequest, HttpResponse, Responder, web};
+use actix_web::{web, HttpRequest, HttpResponse, Responder};
 
-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::http_server::deprecated_endpoints::flags::design_refresh_flag::build_design_refresh_cookie::build_design_refresh_cookie;
+use crate::http_server::deprecated_endpoints::flags::get_cookie_domain::get_set_cookie_domain;
 use crate::state::server_state::ServerState;
 
 pub async fn disable_design_refresh_flag_handler(

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/flags/design_refresh_flag/enable_design_refresh_flag_handler.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
 use actix_http::StatusCode;
-use actix_web::{HttpRequest, HttpResponse, Responder, web};
+use actix_web::{web, HttpRequest, HttpResponse, Responder};
 
-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::http_server::deprecated_endpoints::flags::design_refresh_flag::build_design_refresh_cookie::build_design_refresh_cookie;
+use crate::http_server::deprecated_endpoints::flags::get_cookie_domain::get_set_cookie_domain;
 use crate::state::server_state::ServerState;
 
 pub async fn enable_design_refresh_flag_handler(

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

@@ -0,0 +1,5 @@
+pub mod animation;
+pub mod categories;
+pub mod conversion;
+pub mod flags;
+pub mod mocap;

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

@@ -1,17 +1,14 @@
 pub mod analytics;
-pub mod animation;
 pub mod api_tokens;
 pub mod app_state;
 pub mod beta_keys;
 pub mod categories;
 pub mod comments;
 pub mod control_plane;
-pub mod conversion;
 pub mod download_job;
 pub mod engine;
 pub mod events;
 pub mod featured_items;
-pub mod flags;
 pub mod image_gen;
 pub mod image_studio;
 pub mod inference_job;
@@ -20,7 +17,6 @@ pub mod leaderboard;
 pub mod media_files;
 pub mod media_uploads;
 pub mod misc;
-pub mod mocap;
 pub mod model_download;
 pub mod moderation;
 pub mod prompts;

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

@@ -1,6 +1,7 @@
 pub mod common_requests;
 pub mod common_responses;
 pub mod cookies;
+pub mod deprecated_endpoints;
 pub mod endpoints;
 pub mod middleware;
 pub mod requests;

crates/service/web/storyteller_web/src/http_server/routes/add_routes.rs

@@ -8,24 +8,27 @@ use actix_helpers::route_builder::RouteBuilder;
 use billing_component::default_routes::add_suggested_stripe_billing_routes;
 use reusable_types::server_environment::ServerEnvironment;
 
-use crate::http_server::endpoints::animation::enqueue_face_animation::enqueue_face_animation_handler;
-use crate::http_server::endpoints::animation::enqueue_rerender_animation::enqueue_rerender_animation_handler;
+use crate::http_server::deprecated_endpoints::animation::enqueue_face_animation::enqueue_face_animation_handler;
+use crate::http_server::deprecated_endpoints::animation::enqueue_rerender_animation::enqueue_rerender_animation_handler;
+use crate::http_server::deprecated_endpoints::categories::create_category::create_category_handler;
+use crate::http_server::deprecated_endpoints::categories::get_category::get_category_handler;
+use crate::http_server::deprecated_endpoints::categories::tts::assign_tts_category::assign_tts_category_handler;
+use crate::http_server::deprecated_endpoints::categories::tts::list_fully_computed_assigned_tts_categories::list_fully_computed_assigned_tts_categories::list_fully_computed_assigned_tts_categories_handler;
+use crate::http_server::deprecated_endpoints::categories::tts::list_tts_categories::list_tts_categories_handler;
+use crate::http_server::deprecated_endpoints::categories::tts::list_tts_model_assigned_categories::list_tts_model_assigned_categories_handler;
+use crate::http_server::deprecated_endpoints::conversion::enqueue_fbx_to_gltf_handler::enqueue_fbx_to_gltf_handler;
+use crate::http_server::deprecated_endpoints::conversion::enqueue_render_engine_scene_to_video_handler::enqueue_render_engine_scene_to_video_handler;
+use crate::http_server::deprecated_endpoints::flags::design_refresh_flag::disable_design_refresh_flag_handler::disable_design_refresh_flag_handler;
+use crate::http_server::deprecated_endpoints::flags::design_refresh_flag::enable_design_refresh_flag_handler::enable_design_refresh_flag_handler;
+use crate::http_server::deprecated_endpoints::mocap::enqueue_mocapnet::enqueue_mocapnet_handler;
 use crate::http_server::endpoints::api_tokens::create_api_token::create_api_token_handler;
 use crate::http_server::endpoints::api_tokens::delete_api_token::delete_api_token_handler;
 use crate::http_server::endpoints::api_tokens::edit_api_token::edit_api_token_handler;
 use crate::http_server::endpoints::api_tokens::list_api_tokens::list_api_tokens_handler;
 use crate::http_server::endpoints::app_state::get_app_state_handler::get_app_state_handler;
-use crate::http_server::endpoints::categories::create_category::create_category_handler;
-use crate::http_server::endpoints::categories::get_category::get_category_handler;
-use crate::http_server::endpoints::categories::tts::assign_tts_category::assign_tts_category_handler;
-use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::list_fully_computed_assigned_tts_categories::list_fully_computed_assigned_tts_categories_handler;
-use crate::http_server::endpoints::categories::tts::list_tts_categories::list_tts_categories_handler;
-use crate::http_server::endpoints::categories::tts::list_tts_model_assigned_categories::list_tts_model_assigned_categories_handler;
 use crate::http_server::endpoints::comments::create_comment_handler::create_comment_handler;
 use crate::http_server::endpoints::comments::delete_comment_handler::delete_comment_handler;
 use crate::http_server::endpoints::comments::list_comments_handler::list_comments_handler;
-use crate::http_server::endpoints::conversion::enqueue_fbx_to_gltf_handler::enqueue_fbx_to_gltf_handler;
-use crate::http_server::endpoints::conversion::enqueue_render_engine_scene_to_video_handler::enqueue_render_engine_scene_to_video_handler;
 use crate::http_server::endpoints::download_job::enqueue_generic_download::enqueue_generic_download_handler;
 use crate::http_server::endpoints::download_job::get_generic_upload_job_status::get_generic_download_job_status_handler;
 use crate::http_server::endpoints::engine::create_scene_handler::create_scene_handler;
@@ -35,8 +38,6 @@ use crate::http_server::endpoints::events::list_events::list_events_handler;
 use crate::http_server::endpoints::featured_items::create_featured_item_handler::create_featured_item_handler;
 use crate::http_server::endpoints::featured_items::delete_featured_item_handler::delete_featured_item_handler;
 use crate::http_server::endpoints::featured_items::get_is_featured_item_handler::get_is_featured_item_handler;
-use crate::http_server::endpoints::flags::design_refresh_flag::disable_design_refresh_flag_handler::disable_design_refresh_flag_handler;
-use crate::http_server::endpoints::flags::design_refresh_flag::enable_design_refresh_flag_handler::enable_design_refresh_flag_handler;
 use crate::http_server::endpoints::investor_demo::disable_demo_mode_handler::disable_demo_mode_handler;
 use crate::http_server::endpoints::investor_demo::enable_demo_mode_handler::enable_demo_mode_handler;
 use crate::http_server::endpoints::leaderboard::get_leaderboard::leaderboard_handler;
@@ -49,7 +50,6 @@ use crate::http_server::endpoints::misc::detect_locale_handler::detect_locale_ha
 use crate::http_server::endpoints::misc::enable_alpha_easy_handler::enable_alpha_easy_handler;
 use crate::http_server::endpoints::misc::enable_alpha_handler::enable_alpha_handler;
 use crate::http_server::endpoints::misc::root_index::get_root_index;
-use crate::http_server::endpoints::mocap::enqueue_mocapnet::enqueue_mocapnet_handler;
 use crate::http_server::endpoints::prompts::get_prompt_handler::get_prompt_handler;
 use crate::http_server::endpoints::service::health_check_handler::get_health_check_handler;
 use crate::http_server::endpoints::service::public_info_handler::get_public_info_handler;

crates/service/web/storyteller_web/src/state/server_state.rs

@@ -23,7 +23,7 @@ use url_config::third_party_url_redirector::ThirdPartyUrlRedirector;
 use crate::configs::app_startup::username_set::UsernameSet;
 use crate::configs::static_api_tokens::StaticApiTokenSet;
 use crate::http_server::cookies::anonymous_visitor_tracking::avt_cookie_manager::AvtCookieManager;
-use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::list_fully_computed_assigned_tts_categories::ModelTokensByCategoryToken;
+use crate::http_server::deprecated_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::media_files::list::list_featured_media_files_handler::ListFeaturedMediaFilesQueryParams;
 use crate::http_server::endpoints::stats::result_transformer::CacheableQueueStats;