deprecate

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;
@@ -30,7 +30,7 @@ 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::workflows::enqueue_comfy_ui_handler::EnqueueComfyError;
+use crate::http_server::deprecated_endpoints::workflows::enqueue_comfy_ui_handler::EnqueueComfyError;
 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/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/engine/create_scene_handler.rs

@@ -2,8 +2,8 @@ use std::collections::HashSet;
 use std::sync::Arc;
 
 use actix_multipart::Multipart;
-use actix_web::{HttpRequest, HttpResponse, ResponseError, web};
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse, ResponseError};
 use log::{error, info, warn};
 use once_cell::sync::Lazy;
 use utoipa::ToSchema;
@@ -21,7 +21,7 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_
 use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType};
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::endpoints::engine::drain_multipart_request::drain_multipart_request;
+use crate::http_server::deprecated_endpoints::engine::drain_multipart_request::drain_multipart_request;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;
 use crate::state::server_state::ServerState;
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/update_scene_handler.rs

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
 use actix_multipart::Multipart;
-use actix_web::{HttpRequest, HttpResponse, web};
+use actix_web::{web, HttpRequest, HttpResponse};
 
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::endpoints::media_uploads::common::upload_error::UploadError;
+use crate::http_server::deprecated_endpoints::media_uploads::common::upload_error::UploadError;
 use crate::state::server_state::ServerState;
 
 #[derive(Serialize)]

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/image_gen/enqueue_image_generation.rs

@@ -37,7 +37,7 @@ use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::users::UserToken;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
-use crate::http_server::endpoints::image_gen::prompt_enrichment::enrich_prompt;
+use crate::http_server::deprecated_endpoints::image_gen::prompt_enrichment::enrich_prompt;
 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;
@@ -526,7 +526,7 @@ fn inference_mode_from_url_path(url_path: &str) -> Option<TypeOfInference> {
 
 #[cfg(test)]
 mod tests {
-  use crate::http_server::endpoints::image_gen::enqueue_image_generation::{inference_mode_from_url_path, TypeOfInference};
+  use crate::http_server::deprecated_endpoints::image_gen::enqueue_image_generation::{inference_mode_from_url_path, TypeOfInference};
 
   #[test]
     fn test_url_paths() {

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/image_gen/prompt_enrichment.rs

@@ -1,7 +1,7 @@
 use prompt_engineering::classify_prompt::classify_prompt;
 
-use crate::http_server::endpoints::image_gen::enqueue_image_generation::EnqueueImageGenRequest;
-use crate::http_server::endpoints::image_gen::replacement_prompts::get_replacement_prompt;
+use crate::http_server::deprecated_endpoints::image_gen::enqueue_image_generation::EnqueueImageGenRequest;
+use crate::http_server::deprecated_endpoints::image_gen::replacement_prompts::get_replacement_prompt;
 
 pub struct EnrichedPrompts {
   pub positive_prompt: String,
@@ -72,8 +72,8 @@ pub fn enrich_prompt(request: &EnqueueImageGenRequest) -> Option<EnrichedPrompts
 
 #[cfg(test)]
 mod tests {
-  use crate::http_server::endpoints::image_gen::enqueue_image_generation::EnqueueImageGenRequest;
-  use crate::http_server::endpoints::image_gen::prompt_enrichment::enrich_prompt;
+  use crate::http_server::deprecated_endpoints::image_gen::enqueue_image_generation::EnqueueImageGenRequest;
+  use crate::http_server::deprecated_endpoints::image_gen::prompt_enrichment::enrich_prompt;
 
   struct Prompt {
     pub positive: &'static str,

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/investor_demo/disable_demo_mode_handler.rs

@@ -1,16 +1,16 @@
 use std::sync::Arc;
 
 use actix_http::header;
-use actix_web::{HttpRequest, HttpResponse, Responder, web};
-use actix_web::cookie::Cookie;
 use actix_web::cookie::time::OffsetDateTime;
+use actix_web::cookie::Cookie;
 use actix_web::http::StatusCode;
 use actix_web::web::Query;
+use actix_web::{web, HttpRequest, HttpResponse, Responder};
 
 use actix_helpers::extractors::get_request_host::get_request_host;
 
-use crate::http_server::endpoints::investor_demo::default_redirect::{DEFAULT_INVESTOR_REDIRECT, redirect_is_allowed};
-use crate::http_server::endpoints::investor_demo::demo_cookie::STORYTELLER_DEMO_COOKIE_NAME;
+use crate::http_server::deprecated_endpoints::investor_demo::default_redirect::{redirect_is_allowed, DEFAULT_INVESTOR_REDIRECT};
+use crate::http_server::deprecated_endpoints::investor_demo::demo_cookie::STORYTELLER_DEMO_COOKIE_NAME;
 use crate::state::server_state::ServerState;
 
 #[derive(Deserialize)]

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/investor_demo/enable_demo_mode_handler.rs

@@ -1,15 +1,15 @@
 use std::sync::Arc;
 
 use actix_http::header;
-use actix_web::{HttpRequest, HttpResponse, Responder, web};
 use actix_web::cookie::Cookie;
 use actix_web::http::StatusCode;
 use actix_web::web::Query;
+use actix_web::{web, HttpRequest, HttpResponse, Responder};
 
 use actix_helpers::extractors::get_request_host::get_request_host;
 
-use crate::http_server::endpoints::investor_demo::default_redirect::{DEFAULT_INVESTOR_REDIRECT, redirect_is_allowed};
-use crate::http_server::endpoints::investor_demo::demo_cookie::STORYTELLER_DEMO_COOKIE_NAME;
+use crate::http_server::deprecated_endpoints::investor_demo::default_redirect::{redirect_is_allowed, DEFAULT_INVESTOR_REDIRECT};
+use crate::http_server::deprecated_endpoints::investor_demo::demo_cookie::STORYTELLER_DEMO_COOKIE_NAME;
 use crate::state::server_state::ServerState;
 
 #[derive(Deserialize)]

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/common/handle_upload.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 use std::sync::Arc;
 
 use actix_multipart::Multipart;
-use actix_web::{HttpRequest, web};
+use actix_web::{web, HttpRequest};
 use log::{error, info, warn};
 
 use bucket_paths::legacy::typified_paths::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePath;
@@ -14,13 +14,13 @@ use http_server_common::request::get_request_ip::get_request_ip;
 use media::decode_basic_audio_info::decode_basic_audio_bytes_info;
 use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes;
 use mysql_queries::queries::media_uploads::get_media_upload_by_uuid::get_media_upload_by_uuid_with_connection;
-use mysql_queries::queries::media_uploads::insert_media_upload::{Args, insert_media_upload};
+use mysql_queries::queries::media_uploads::insert_media_upload::{insert_media_upload, Args};
 use tokens::tokens::media_uploads::MediaUploadToken;
 
-use crate::http_server::endpoints::media_uploads::common::drain_multipart_request::{drain_multipart_request, MediaSource};
-use crate::http_server::endpoints::media_uploads::common::upload_error::UploadError;
-use crate::state::server_state::ServerState;
+use crate::http_server::deprecated_endpoints::media_uploads::common::drain_multipart_request::{drain_multipart_request, MediaSource};
+use crate::http_server::deprecated_endpoints::media_uploads::common::upload_error::UploadError;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;
+use crate::state::server_state::ServerState;
 
 pub enum SuccessCase {
   MediaAlreadyUploaded {

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/upload_audio.rs

@@ -2,13 +2,13 @@ use std::collections::HashSet;
 use std::sync::Arc;
 
 use actix_multipart::Multipart;
-use actix_web::{HttpRequest, HttpResponse, web};
+use actix_web::{web, HttpRequest, HttpResponse};
 use once_cell::sync::Lazy;
 
 use tokens::tokens::media_uploads::MediaUploadToken;
 
-use crate::http_server::endpoints::media_uploads::common::handle_upload::handle_upload;
-use crate::http_server::endpoints::media_uploads::common::upload_error::UploadError;
+use crate::http_server::deprecated_endpoints::media_uploads::common::handle_upload::handle_upload;
+use crate::http_server::deprecated_endpoints::media_uploads::common::upload_error::UploadError;
 use crate::state::server_state::ServerState;
 
 #[deprecated(note = "Use `media_files` instead of `media_uploads`.")]

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/upload_image.rs

@@ -2,13 +2,13 @@ use std::collections::HashSet;
 use std::sync::Arc;
 
 use actix_multipart::Multipart;
-use actix_web::{HttpRequest, HttpResponse, web};
+use actix_web::{web, HttpRequest, HttpResponse};
 use once_cell::sync::Lazy;
 
 use tokens::tokens::media_uploads::MediaUploadToken;
 
-use crate::http_server::endpoints::media_uploads::common::handle_upload::handle_upload;
-use crate::http_server::endpoints::media_uploads::common::upload_error::UploadError;
+use crate::http_server::deprecated_endpoints::media_uploads::common::handle_upload::handle_upload;
+use crate::http_server::deprecated_endpoints::media_uploads::common::upload_error::UploadError;
 use crate::state::server_state::ServerState;
 
 #[deprecated(note = "Use `media_files` instead of `media_uploads`.")]

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/upload_media.rs

@@ -2,13 +2,13 @@ use std::collections::HashSet;
 use std::sync::Arc;
 
 use actix_multipart::Multipart;
-use actix_web::{HttpRequest, HttpResponse, web};
+use actix_web::{web, HttpRequest, HttpResponse};
 use once_cell::sync::Lazy;
 
 use tokens::tokens::media_uploads::MediaUploadToken;
 
-use crate::http_server::endpoints::media_uploads::common::handle_upload::handle_upload;
-use crate::http_server::endpoints::media_uploads::common::upload_error::UploadError;
+use crate::http_server::deprecated_endpoints::media_uploads::common::handle_upload::handle_upload;
+use crate::http_server::deprecated_endpoints::media_uploads::common::upload_error::UploadError;
 use crate::state::server_state::ServerState;
 
 #[deprecated(note = "Use `media_files` instead of `media_uploads`.")]

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

@@ -0,0 +1,18 @@
+pub mod animation;
+pub mod api_tokens;
+pub mod categories;
+pub mod control_plane;
+pub mod conversion;
+pub mod engine;
+pub mod events;
+pub mod flags;
+pub mod image_gen;
+pub mod investor_demo;
+pub mod leaderboard;
+pub mod media_uploads;
+pub mod mocap;
+pub mod moderation;
+pub mod stubs;
+pub mod vocoders;
+pub mod w2l;
+pub mod workflows;

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

@@ -0,0 +1,5 @@
+pub mod approval;
+pub mod categories;
+pub mod stats;
+pub mod user_roles;
+pub mod users;