fix imports

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

@@ -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/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/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs

@@ -26,7 +26,7 @@ use tokens::tokens::media_files::MediaFileToken;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::configs::plans::plan_category::PlanCategory;
-use crate::http_server::endpoints::workflows::enqueue::vst_common::vst_error::VstError;
+use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vst_error::VstError;
 use crate::http_server::requests::get_request_domain_branding::{get_request_domain_branding, DomainBranding};
 use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header;
 use crate::http_server::requests::request_headers::has_debug_header::has_debug_header;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs

@@ -28,7 +28,7 @@ use tokens::tokens::media_files::MediaFileToken;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::configs::plans::plan_category::PlanCategory;
-use crate::http_server::endpoints::workflows::enqueue::vst_common::vst_error::VstError;
+use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vst_error::VstError;
 use crate::http_server::requests::get_request_domain_branding::{get_request_domain_branding, DomainBranding};
 use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header;
 use crate::http_server::requests::request_headers::has_debug_header::has_debug_header;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs

@@ -34,10 +34,10 @@ use tokens::tokens::media_files::MediaFileToken;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::configs::plans::plan_category::PlanCategory;
-use crate::http_server::endpoints::workflows::coordinate_workflow_args::{coordinate_workflow_args, CoordinatedWorkflowArgs};
-use crate::http_server::endpoints::workflows::enqueue::vst_common::vst_error::VstError;
-use crate::http_server::endpoints::workflows::enqueue::vst_common::vst_request::VstRequest;
-use crate::http_server::endpoints::workflows::enqueue::vst_common::vst_response::VstSuccessResponse;
+use crate::http_server::deprecated_endpoints::workflows::coordinate_workflow_args::{coordinate_workflow_args, CoordinatedWorkflowArgs};
+use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vst_error::VstError;
+use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vst_request::VstRequest;
+use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vst_response::VstSuccessResponse;
 use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header;
 use crate::http_server::requests::request_headers::has_debug_header::has_debug_header;
 use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs

@@ -34,10 +34,10 @@ use tokens::tokens::media_files::MediaFileToken;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::configs::plans::plan_category::PlanCategory;
-use crate::http_server::endpoints::workflows::coordinate_workflow_args::{coordinate_workflow_args, CoordinatedWorkflowArgs};
-use crate::http_server::endpoints::workflows::enqueue::vst_common::vst_error::VstError;
-use crate::http_server::endpoints::workflows::enqueue::vst_common::vst_request::VstRequest;
-use crate::http_server::endpoints::workflows::enqueue::vst_common::vst_response::VstSuccessResponse;
+use crate::http_server::deprecated_endpoints::workflows::coordinate_workflow_args::{coordinate_workflow_args, CoordinatedWorkflowArgs};
+use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vst_error::VstError;
+use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vst_request::VstRequest;
+use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vst_response::VstSuccessResponse;
 use crate::http_server::requests::get_request_domain_branding::{get_request_domain_branding, DomainBranding};
 use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header;
 use crate::http_server::requests::request_headers::has_debug_header::has_debug_header;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status_ws.rs

@@ -3,12 +3,12 @@ use std::sync::Arc;
 use std::time::Instant;
 
 use actix::*;
-use actix_web::{
-  App, Error, HttpRequest, HttpResponse, HttpServer, middleware::Logger, Responder, web,
-};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::{Json, Path};
+use actix_web::{
+  middleware::Logger, web, App, Error, HttpRequest, HttpResponse, HttpServer, Responder,
+};
 use actix_web_actors::ws;
 use chrono::{DateTime, Utc};
 use log::error;
@@ -30,9 +30,9 @@ use redis_schema::keys::inference_job::style_transfer_progress_key::StyleTransfe
 use redis_schema::payloads::inference_job::style_transfer_progress_state::{InferenceProgressDetailsResponse, InferenceStageDetails};
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 
+use crate::http_server::deprecated_endpoints::workflows::enqueue::{progress_tracker_server, progress_tracker_session};
 use crate::http_server::endpoints::inference_job::utils::estimates::estimate_job_progress::estimate_job_progress;
 use crate::http_server::endpoints::inference_job::utils::extractors::extract_polymorphic_inference_args::extract_polymorphic_inference_args;
-use crate::http_server::endpoints::workflows::enqueue::{progress_tracker_server, progress_tracker_session};
 use crate::http_server::web_utils::filter_model_name::maybe_filter_model_name;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/progress_tracker_session.rs

@@ -3,8 +3,8 @@ use std::time::{Duration, Instant};
 use actix::prelude::*;
 use actix_web_actors::ws;
 
-use crate::http_server::endpoints::workflows::enqueue::progress_tracker_server;
-use crate::http_server::endpoints::workflows::enqueue::progress_tracker_server::ChatServer;
+use crate::http_server::deprecated_endpoints::workflows::enqueue::progress_tracker_server;
+use crate::http_server::deprecated_endpoints::workflows::enqueue::progress_tracker_server::ChatServer;
 
 /// How often heartbeat pings are sent
 const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_video_style_transfer_handler.rs

@@ -31,7 +31,7 @@ use tokens::tokens::media_files::MediaFileToken;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::configs::plans::plan_category::PlanCategory;
-use crate::http_server::endpoints::workflows::coordinate_workflow_args::{coordinate_workflow_args, CoordinatedWorkflowArgs};
+use crate::http_server::deprecated_endpoints::workflows::coordinate_workflow_args::{coordinate_workflow_args, CoordinatedWorkflowArgs};
 use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header;
 use crate::http_server::requests::request_headers::has_debug_header::has_debug_header;
 use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;

crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_f5_tts_handler/enqueue_infer_f5_tts_handler.rs

@@ -11,8 +11,8 @@ use actix_web::http::StatusCode;
 use actix_web::web::Json;
 use actix_web::{web, HttpRequest, HttpResponse};
 use log::{info, warn};
-use rand::Rng;
 use rand::seq::IndexedRandom;
+use rand::Rng;
 use utoipa::ToSchema;
 
 use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
@@ -36,7 +36,7 @@ use user_input_common::check_for_slurs::contains_slurs;
 use crate::configs::app_startup::username_set::UsernameSet;
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::configs::plans::plan::Plan;
-use crate::http_server::endpoints::investor_demo::demo_cookie::request_has_demo_cookie;
+use crate::http_server::deprecated_endpoints::investor_demo::demo_cookie::request_has_demo_cookie;
 use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;

crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs

@@ -6,14 +6,14 @@
 use std::fmt;
 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::{info, warn};
 use r2d2_redis::redis::Commands;
-use rand::Rng;
 use rand::seq::IndexedRandom;
+use rand::Rng;
 use utoipa::ToSchema;
 
 use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
@@ -36,7 +36,7 @@ use user_input_common::check_for_slurs::contains_slurs;
 use crate::configs::app_startup::username_set::UsernameSet;
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::configs::plans::plan::Plan;
-use crate::http_server::endpoints::investor_demo::demo_cookie::request_has_demo_cookie;
+use crate::http_server::deprecated_endpoints::investor_demo::demo_cookie::request_has_demo_cookie;
 use crate::http_server::endpoints::tts::enqueue_infer_tts_handler::get_tts_model_with_caching::get_tts_model_with_caching;
 use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;

crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_seed_vc_inference_handler.rs

@@ -31,7 +31,7 @@ use tts_common::priority::{FAKEYOU_DEFAULT_VALID_API_TOKEN_PRIORITY_LEVEL, FAKEY
 
 use crate::configs::app_startup::username_set::UsernameSet;
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
-use crate::http_server::endpoints::investor_demo::demo_cookie::request_has_demo_cookie;
+use crate::http_server::deprecated_endpoints::investor_demo::demo_cookie::request_has_demo_cookie;
 use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;

crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_voice_conversion_inference_handler.rs

@@ -6,14 +6,14 @@
 use std::fmt;
 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::{error, info, warn};
 use r2d2_redis::redis::Commands;
-use sqlx::MySql;
 use sqlx::pool::PoolConnection;
+use sqlx::MySql;
 use utoipa::ToSchema;
 
 use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
@@ -35,7 +35,7 @@ use tokens::tokens::users::UserToken;
 use tts_common::priority::FAKEYOU_INVESTOR_PRIORITY_LEVEL;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
-use crate::http_server::endpoints::investor_demo::demo_cookie::request_has_demo_cookie;
+use crate::http_server::deprecated_endpoints::investor_demo::demo_cookie::request_has_demo_cookie;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::memory_cache::model_token_to_info_cache::{ModelInfoForInferenceJob, ModelTokenToInfoCache};
 use crate::state::server_state::ServerState;

crates/service/web/storyteller_web/src/main.rs

@@ -77,7 +77,6 @@ use crate::configs::app_startup::redis_rate_limiters::configure_redis_rate_limit
 use crate::configs::connect_to_database::connect_to_database;
 use crate::configs::static_api_tokens::StaticApiTokenSet;
 use crate::http_server::cookies::anonymous_visitor_tracking::avt_cookie_manager::AvtCookieManager;
-use crate::http_server::endpoints::workflows::enqueue::progress_tracker_server;
 use crate::http_server::middleware::pushback_filter_middleware::PushbackFilter;
 use crate::http_server::routes::add_routes::add_routes;
 use crate::http_server::session::http::http_user_session_manager::HttpUserSessionManager;