From 75890d48eada57fe4da494d17c3a55bab347fc4c Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 29 Jun 2025 23:17:43 -0400 Subject: [PATCH] remove unused imports --- .../api_clients/storyteller_client/Cargo.toml | 3 ++ crates/service/web/storyteller_web/Cargo.toml | 3 ++ .../web/storyteller_web/src/api_doc_cli.rs | 2 -- .../web/storyteller_web/src/api_doc_server.rs | 3 -- .../plans/get_correct_plan_for_session.rs | 1 - .../media_file_token_path_info.rs | 2 +- .../common_responses/common_web_error.rs | 1 - .../common_responses/media/media_links.rs | 4 +-- .../default_avatar_color_from_username.rs | 4 +-- .../default_avatar_from_username.rs | 4 +-- .../avt_cookie_manager.rs | 2 +- .../animation/enqueue_rerender_animation.rs | 4 +-- .../api_tokens/create_api_token.rs | 4 +-- .../api_tokens/delete_api_token.rs | 4 +-- .../api_tokens/edit_api_token.rs | 4 +-- .../api_tokens/list_api_tokens.rs | 4 +-- .../categories/create_category.rs | 2 +- .../categories/get_category.rs | 4 +-- .../categories/tts/assign_tts_category.rs | 4 +-- .../error.rs | 2 +- ..._fully_computed_assigned_tts_categories.rs | 2 +- .../categories/tts/list_tts_categories.rs | 2 +- .../tts/list_tts_model_assigned_categories.rs | 2 +- .../control_plane/set_sora_secret_handler.rs | 12 ++----- .../conversion/enqueue_fbx_to_gltf_handler.rs | 1 - .../engine/create_scene_handler.rs | 2 -- .../engine/drain_multipart_request.rs | 1 - .../engine/get_scene_handler.rs | 8 +---- .../engine/process_upload_media_file.rs | 4 +-- .../events/list_events.rs | 4 +-- .../image_gen/enqueue_image_generation.rs | 7 ++-- .../leaderboard/get_leaderboard.rs | 8 ++--- .../common/drain_multipart_request.rs | 1 - .../list_user_media_uploads_of_type.rs | 6 ++-- .../mocap/enqueue_mocapnet.rs | 6 ++-- .../approval/pending_w2l_templates.rs | 4 +-- .../moderation/categories/delete_category.rs | 4 +-- .../moderation/categories/edit_category.rs | 4 +-- .../list_tts_categories_for_moderation.rs | 4 +-- .../stats/get_on_prem_worker_stats.rs | 2 +- .../moderation/stats/get_voice_count_stats.rs | 4 +-- .../moderation/user_roles/list_roles.rs | 4 +-- .../moderation/user_roles/list_staff.rs | 4 +-- .../moderation/user_roles/set_user_role.rs | 4 +-- .../moderation/users/list_users.rs | 4 +-- .../stubs/app_model_downloads.rs | 2 +- .../deprecated_endpoints/stubs/app_news.rs | 2 +- .../deprecated_endpoints/stubs/app_plans.rs | 4 +-- .../stubs/post_app_analytics.rs | 4 +-- .../vocoders/get_vocoder.rs | 2 +- .../vocoders/list_vocoders.rs | 2 +- .../w2l/delete_w2l_result.rs | 4 +-- .../w2l/delete_w2l_template.rs | 4 +-- .../w2l/edit_w2l_result.rs | 4 +-- .../w2l/edit_w2l_template.rs | 6 ++-- .../w2l/enqueue_infer_w2l.rs | 2 +- .../w2l/enqueue_infer_w2l_with_uploads.rs | 2 +- .../w2l/enqueue_upload_w2l_template.rs | 4 +-- .../w2l/get_w2l_inference_job_status.rs | 4 +-- .../w2l/get_w2l_result.rs | 4 +-- .../w2l/get_w2l_template.rs | 4 +-- .../w2l/get_w2l_template_use_count.rs | 4 +-- .../w2l/get_w2l_upload_template_job_status.rs | 4 +-- .../w2l/list_user_w2l_inference_results.rs | 4 +-- .../w2l/list_user_w2l_templates.rs | 4 +-- .../w2l/list_w2l_templates.rs | 4 +-- .../w2l/set_w2l_template_mod_approval.rs | 4 +-- .../enqueue_face_fusion_workflow_handler.rs | 5 --- .../enqueue_live_portrait_workflow_handler.rs | 6 ---- .../enqueue_studio_workflow_handler.rs | 7 +--- ...e_video_style_transfer_workflow_handler.rs | 7 +--- .../enqueue/get_inference_preview_status.rs | 10 ++---- .../get_inference_preview_status_ws.rs | 10 ++---- .../enqueue/progress_tracker_server.rs | 4 +-- .../enqueue_workflow_upload_request.rs | 12 +++---- .../analytics/log_browser_session_handler.rs | 10 ------ .../app_state/get_app_state_handler.rs | 18 +--------- .../beta_keys/create_beta_keys_handler.rs | 5 --- .../edit_beta_key_distributed_flag_handler.rs | 18 ---------- .../beta_keys/edit_beta_key_note_handler.rs | 8 ----- .../beta_keys/list_beta_keys_handler.rs | 13 +------ .../beta_keys/redeem_beta_key_handler.rs | 25 ++------------ .../comments/delete_comment_handler.rs | 2 +- .../comments/list_comments_handler.rs | 8 ++--- .../download_job/enqueue_generic_download.rs | 8 ++--- .../get_generic_upload_job_status.rs | 4 +-- .../create_featured_item_handler.rs | 15 +------- .../delete_featured_item_handler.rs | 12 ++----- .../get_is_featured_item_handler.rs | 24 ++----------- ...nerate_flux_1_dev_text_to_image_handler.rs | 18 +--------- ...te_flux_1_schnell_text_to_image_handler.rs | 18 +--------- ...erate_flux_pro_11_text_to_image_handler.rs | 18 +--------- ...flux_pro_11_ultra_text_to_image_handler.rs | 18 +--------- .../image/remove_image_background_handler.rs | 16 ++------- ...enerate_hunyuan_2_0_image_to_3d_handler.rs | 16 ++------- ...enerate_hunyuan_2_1_image_to_3d_handler.rs | 16 ++------- .../generate_kling_1_6_pro_video_handler.rs | 16 ++------- ...generate_kling_2_1_master_video_handler.rs | 16 ++------- .../generate_kling_2_1_pro_video_handler.rs | 16 ++------- ...eedance_1_0_lite_image_to_video_handler.rs | 16 ++------- .../generate_veo_2_image_to_video_handler.rs | 16 ++------- .../get_sora_credentials_from_request.rs | 6 ++-- ...enqueue_studio_image_generation_handler.rs | 6 +--- .../update_gpt_image_job_status_handler.rs | 19 +++-------- .../upload_snapshot_media_file_handler.rs | 10 ++---- .../admin/kill_inference_jobs_handler.rs | 2 +- .../dismiss_finished_session_jobs_handler.rs | 8 ++--- .../delete/terminate_inference_job_handler.rs | 4 +-- .../batch_get_inference_job_status_handler.rs | 8 ++--- .../get/get_inference_job_status_handler.rs | 2 +- .../list/list_session_jobs_handler.rs | 9 +++-- ...get_pending_inference_job_count_handler.rs | 2 +- .../common_responses/live_portrait.rs | 2 +- .../delete/delete_media_file_handler.rs | 2 +- ...hange_media_file_animation_type_handler.rs | 6 ++-- ...ange_media_file_engine_category_handler.rs | 6 ++-- .../change_media_file_visibility_handler.rs | 5 ++- .../edit/rename_media_file_handler.rs | 10 +++--- .../set_media_file_cover_image_handler.rs | 5 +-- .../edit/update_media_file_handler.rs | 4 +-- .../get/batch_get_media_files_handler.rs | 11 ++---- .../media_files/get/get_media_file_handler.rs | 6 ++-- .../media_files/helpers/get_media_domain.rs | 2 +- .../list/list_featured_media_files_handler.rs | 9 ++--- ...list_media_files_by_batch_token_handler.rs | 7 ++-- .../list/list_media_files_for_user_handler.rs | 7 ++-- .../list/list_media_files_handler.rs | 7 ++-- .../list/list_pinned_media_files_handler.rs | 6 ++-- .../search_featured_media_files_handler.rs | 10 ++---- .../search_session_media_files_handler.rs | 13 ++----- .../upload/upload_audio_media_file_handler.rs | 12 ++----- .../drain_multipart_request.rs | 2 -- .../upload_engine_asset_media_file_handler.rs | 10 ++---- .../upload_generic/drain_multipart_request.rs | 1 - .../process_upload_media_file.rs | 4 +-- .../upload_media_file_handler.rs | 2 +- .../upload/upload_image_media_file_handler.rs | 13 ++----- ...oad_new_engine_asset_media_file_handler.rs | 16 +++------ .../upload_new_scene_media_file_handler.rs | 15 ++------ .../extract_and_upload_pmx_files.rs | 6 ++-- .../upload_pmx_media_file_handler.rs | 19 +++-------- .../upload_saved_scene_media_file_handler.rs | 21 +++--------- ...pload_scene_snapshot_media_file_handler.rs | 15 ++------ .../extract_frames_from_zip.rs | 6 ++-- .../upload_studio_shot_media_file_handler.rs | 23 ++----------- .../ffmpeg_trim_and_resample.rs | 4 +-- .../upload_new_video_media_file_handler.rs | 22 ++---------- .../drain_multipart_request.rs | 1 - .../upload_video_media_file_handler.rs | 3 +- .../drain_multipart_request.rs | 5 +-- .../write_engine_asset_media_file_handler.rs | 13 ++----- .../drain_multipart_request.rs | 6 ---- .../write_scene_file_media_file_handler.rs | 14 ++------ .../misc/enable_alpha_easy_handler.rs | 2 +- .../endpoints/misc/enable_alpha_handler.rs | 2 +- .../http_server/endpoints/misc/root_index.rs | 2 +- ...nqueue_gptsovits_model_download_handler.rs | 5 +-- .../info/moderator_token_info_handler.rs | 9 ++--- .../moderation/ip_bans/add_ip_ban.rs | 4 +-- .../moderation/ip_bans/delete_ip_ban.rs | 6 ++-- .../moderation/ip_bans/get_ip_ban.rs | 4 +-- .../moderation/ip_bans/list_ip_bans.rs | 4 +-- .../jobs/get_tts_inference_queue_count.rs | 4 +-- .../jobs/get_w2l_inference_queue_count.rs | 4 +-- .../jobs/kill_tts_inference_jobs.rs | 6 ++-- .../moderation/user_bans/ban_user.rs | 4 +-- .../moderation/user_bans/list_banned_users.rs | 4 +-- .../edit_user_feature_flags_handler.rs | 11 ++---- .../endpoints/prompts/get_prompt_handler.rs | 14 +------- .../endpoints/service/health_check_handler.rs | 4 +-- .../stats/get_unified_queue_stats_handler.rs | 6 ++-- .../enqueue_studio_gen2_handler.rs | 11 ------ .../subscriptions/unsubscribe_reason.rs | 2 +- .../tags/list_tags_for_entity_handler.rs | 23 ------------- .../tags/set_tags_for_entity_handler.rs | 18 ++-------- .../trending/list_trending_tts_models.rs | 2 +- .../endpoints/tts/delete_tts_model.rs | 4 +-- .../endpoints/tts/delete_tts_result.rs | 4 +-- .../endpoints/tts/edit_tts_model.rs | 12 +++---- .../endpoints/tts/edit_tts_result.rs | 4 +-- .../get_tts_model_with_caching.rs | 2 +- .../endpoints/tts/enqueue_upload_tts_model.rs | 4 +-- .../get_pending_tts_inference_job_count.rs | 2 +- .../tts/get_tts_inference_job_status.rs | 4 +-- .../endpoints/tts/get_tts_model.rs | 6 ++-- .../endpoints/tts/get_tts_model_use_count.rs | 4 +-- .../endpoints/tts/get_tts_result.rs | 4 +-- .../tts/get_tts_upload_model_job_status.rs | 4 +-- .../endpoints/tts/list_tts_models.rs | 4 +-- .../tts/list_user_tts_inference_results.rs | 5 ++- .../endpoints/tts/list_user_tts_models.rs | 4 +-- .../tts/search_tts_models_handler.rs | 2 +- .../batch_get_user_bookmarks_handler.rs | 2 +- .../create_user_bookmark_handler.rs | 8 ++--- .../delete_user_bookmark_handler.rs | 6 ++-- .../list_user_bookmarks_for_entity_handler.rs | 4 +-- ...list_user_bookmarks_for_session_handler.rs | 3 +- .../batch_get_user_rating_handler.rs | 2 +- .../user_ratings/get_user_rating_handler.rs | 4 +-- .../user_ratings/set_user_rating_handler.rs | 6 ++-- .../endpoints/users/create_account_handler.rs | 14 ++++---- .../endpoints/users/get_profile_handler.rs | 4 +-- .../users/google_sso/google_sso_handler.rs | 34 +++---------------- .../google_sso/handle_existing_sso_account.rs | 1 - .../google_sso/handle_new_sso_account.rs | 18 +++------- .../handle_new_sso_account_for_new_user.rs | 1 - .../endpoints/users/logout_handler.rs | 2 +- .../users/password_reset_redeem_handler.rs | 3 +- .../users/password_reset_request_handler.rs | 2 +- .../endpoints/users/session_info_handler.rs | 2 +- .../users/session_token_info_handler.rs | 9 +---- .../check_if_voice_clone_request_submitted.rs | 4 +-- .../create_voice_clone_request.rs | 4 +-- .../list_voice_conversion_models_handler.rs | 6 ++-- .../inference/enqueue_tts_request.rs | 12 +++---- .../voice_dataset_samples/delete_sample.rs | 2 +- .../list_samples_by_dataset.rs | 2 +- .../voice_dataset_samples/upload_zs_sample.rs | 3 -- .../voice_datasets/create_dataset.rs | 5 ++- .../voice_datasets/delete_dataset.rs | 6 ++-- .../voice_datasets/get_dataset.rs | 6 ++-- .../list_datasets_by_session.rs | 4 +-- .../voice_datasets/list_datasets_by_user.rs | 4 +-- .../voice_datasets/update_dataset.rs | 5 ++- .../voice_designer/voices/create_voice.rs | 11 +++--- .../voice_designer/voices/delete_voice.rs | 6 ++-- .../voice_designer/voices/get_voice.rs | 5 ++- .../voices/list_available_voices.rs | 4 +-- .../voices/list_voices_by_session.rs | 4 +-- .../voices/list_voices_by_user.rs | 4 +-- .../voice_designer/voices/update_voice.rs | 2 +- .../endpoints/webhooks/fal_webhook_handler.rs | 1 - .../webhooks/handle_image_payload.rs | 7 +--- .../webhooks/handle_images_payload.rs | 7 +--- .../webhooks/handle_model_mesh_payload.rs | 10 ++---- .../webhooks/handle_video_payload.rs | 9 +---- .../weights/delete/delete_weight_handler.rs | 2 +- .../weights/get/get_weight_handler.rs | 1 - .../list/list_available_weights_handler.rs | 6 ++-- .../list/list_featured_weights_handler.rs | 10 ++---- .../list/list_pinned_weights_handler.rs | 2 +- .../list/list_weights_by_user_handler.rs | 2 +- .../set_model_weight_cover_image_handler.rs | 3 +- .../weights/update/update_weight_handler.rs | 10 +++--- .../middleware/pushback_filter_middleware.rs | 6 ++-- .../requests/get_request_signup_source.rs | 1 - .../routes/add_studio_gen2_routes.rs | 4 +-- .../src/http_server/routes/beta_key_routes.rs | 2 +- .../src/http_server/routes/job_routes.rs | 2 +- .../routes/model_download_routes.rs | 2 +- .../session/http/http_user_session_manager.rs | 2 +- .../http_server/session/session_checker.rs | 2 +- .../web_utils/read_multipart_field_bytes.rs | 2 +- .../user_session/require_moderator.rs | 4 +-- .../user_session/require_user_session.rs | 1 - .../require_user_session_using_connection.rs | 6 +--- .../service/web/storyteller_web/src/main.rs | 8 +---- .../src/state/certs/google_sign_in_cert.rs | 4 +-- .../src/threads/poll_ip_banlist_thread.rs | 1 - .../src/util/encrypted_sort_id.rs | 3 +- 260 files changed, 472 insertions(+), 1193 deletions(-) diff --git a/crates/lib/api_clients/storyteller_client/Cargo.toml b/crates/lib/api_clients/storyteller_client/Cargo.toml index 658e593b13..91ce1559f2 100644 --- a/crates/lib/api_clients/storyteller_client/Cargo.toml +++ b/crates/lib/api_clients/storyteller_client/Cargo.toml @@ -8,6 +8,9 @@ authors = [ ] publish = false +# [lints.rust] +# unused_imports = "forbid" + [lib] name = "storyteller_client" path = "src/lib.rs" diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index aa01448628..d37096c13d 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -8,6 +8,9 @@ authors = [ ] publish = false +#[lints.rust] +#unused_imports = "forbid" + # Main server monolith [[bin]] name = "storyteller-web" 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 059fb990b3..fc62536c7c 100644 --- a/crates/service/web/storyteller_web/src/api_doc_cli.rs +++ b/crates/service/web/storyteller_web/src/api_doc_cli.rs @@ -17,11 +17,9 @@ #[macro_use] extern crate magic_crypt; #[macro_use] extern crate serde_derive; -use std::error::Error; use std::fs::File; use std::io::Write; -use r2d2_redis::redis::Commands; use utoipa::OpenApi; use docs::api_doc::ApiDoc; 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 4bb6ef72b3..1924c42725 100644 --- a/crates/service/web/storyteller_web/src/api_doc_server.rs +++ b/crates/service/web/storyteller_web/src/api_doc_server.rs @@ -20,8 +20,6 @@ use std::error::Error; use actix_web::{App, HttpServer}; -use r2d2_redis::redis::Commands; -use sqlx::MySqlPool; use utoipa::OpenApi; use utoipa_swagger_ui::SwaggerUi; @@ -29,7 +27,6 @@ use docs::api_doc::ApiDoc; use errors::AnyhowResult; use crate::configs::static_api_tokens::StaticApiTokenSet; -use crate::state::server_state::ServerState; pub mod billing; pub mod configs; diff --git a/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs b/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs index 3eccb27538..e5a7183778 100644 --- a/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs +++ b/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs @@ -1,4 +1,3 @@ -use std::ops::Deref; use chrono::Utc; diff --git a/crates/service/web/storyteller_web/src/http_server/common_requests/media_file_token_path_info.rs b/crates/service/web/storyteller_web/src/http_server/common_requests/media_file_token_path_info.rs index 470e3f94f4..bad541e560 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_requests/media_file_token_path_info.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_requests/media_file_token_path_info.rs @@ -1,5 +1,5 @@ -use utoipa::ToSchema; use tokens::tokens::media_files::MediaFileToken; +use utoipa::ToSchema; /// Media File Token in URL PathInfo #[derive(Deserialize, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/common_web_error.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/common_web_error.rs index 37c18c85f7..628052cf10 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/common_web_error.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/common_web_error.rs @@ -2,7 +2,6 @@ use actix_http::StatusCode; use actix_web::{HttpResponse, HttpResponseBuilder, ResponseError}; use std::error::Error; use std::fmt::{Display, Formatter}; -use utoipa::ToSchema; #[derive(Debug)] pub enum CommonWebError { diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/media/media_links.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/media/media_links.rs index 70d06e1293..5d35b28228 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/media/media_links.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/media/media_links.rs @@ -1,10 +1,10 @@ use url::Url; use utoipa::ToSchema; +use crate::http_server::common_responses::media::cdn_link::{get_cdn_host, new_cdn_url}; use crate::http_server::common_responses::media::media_domain::MediaDomain; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use server_environment::ServerEnvironment; -use crate::http_server::common_responses::media::cdn_link::{get_cdn_host, new_cdn_url}; // TODO(bt,2024-09-05): Worth reducing the quality at all? const QUALITY : u8 = 95; @@ -153,8 +153,8 @@ mod tests { use crate::http_server::common_responses::media::media_links::MediaLinks; mod fakeyou { - use server_environment::ServerEnvironment; use super::*; + use server_environment::ServerEnvironment; const DOMAIN : MediaDomain = MediaDomain::FakeYou; diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/user_avatars/default_avatar_color_from_username.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/user_avatars/default_avatar_color_from_username.rs index e6df64afbf..a8bcb8b028 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/user_avatars/default_avatar_color_from_username.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/user_avatars/default_avatar_color_from_username.rs @@ -29,9 +29,9 @@ pub fn default_avatar_color_from_username(username: &str) -> u8 { #[cfg(test)] mod tests { - use std::collections::HashSet; - use rand::distr::{Alphanumeric, SampleString}; use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; + use rand::distr::{Alphanumeric, SampleString}; + use std::collections::HashSet; #[test] fn test_stability() { diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/user_avatars/default_avatar_from_username.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/user_avatars/default_avatar_from_username.rs index fc75e1b710..01b5cf02ea 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/user_avatars/default_avatar_from_username.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/user_avatars/default_avatar_from_username.rs @@ -28,9 +28,9 @@ pub fn default_avatar_from_username(username: &str) -> u8 { #[cfg(test)] mod tests { - use std::collections::HashSet; - use rand::distr::{Alphanumeric, SampleString}; use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; + use rand::distr::{Alphanumeric, SampleString}; + use std::collections::HashSet; #[test] fn test_stability() { diff --git a/crates/service/web/storyteller_web/src/http_server/cookies/anonymous_visitor_tracking/avt_cookie_manager.rs b/crates/service/web/storyteller_web/src/http_server/cookies/anonymous_visitor_tracking/avt_cookie_manager.rs index 6e3cc3e035..c5a009796e 100644 --- a/crates/service/web/storyteller_web/src/http_server/cookies/anonymous_visitor_tracking/avt_cookie_manager.rs +++ b/crates/service/web/storyteller_web/src/http_server/cookies/anonymous_visitor_tracking/avt_cookie_manager.rs @@ -1,5 +1,5 @@ -use actix_web::cookie::{Cookie, SameSite}; use actix_web::cookie::time::OffsetDateTime; +use actix_web::cookie::{Cookie, SameSite}; use actix_web::HttpRequest; use anyhow::anyhow; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs index beb0bb8e00..41629cb0e3 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs @@ -5,11 +5,12 @@ 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::{info, warn}; +use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; @@ -23,7 +24,6 @@ use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/create_api_token.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/create_api_token.rs index 4bc14f89f1..ffacc0923e 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/create_api_token.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/create_api_token.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/delete_api_token.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/delete_api_token.rs index e368666f38..530e71d795 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/delete_api_token.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/delete_api_token.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::{error, warn}; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/edit_api_token.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/edit_api_token.rs index 962af5d9de..4545ad0661 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/edit_api_token.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/edit_api_token.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::{error, warn}; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/list_api_tokens.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/list_api_tokens.rs index 72ea679cd8..53a20533c6 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/list_api_tokens.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/list_api_tokens.rs @@ -1,11 +1,11 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{log, warn}; +use log::warn; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/create_category.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/create_category.rs index 6718c21e77..dbe87a9b7d 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/create_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/create_category.rs @@ -1,9 +1,9 @@ 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, HttpRequest, HttpResponse}; use log::warn; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/get_category.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/get_category.rs index 7167ca1317..804415fd1a 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/get_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/get_category.rs @@ -1,12 +1,12 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{log, warn}; +use log::warn; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::model_categories::get_category_by_token::get_category_by_token; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/assign_tts_category.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/assign_tts_category.rs index e22d864fbb..58ff53ecb6 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/assign_tts_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/assign_tts_category.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::{error, warn}; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/error.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/error.rs index 7a01d6df25..7d014b4f49 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/error.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/error.rs @@ -3,8 +3,8 @@ #![forbid(unused_mut)] #![forbid(unused_variables)] -use actix_web::{HttpResponse, ResponseError}; use actix_web::http::StatusCode; +use actix_web::{HttpResponse, ResponseError}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/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 b/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 index 99c4157d0c..1f2c8a9ba9 100644 --- a/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 +++ b/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 @@ -10,7 +10,7 @@ use std::collections::BTreeMap; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info}; use tokens::tokens::model_categories::ModelCategoryToken; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_categories.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_categories.rs index 36d83011cd..a802ca6e6e 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_categories.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_categories.rs @@ -6,9 +6,9 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_model_assigned_categories.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_model_assigned_categories.rs index 56170861ba..b3cd55143d 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_model_assigned_categories.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_model_assigned_categories.rs @@ -6,10 +6,10 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/control_plane/set_sora_secret_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/control_plane/set_sora_secret_handler.rs index 80960f5497..9d58388637 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/control_plane/set_sora_secret_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/control_plane/set_sora_secret_handler.rs @@ -1,24 +1,18 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web, Either}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use actix_web::web::{Form, Json, Path}; -use anyhow::anyhow; -use log::{error, log, warn}; +use actix_web::web::{Form, Json}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::error; use r2d2_redis::redis::Commands; use utoipa::ToSchema; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use mysql_queries::queries::media_files::edit::update_media_file_animation_type::update_media_file_animation_type; -use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use shared_service_components::sora_redis_credentials::get_sora_credentials_from_redis::get_sora_credentials_from_redis; use shared_service_components::sora_redis_credentials::keys::RedisSoraCredentialSubkey; use shared_service_components::sora_redis_credentials::set_sora_credential_field_in_redis::set_sora_credential_field_in_redis; -use tokens::tokens::media_files::MediaFileToken; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_fbx_to_gltf_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_fbx_to_gltf_handler.rs index c7748f08a2..644713d70b 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_fbx_to_gltf_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_fbx_to_gltf_handler.rs @@ -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::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; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/create_scene_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/create_scene_handler.rs index 2b4bc9e530..ad09abaf27 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/create_scene_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/create_scene_handler.rs @@ -1,11 +1,9 @@ -use std::collections::HashSet; use std::sync::Arc; use actix_multipart::Multipart; 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; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/drain_multipart_request.rs index afaf08ac79..369d634d2e 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/drain_multipart_request.rs @@ -4,7 +4,6 @@ use futures::TryStreamExt; use log::warn; use errors::AnyhowResult; -use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; use crate::http_server::web_utils::read_multipart_field_bytes::{checked_read_multipart_bytes, read_multipart_field_as_text}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/get_scene_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/get_scene_handler.rs index 156cbc391a..dbb3499311 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/get_scene_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/get_scene_handler.rs @@ -1,25 +1,19 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::visibility::Visibility; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; -use mysql_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; use tokens::tokens::media_files::MediaFileToken; -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::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/process_upload_media_file.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/process_upload_media_file.rs index 6128857d5b..8ec71c65cd 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/process_upload_media_file.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/process_upload_media_file.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_files::bucket_file_path::MediaFileBucketPath; @@ -19,8 +19,8 @@ use tokens::tokens::media_files::MediaFileToken; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::endpoints::media_files::upload::upload_generic::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource}; -use crate::state::server_state::ServerState; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; +use crate::state::server_state::ServerState; // TODO(bt,2023-12-20): THIS CODE NEEDS CLEANUP. This has been cargo culted three+ times. // It's ridiculous and complicated. diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/events/list_events.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/events/list_events.rs index 3245ae4f01..01a31b7acf 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/events/list_events.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/events/list_events.rs @@ -1,15 +1,15 @@ use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use derive_more::Display; use log::error; -use mysql_queries::queries::public_event_feed::list_public_event_feed_items::list_public_event_feed_items; use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; +use mysql_queries::queries::public_event_feed::list_public_event_feed_items::list_public_event_feed_items; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/image_gen/enqueue_image_generation.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/image_gen/enqueue_image_generation.rs index be5ae7d9df..4865c89f4a 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/image_gen/enqueue_image_generation.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/image_gen/enqueue_image_generation.rs @@ -1,13 +1,13 @@ #![forbid(unused_mut)] -use std::fmt::{Display, Formatter}; use std::fmt::Debug; +use std::fmt::{Display, Formatter}; 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; use log::warn; use serde::Deserialize; @@ -38,10 +38,9 @@ use tokens::tokens::users::UserToken; use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session; use crate::http_server::deprecated_endpoints::image_gen::prompt_enrichment::enrich_prompt; +use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; 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; -use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; /// This is the number of images (batch size) to generate for each request. /// We should allow all users to have multiple images generated at once as this diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/leaderboard/get_leaderboard.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/leaderboard/get_leaderboard.rs index 1932999059..3398dc17e3 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/leaderboard/get_leaderboard.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/leaderboard/get_leaderboard.rs @@ -6,19 +6,19 @@ 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, HttpRequest, HttpResponse}; use log::{debug, error, warn}; use sqlx::MySqlPool; +use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; +use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; +use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight}; use errors::AnyhowResult; use mysql_queries::queries::tts::stats::calculate_tts_model_leaderboard::calculate_tts_model_leaderboard; use mysql_queries::queries::w2l::stats::calculate_w2l_template_leaderboard::calculate_w2l_template_leaderboard; use tokens::tokens::users::UserToken; -use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; -use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; -use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight}; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/common/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/common/drain_multipart_request.rs index fedbe22939..c46b2c0dc9 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/common/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/common/drain_multipart_request.rs @@ -4,7 +4,6 @@ use futures::TryStreamExt; use log::warn; use errors::AnyhowResult; -use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; use crate::http_server::web_utils::read_multipart_field_bytes::{checked_read_multipart_bytes, read_multipart_field_as_text}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs index e0aa6532bd..15a1126c0d 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs @@ -1,19 +1,19 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{log, warn}; +use log::warn; +use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use enums::by_table::media_uploads::media_upload_type::MediaUploadType; use enums::common::visibility::Visibility; use mysql_queries::queries::media_uploads::reverse_list_user_media_uploads_of_type::reverse_list_user_media_uploads_of_type_with_connection; use tokens::tokens::media_uploads::MediaUploadToken; use tokens::tokens::users::UserToken; -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; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs index 7d81be8a99..3f6b140f91 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs @@ -5,11 +5,12 @@ 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::{error, info, warn}; +use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; @@ -23,12 +24,11 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_ use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session; +use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; -use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; /// Debug requests can get routed to special "debug-only" workers, which can /// be used to trial new code, run debugging, etc. diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/approval/pending_w2l_templates.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/approval/pending_w2l_templates.rs index c09d7ed778..88e81d2eef 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/approval/pending_w2l_templates.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/approval/pending_w2l_templates.rs @@ -1,11 +1,11 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{log, warn}; +use log::warn; use mysql_queries::queries::w2l::w2l_templates::list_pending_w2l_templates::list_pending_w2l_templates; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/delete_category.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/delete_category.rs index f287d54f94..ad0befc230 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/delete_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/delete_category.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::model_categories::toggle_model_category_soft_delete::{toggle_model_category_soft_delete, ToggleSoftDeleteState}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/edit_category.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/edit_category.rs index 19a73edf7a..94f697dff8 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/edit_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/edit_category.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::model_categories::get_category_by_token::get_category_by_token; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/list_tts_categories_for_moderation.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/list_tts_categories_for_moderation.rs index 98c0afb169..da15c40580 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/list_tts_categories_for_moderation.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/list_tts_categories_for_moderation.rs @@ -1,11 +1,11 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{log, warn}; +use log::warn; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/stats/get_on_prem_worker_stats.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/stats/get_on_prem_worker_stats.rs index ae7d469043..cd98766910 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/stats/get_on_prem_worker_stats.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/stats/get_on_prem_worker_stats.rs @@ -1,7 +1,7 @@ use std::sync::Arc; -use actix_web::{http::StatusCode, HttpRequest, HttpResponse, ResponseError, web}; use actix_web::web::Query; +use actix_web::{http::StatusCode, web, HttpRequest, HttpResponse, ResponseError}; use log::warn; use mysql_queries::queries::stats::get_on_prem_worker_stats::get_on_prem_worker_stats; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/stats/get_voice_count_stats.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/stats/get_voice_count_stats.rs index 64a0a5454b..9a46535770 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/stats/get_voice_count_stats.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/stats/get_voice_count_stats.rs @@ -1,9 +1,9 @@ use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::stats::get_voice_count_stats::get_voice_count_stats; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/list_roles.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/list_roles.rs index f17c528eac..ce2de96df1 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/list_roles.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/list_roles.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::users::user_roles::list_user_roles::{list_user_roles, UserRoleForList}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/list_staff.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/list_staff.rs index 6a2c6ceddb..2ae6d3c7f3 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/list_staff.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/list_staff.rs @@ -1,10 +1,10 @@ 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 derive_more::Display; -use log::{error, log, warn}; +use log::{error, warn}; use mysql_queries::queries::users::user_roles::list_staff::list_staff; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/set_user_role.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/set_user_role.rs index 6501cb046e..63f1f53926 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/set_user_role.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/set_user_role.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; use mysql_queries::queries::users::user_roles::list_user_roles::list_user_roles; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/users/list_users.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/users/list_users.rs index a5e367161f..1aab7d1f33 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/users/list_users.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/users/list_users.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::users::user::list_users_query_builder::{ListUsersQueryBuilder, UserForList}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_model_downloads.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_model_downloads.rs index b642f7cc33..a6bab2cdc2 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_model_downloads.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_model_downloads.rs @@ -1,9 +1,9 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_news.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_news.rs index 0977f7bc63..c29fb66469 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_news.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_news.rs @@ -1,9 +1,9 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_plans.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_plans.rs index 25b1a9cedd..0b499fedc2 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_plans.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_plans.rs @@ -1,11 +1,11 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{log, warn}; +use log::warn; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/post_app_analytics.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/post_app_analytics.rs index 906d423914..b97994e438 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/post_app_analytics.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/post_app_analytics.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/get_vocoder.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/get_vocoder.rs index 7d8a0dbd2a..edd3c11b3c 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/get_vocoder.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/get_vocoder.rs @@ -6,10 +6,10 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/list_vocoders.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/list_vocoders.rs index 4740cb911c..50976c6b61 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/list_vocoders.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/list_vocoders.rs @@ -6,9 +6,9 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/delete_w2l_result.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/delete_w2l_result.rs index e21155fe4a..32decfbe31 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/delete_w2l_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/delete_w2l_result.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::delete_w2l_inference_result_as_mod; use mysql_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::delete_w2l_inference_result_as_user; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/delete_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/delete_w2l_template.rs index e0ad135867..73766b7491 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/delete_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/delete_w2l_template.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::delete_w2l_template_as_mod; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_result.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_result.rs index 4586246adf..4f84fe0d93 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_result.rs @@ -6,15 +6,15 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, warn}; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::queries::w2l::w2l_results::edit_w2l_result::{CreatorOrModFields, edit_w2l_result, EditW2lResultArgs}; +use mysql_queries::queries::w2l::w2l_results::edit_w2l_result::{edit_w2l_result, CreatorOrModFields, EditW2lResultArgs}; use mysql_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_template.rs index 2299e5c02c..fc2ebec782 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_template.rs @@ -6,18 +6,18 @@ 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, Path}; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::queries::w2l::w2l_templates::edit_w2l_template::{CreatorOrModFields, edit_w2l_template, EditW2lTemplateArgs, ModFields}; +use markdown::simple_markdown_to_html::simple_markdown_to_html; +use mysql_queries::queries::w2l::w2l_templates::edit_w2l_template::{edit_w2l_template, CreatorOrModFields, EditW2lTemplateArgs, ModFields}; use mysql_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; use user_input_common::check_for_slurs::contains_slurs; -use markdown::simple_markdown_to_html::simple_markdown_to_html; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l.rs index cd9ea40958..c599b59ee8 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l.rs @@ -6,9 +6,9 @@ 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, HttpRequest, HttpResponse}; use log::{info, warn}; use r2d2_redis::redis::Commands; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l_with_uploads.rs index af382ea937..ddd218b76a 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l_with_uploads.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l_with_uploads.rs @@ -7,9 +7,9 @@ use std::fmt; use std::sync::Arc; use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use actix_web::http::StatusCode; use actix_web::web::BytesMut; +use actix_web::{web, HttpRequest, HttpResponse, ResponseError}; use futures::TryStreamExt; use log::{error, info, warn}; use r2d2_redis::redis::Commands; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_upload_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_upload_w2l_template.rs index 94e9b34610..7ab12ac738 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_upload_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_upload_w2l_template.rs @@ -6,9 +6,9 @@ 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, HttpRequest, HttpResponse}; use log::warn; use config::is_bad_video_download_url::is_bad_video_download_url; @@ -17,9 +17,9 @@ use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::w2l::w2l_template_upload_jobs::insert_w2l_template_upload_job::{insert_w2l_template_upload_job, InsertW2lTemplateUploadJobArgs}; use user_input_common::check_for_slurs::contains_slurs; +use crate::http_server::validations::validate_model_title::validate_model_title; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; -use crate::http_server::validations::validate_model_title::validate_model_title; #[derive(Deserialize)] pub enum W2lTemplateType { diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_inference_job_status.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_inference_job_status.rs index 52440345f2..511115b60d 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_inference_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_inference_job_status.rs @@ -1,12 +1,12 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{log, warn}; +use log::warn; use r2d2_redis::redis::Commands; use mysql_queries::queries::w2l::w2l_inference_jobs::get_w2l_inference_job_status::get_w2l_inference_job_status; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_result.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_result.rs index b294ff67ed..092574f54b 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_result.rs @@ -1,11 +1,11 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; -use log::{log, warn}; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; use mysql_queries::queries::w2l::w2l_results::query_w2l_result::W2lResultRecordForResponse; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_template.rs index 184d6ff816..9cf0cb5429 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_template.rs @@ -1,11 +1,11 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; -use log::{log, warn}; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; use mysql_queries::queries::w2l::w2l_templates::get_w2l_template::W2lTemplateRecordForResponse; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_template_use_count.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_template_use_count.rs index 775e999cd1..51f590a928 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_template_use_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_template_use_count.rs @@ -1,11 +1,11 @@ use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use derive_more::Display; -use log::{log, warn}; +use log::warn; use r2d2_redis::redis::Commands; use redis_common::redis_keys::RedisKeys; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_upload_template_job_status.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_upload_template_job_status.rs index d28443a1ed..9e9ca8b58d 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_upload_template_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/get_w2l_upload_template_job_status.rs @@ -1,12 +1,12 @@ use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use derive_more::Display; -use log::{log, warn}; +use log::warn; use r2d2_redis::redis::Commands; use mysql_queries::queries::w2l::w2l_template_upload_jobs::get_w2l_template_upload_job_status::get_w2l_template_upload_job_status; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_user_w2l_inference_results.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_user_w2l_inference_results.rs index 059e769eaa..b38b952161 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_user_w2l_inference_results.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_user_w2l_inference_results.rs @@ -1,12 +1,12 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::header::ContentType; use actix_web::http::StatusCode; use actix_web::web::{Path, Query}; -use log::{info, log, warn}; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use log::{info, warn}; use mysql_queries::queries::w2l::w2l_results::list_w2l_inference_results_query_builder::ListW2lResultsQueryBuilder; use mysql_queries::queries::w2l::w2l_results::list_w2l_inference_results_query_builder::W2lInferenceRecordForList; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_user_w2l_templates.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_user_w2l_templates.rs index 3b7b2a77c4..d8de0ff633 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_user_w2l_templates.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_user_w2l_templates.rs @@ -1,12 +1,12 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::header::ContentType; use actix_web::http::StatusCode; use actix_web::web::Path; -use log::{info, log, warn}; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use log::{info, warn}; use mysql_queries::queries::w2l::w2l_templates::list_w2l_templates::{list_w2l_templates, W2lTemplateRecordForList}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_w2l_templates.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_w2l_templates.rs index 288a6e1d65..7ba925c0e7 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_w2l_templates.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/list_w2l_templates.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{error, log, warn}; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use log::{error, warn}; use mysql_queries::queries::w2l::w2l_templates::list_w2l_templates::{list_w2l_templates, W2lTemplateRecordForList}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/set_w2l_template_mod_approval.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/set_w2l_template_mod_approval.rs index 1e7b79a5de..7752d369be 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/set_w2l_template_mod_approval.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/set_w2l_template_mod_approval.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs index 7b2c95346f..c64ee5d351 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs @@ -10,23 +10,18 @@ use utoipa::ToSchema; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; use mysql_queries::payloads::generic_inference_args::inner_payloads::face_fusion_payload::{CropDimensions, FaceFusionPayload}; use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs}; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use primitives::traits::trim_or_emptyable::TrimOrEmptyable; -use primitives::try_str_to_num::try_str_to_num; use tokens::tokens::generic_inference_jobs::InferenceJobToken; 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::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; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs index d80ed94289..93328ca5ef 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs @@ -10,25 +10,19 @@ use utoipa::ToSchema; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::helpers::boolean_converters::nullable_i8_to_optional_bool; use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; use mysql_queries::payloads::generic_inference_args::inner_payloads::live_portrait_payload::{CropDimensions, LivePortraitPayload}; use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs}; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use primitives::optional_false_to_none::optional_false_to_none; -use primitives::traits::trim_or_emptyable::TrimOrEmptyable; -use primitives::try_str_to_num::try_str_to_num; use tokens::tokens::generic_inference_jobs::InferenceJobToken; 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::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; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs index 1aeee03dee..b34c3cad85 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs @@ -5,10 +5,8 @@ use std::sync::Arc; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; use utoipa::ToSchema; @@ -17,7 +15,6 @@ use enums::by_table::generic_inference_jobs::inference_job_product_category::Inf use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType; @@ -30,7 +27,6 @@ use primitives::str_to_bool::str_to_bool; use primitives::traits::trim_or_emptyable::TrimOrEmptyable; use primitives::try_str_to_num::try_str_to_num; use tokens::tokens::generic_inference_jobs::InferenceJobToken; -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; @@ -42,7 +38,6 @@ use crate::http_server::requests::request_headers::get_routing_tag_header::get_r use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; use crate::util::allowed_video_style_transfer_access::allowed_video_style_transfer_access; use crate::util::cleaners::empty_media_file_token_to_null::empty_media_file_token_to_null; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs index 49c04f45c6..dd951665fa 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs @@ -5,10 +5,8 @@ use std::sync::Arc; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; use utoipa::ToSchema; @@ -17,7 +15,6 @@ use enums::by_table::generic_inference_jobs::inference_job_product_category::Inf use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType; @@ -30,7 +27,6 @@ use primitives::str_to_bool::str_to_bool; use primitives::traits::trim_or_emptyable::TrimOrEmptyable; use primitives::try_str_to_num::try_str_to_num; use tokens::tokens::generic_inference_jobs::InferenceJobToken; -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; @@ -43,7 +39,6 @@ use crate::http_server::requests::request_headers::get_routing_tag_header::get_r use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; use crate::util::allowed_video_style_transfer_access::allowed_video_style_transfer_access; use crate::util::cleaners::empty_media_file_token_to_null::empty_media_file_token_to_null; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status.rs index 0a122ff9a8..f8ddb22a7f 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status.rs @@ -1,27 +1,21 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Json, Path}; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::error; use r2d2_redis::redis::{Commands, RedisResult}; -use reqwest::Url; use utoipa::ToSchema; -use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use bucket_paths::legacy::typified_paths::public::voice_conversion_results::bucket_file_path::VoiceConversionResultOriginalFilePath; use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use mysql_queries::queries::generic_inference::web::get_inference_job_status::get_inference_job_status; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; -use redis_common::redis_keys::RedisKeys; use redis_schema::keys::inference_job::style_transfer_progress_key::StyleTransferProgressKey; -use redis_schema::payloads::inference_job::style_transfer_progress_state::{InferenceProgressDetailsResponse, InferenceStageDetails}; +use redis_schema::payloads::inference_job::style_transfer_progress_state::InferenceProgressDetailsResponse; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use crate::http_server::endpoints::inference_job::utils::estimates::estimate_job_progress::estimate_job_progress; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status_ws.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status_ws.rs index e290c39b29..da3ee25e2d 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status_ws.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status_ws.rs @@ -7,27 +7,21 @@ 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, + web, App, Error, HttpRequest, HttpResponse, HttpServer, Responder, }; use actix_web_actors::ws; use chrono::{DateTime, Utc}; use log::error; use r2d2_redis::redis::{Commands, RedisResult}; -use reqwest::Url; use utoipa::ToSchema; use web::Data; -use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use bucket_paths::legacy::typified_paths::public::voice_conversion_results::bucket_file_path::VoiceConversionResultOriginalFilePath; use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use mysql_queries::queries::generic_inference::web::get_inference_job_status::get_inference_job_status; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; -use redis_common::redis_keys::RedisKeys; use redis_schema::keys::inference_job::style_transfer_progress_key::StyleTransferProgressKey; -use redis_schema::payloads::inference_job::style_transfer_progress_state::{InferenceProgressDetailsResponse, InferenceStageDetails}; +use redis_schema::payloads::inference_job::style_transfer_progress_state::InferenceProgressDetailsResponse; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use crate::http_server::deprecated_endpoints::workflows::enqueue::{progress_tracker_server, progress_tracker_session}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/progress_tracker_server.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/progress_tracker_server.rs index 6c446451b1..a5109c9241 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/progress_tracker_server.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/progress_tracker_server.rs @@ -5,13 +5,13 @@ use std::{ collections::{HashMap, HashSet}, sync::{ - Arc, atomic::{AtomicUsize, Ordering}, + Arc, }, }; use actix::prelude::*; -use rand::{Rng, rngs::ThreadRng}; +use rand::{rngs::ThreadRng, Rng}; /// Chat server sends this messages to session #[derive(Message)] diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_workflow_upload_request.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_workflow_upload_request.rs index 1dd2d3febd..1d7f542c08 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_workflow_upload_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_workflow_upload_request.rs @@ -22,21 +22,20 @@ use enums::common::visibility::Visibility; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{ - GenericInferenceArgs, - InferenceCategoryAbbreviated, - PolymorphicInferenceArgs, + GenericInferenceArgs, + InferenceCategoryAbbreviated, + PolymorphicInferenceArgs, }; use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::WorkflowArgs; use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{ - insert_generic_inference_job, - InsertGenericInferenceArgs, + insert_generic_inference_job, + InsertGenericInferenceArgs, }; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use primitives::str_to_bool::str_to_bool; use primitives::try_str_to_num::try_str_to_num; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; -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; @@ -45,7 +44,6 @@ use crate::http_server::requests::request_headers::has_debug_header::has_debug_h use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; 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; #[derive(Deserialize, ToSchema)] pub struct EnqueueWorkFlowRequest { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_browser_session_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_browser_session_handler.rs index c998ad40a4..f7e6d91307 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_browser_session_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_browser_session_handler.rs @@ -7,21 +7,11 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; -use crockford::crockford_entropy_lower; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use enums::by_table::comments::comment_entity_type::CommentEntityType; use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::queries::beta_keys::insert_batch_beta_keys::{insert_batch_beta_keys, InsertBatchArgs}; use mysql_queries::queries::browser_session_logs::upsert_browser_session_log::{upsert_browser_session_log, UpsertBrowserSessionLogArgs}; -use mysql_queries::queries::comments::comment_entity_token::CommentEntityToken; -use mysql_queries::queries::comments::insert_comment::{insert_comment, InsertCommentArgs}; -use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; use tokens::tokens::browser_session_logs::BrowserSessionLogToken; -use crate::http_server::endpoints::moderation::user_feature_flags::edit_user_feature_flags_handler::EditUserFeatureFlagsError; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::http_server::web_utils::user_session::require_moderator::{require_moderator, RequireModeratorError}; -use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; use crate::state::server_state::ServerState; #[derive(Deserialize, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/get_app_state_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/get_app_state_handler.rs index 792c25a6d5..ec4f5ea416 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/get_app_state_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/get_app_state_handler.rs @@ -1,33 +1,17 @@ use crate::http_server::cookies::anonymous_visitor_tracking::avt_cookie_manager::AvtCookieManager; -use crate::http_server::cookies::anonymous_visitor_tracking::avt_cookie_payload::AvtCookiePayload; use crate::http_server::endpoints::app_state::components::get_permissions::{get_permissions, AppStatePermissions}; use crate::http_server::endpoints::app_state::components::get_premium_info::{get_premium_info, AppStatePremiumInfo}; use crate::http_server::endpoints::app_state::components::get_server_info::{get_server_info, AppStateServerInfo}; use crate::http_server::endpoints::app_state::components::get_status_alert::{get_status_alert, AppStateStatusAlertInfo}; use crate::http_server::endpoints::app_state::components::get_user_info::{get_user_info, AppStateUserInfo}; use crate::http_server::endpoints::app_state::components::get_user_locale::{get_user_locale, AppStateUserLocale}; -use crate::http_server::endpoints::users::session_info_handler::SessionInfoError; use crate::state::server_state::ServerState; -use actix_web::cookie::Cookie; use actix_web::http::StatusCode; -use actix_web::web::Json; use actix_web::{web, HttpRequest, HttpResponse, ResponseError}; -use billing_component::stripe::traits::internal_user_lookup::InternalUserLookup; -use billing_component::users::http_endpoints::list_active_user_subscriptions_handler::ListActiveUserSubscriptionsError; -use enums::by_table::user_ratings::entity_type::UserRatingEntityType; -use enums::by_table::user_ratings::rating_value::UserRatingValue; -use errors::AnyhowResult; -use hostname::get; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use log::{error, info, warn}; -use mysql_queries::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; -use mysql_queries::queries::users::user_ratings::get_user_rating::{get_user_rating, Args}; +use log::{error, warn}; use std::sync::Arc; use std::time::Duration; -use tokens::tokens::media_files::MediaFileToken; -use tokens::tokens::model_weights::ModelWeightToken; -use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::w2l_templates::W2lTemplateToken; use utoipa::ToSchema; // TODO: This is based on status_alert_handler diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs index a3bd85814a..93cd3a7fe2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs @@ -9,14 +9,9 @@ use utoipa::ToSchema; use crockford::crockford_entropy_lower; use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use enums::by_table::comments::comment_entity_type::CommentEntityType; -use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::beta_keys::insert_batch_beta_keys::{insert_batch_beta_keys, InsertBatchArgs}; -use mysql_queries::queries::comments::comment_entity_token::CommentEntityToken; -use mysql_queries::queries::comments::insert_comment::{insert_comment, InsertCommentArgs}; use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; -use crate::http_server::endpoints::moderation::user_feature_flags::edit_user_feature_flags_handler::EditUserFeatureFlagsError; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::user_session::require_moderator::{require_moderator, RequireModeratorError, UseDatabase}; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_distributed_flag_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_distributed_flag_handler.rs index 6c6931b6f5..a63b187ce4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_distributed_flag_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_distributed_flag_handler.rs @@ -8,28 +8,10 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; -use crockford::crockford_entropy_lower; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use enums::by_table::comments::comment_entity_type::CommentEntityType; -use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::beta_keys::edit_beta_key_distributed_flag::edit_beta_key_distributed_flag; -use mysql_queries::queries::beta_keys::edit_beta_key_note::edit_beta_key_note; -use mysql_queries::queries::beta_keys::insert_batch_beta_keys::{insert_batch_beta_keys, InsertBatchArgs}; -use mysql_queries::queries::comments::comment_entity_token::CommentEntityToken; -use mysql_queries::queries::comments::insert_comment::{insert_comment, InsertCommentArgs}; -use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; use tokens::tokens::beta_keys::BetaKeyToken; -use tokens::tokens::comments::CommentToken; -use tokens::tokens::media_files::MediaFileToken; -use tokens::tokens::model_weights::ModelWeightToken; -use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::tts_results::TtsResultToken; -use tokens::tokens::users::UserToken; use tokens::tokens::w2l_results::W2lResultToken; -use tokens::tokens::w2l_templates::W2lTemplateToken; -use crate::http_server::endpoints::media_files::get::get_media_file_handler::GetMediaFilePathInfo; -use crate::http_server::endpoints::moderation::user_feature_flags::edit_user_feature_flags_handler::EditUserFeatureFlagsError; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::user_session::require_moderator::{require_moderator, RequireModeratorError, UseDatabase}; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_note_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_note_handler.rs index 851eb3f337..fb6baab0af 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_note_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_note_handler.rs @@ -8,17 +8,9 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::beta_keys::edit_beta_key_note::edit_beta_key_note; -use mysql_queries::queries::beta_keys::insert_batch_beta_keys::{insert_batch_beta_keys, InsertBatchArgs}; -use mysql_queries::queries::comments::comment_entity_token::CommentEntityToken; -use mysql_queries::queries::comments::insert_comment::{insert_comment, InsertCommentArgs}; -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::endpoints::media_files::get::get_media_file_handler::GetMediaFilePathInfo; -use crate::http_server::endpoints::moderation::user_feature_flags::edit_user_feature_flags_handler::EditUserFeatureFlagsError; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::user_session::require_moderator::{require_moderator, RequireModeratorError, UseDatabase}; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs index be8d6a179f..3683ac46ad 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs @@ -5,30 +5,19 @@ use actix_web::http::StatusCode; use actix_web::web::Query; use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{debug, error, warn}; -use r2d2_redis::redis::Commands; -use regex::Regex; +use log::warn; use utoipa::{IntoParams, ToSchema}; -use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use enums::common::view_as::ViewAs; use markdown::markdown_with_socials_to_html::markdown_with_socials_to_html; use mysql_queries::queries::beta_keys::list_beta_keys::{list_beta_keys, FilterToKeys, ListBetaKeysArgs}; 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::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; -use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use crate::http_server::endpoints::beta_keys::create_beta_keys_handler::CreateBetaKeysError; -use crate::http_server::web_utils::user_session::require_moderator::{require_moderator, RequireModeratorError}; use crate::http_server::web_utils::user_session::require_user_session::{require_user_session, RequireUserSessionError}; use crate::state::server_state::ServerState; -use crate::util::allowed_explore_media_access::allowed_explore_media_access; #[derive(Copy, Clone, Deserialize, ToSchema)] #[serde(rename_all = "snake_case")] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs index ac96f1d79c..72abc6d82c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs @@ -1,44 +1,25 @@ 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, HttpRequest, HttpResponse}; use log::warn; -use r2d2_redis::redis::transaction; use utoipa::ToSchema; +use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use enums::by_table::comments::comment_entity_type::CommentEntityType; use enums::by_table::users::user_feature_flag::UserFeatureFlag; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::beta_keys::get_beta_key_by_value::get_beta_key_by_value; use mysql_queries::queries::beta_keys::redeem_beta_key::redeem_beta_key; -use mysql_queries::queries::comments::comment_entity_token::CommentEntityToken; -use mysql_queries::queries::comments::insert_comment::{insert_comment, InsertCommentArgs}; use mysql_queries::queries::users::user::update::set_can_access_studio_transactional::{set_can_access_studio_transactional, SetCanAccessStudioArgs}; -use mysql_queries::queries::users::user::update::set_user_feature_flags::{set_user_feature_flags, SetUserFeatureFlagArgs}; use mysql_queries::queries::users::user::update::set_user_feature_flags_transactional::{set_user_feature_flags_transactional, SetUserFeatureFlagTransactionalArgs}; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; -use tokens::tokens::comments::CommentToken; -use tokens::tokens::media_files::MediaFileToken; -use tokens::tokens::model_weights::ModelWeightToken; -use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::tts_results::TtsResultToken; -use tokens::tokens::users::UserToken; -use tokens::tokens::w2l_results::W2lResultToken; -use tokens::tokens::w2l_templates::W2lTemplateToken; -use user_input_common::check_for_slurs::contains_slurs; -use markdown::simple_markdown_to_html::simple_markdown_to_html; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; -use crate::http_server::endpoints::beta_keys::list_beta_keys_handler::ListBetaKeysError; -use crate::http_server::endpoints::moderation::user_feature_flags::edit_user_feature_flags_handler::EditUserFeatureFlagsError; -use crate::http_server::endpoints::voice_designer::inference::enqueue_tts_request::EnqueueTTSRequestError; -use crate::http_server::web_utils::user_session::require_moderator::RequireModeratorError; -use crate::http_server::web_utils::user_session::require_user_session::{require_user_session, RequireUserSessionError}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::try_delete_session_cache::try_delete_session_cache; +use crate::http_server::web_utils::user_session::require_user_session::{require_user_session, RequireUserSessionError}; use crate::state::server_state::ServerState; #[derive(Deserialize, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/comments/delete_comment_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/comments/delete_comment_handler.rs index b2b41b40b5..3508edf07f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/comments/delete_comment_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/comments/delete_comment_handler.rs @@ -6,10 +6,10 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, warn}; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/comments/list_comments_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/comments/list_comments_handler.rs index 9bf209121d..0488150846 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/comments/list_comments_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/comments/list_comments_handler.rs @@ -6,22 +6,22 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; use utoipa::ToSchema; +use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; +use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; +use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight}; use enums::by_table::comments::comment_entity_type::CommentEntityType; use mysql_queries::queries::comments::comment_entity_token::CommentEntityToken; use mysql_queries::queries::comments::list_comments_for_entity::list_comments_for_entity; use tokens::tokens::comments::CommentToken; use tokens::tokens::users::UserToken; -use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; -use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; -use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs index 1ec47359b9..a01d025473 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{info, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::{info, warn}; use config::bad_urls::is_bad_tts_model_download_url; use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; @@ -13,9 +13,9 @@ use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::generic_download::web::insert_generic_download_job::{insert_generic_download_job, InsertGenericDownloadJobArgs}; -use crate::state::server_state::ServerState; -use crate::http_server::validations::validate_model_title::validate_model_title; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; +use crate::http_server::validations::validate_model_title::validate_model_title; +use crate::state::server_state::ServerState; #[derive(Deserialize)] pub struct EnqueueGenericDownloadRequest { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs index ddebe44e94..6a205f8c63 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs @@ -1,12 +1,12 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{log, warn}; +use log::warn; use r2d2_redis::redis::Commands; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/create_featured_item_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/create_featured_item_handler.rs index 90d48d1e23..38ee4bcd58 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/create_featured_item_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/create_featured_item_handler.rs @@ -1,11 +1,10 @@ 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, HttpRequest, HttpResponse}; use log::{error, warn}; -use r2d2_redis::redis::transaction; use sqlx::Acquire; use utoipa::ToSchema; @@ -15,25 +14,13 @@ use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; use enums::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::queries::audit_logs::insert_audit_log::{insert_audit_log, InsertAuditLogArgs}; use mysql_queries::queries::audit_logs::insert_audit_log_transactional::{insert_audit_log_transactional, InsertAuditLogTransactionalArgs}; -use mysql_queries::queries::entity_stats::stats_entity_token::StatsEntityToken; -use mysql_queries::queries::entity_stats::upsert_entity_stats_on_bookmark_event::{BookmarkAction, upsert_entity_stats_on_bookmark_event, UpsertEntityStatsArgs}; use mysql_queries::queries::featured_items::upsert_featured_item::{upsert_featured_item, UpsertFeaturedItemArgs}; use mysql_queries::queries::media_files::edit::update_media_file_visibility_transactional::{update_media_file_visibility_transactional, UpdateMediaFileTransactionalArgs}; -use mysql_queries::queries::users::user_bookmarks::get_total_bookmark_count_for_entity::get_total_bookmark_count_for_entity; -use mysql_queries::queries::users::user_bookmarks::get_user_bookmark_transactional_locking::{BookmarkIdentifier, get_user_bookmark_transactional_locking}; -use mysql_queries::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; -use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::tts_results::TtsResultToken; -use tokens::tokens::user_bookmarks::UserBookmarkToken; use tokens::tokens::users::UserToken; -use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; -use tokens::tokens::w2l_results::W2lResultToken; use tokens::tokens::w2l_templates::W2lTemplateToken; -use tokens::tokens::zs_voices::ZsVoiceToken; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/delete_featured_item_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/delete_featured_item_handler.rs index 8233271693..4c063c49d0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/delete_featured_item_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/delete_featured_item_handler.rs @@ -1,11 +1,10 @@ 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::Path; -use log::{error, info, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::{error, warn}; use sqlx::Acquire; use utoipa::ToSchema; @@ -14,19 +13,12 @@ use composite_identifiers::by_table::featured_items::featured_item_entity::Featu use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; use enums::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::queries::audit_logs::insert_audit_log::{insert_audit_log, InsertAuditLogArgs}; use mysql_queries::queries::audit_logs::insert_audit_log_transactional::{insert_audit_log_transactional, InsertAuditLogTransactionalArgs}; -use mysql_queries::queries::entity_stats::stats_entity_token::StatsEntityToken; -use mysql_queries::queries::entity_stats::upsert_entity_stats_on_bookmark_event::{BookmarkAction, upsert_entity_stats_on_bookmark_event, UpsertEntityStatsArgs}; use mysql_queries::queries::featured_items::delete_featured_item::delete_featured_item; -use mysql_queries::queries::users::user_bookmarks::delete_user_bookmark::delete_user_bookmark; -use mysql_queries::queries::users::user_bookmarks::get_user_bookmark_transactional_locking::{BookmarkIdentifier, get_user_bookmark_transactional_locking}; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; -use tokens::tokens::user_bookmarks::UserBookmarkToken; use tokens::tokens::users::UserToken; -use crate::http_server::endpoints::featured_items::create_featured_item_handler::CreateFeaturedItemError; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/get_is_featured_item_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/get_is_featured_item_handler.rs index 7a5c6333d1..650a2810f9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/get_is_featured_item_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/get_is_featured_item_handler.rs @@ -1,41 +1,21 @@ 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, Path}; -use log::{error, warn}; -use r2d2_redis::redis::transaction; -use sqlx::Acquire; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use utoipa::ToSchema; -use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity; use composite_identifiers::by_table::featured_items::featured_item_entity::FeaturedItemEntity; -use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; use enums::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; -use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::queries::audit_logs::insert_audit_log::{insert_audit_log, InsertAuditLogArgs}; -use mysql_queries::queries::audit_logs::insert_audit_log_transactional::{insert_audit_log_transactional, InsertAuditLogTransactionalArgs}; -use mysql_queries::queries::entity_stats::stats_entity_token::StatsEntityToken; -use mysql_queries::queries::entity_stats::upsert_entity_stats_on_bookmark_event::{BookmarkAction, upsert_entity_stats_on_bookmark_event, UpsertEntityStatsArgs}; use mysql_queries::queries::featured_items::get_is_featured_by_token::get_is_featured_by_token; -use mysql_queries::queries::featured_items::upsert_featured_item::{upsert_featured_item, UpsertFeaturedItemArgs}; -use mysql_queries::queries::users::user_bookmarks::get_total_bookmark_count_for_entity::get_total_bookmark_count_for_entity; -use mysql_queries::queries::users::user_bookmarks::get_user_bookmark_transactional_locking::{BookmarkIdentifier, get_user_bookmark_transactional_locking}; -use mysql_queries::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; -use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::tts_results::TtsResultToken; -use tokens::tokens::user_bookmarks::UserBookmarkToken; use tokens::tokens::users::UserToken; -use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; -use tokens::tokens::w2l_results::W2lResultToken; use tokens::tokens::w2l_templates::W2lTemplateToken; -use tokens::tokens::zs_voices::ZsVoiceToken; -use crate::http_server::endpoints::weights::get::get_weight_handler::GetWeightPathInfo; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_dev_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_dev_text_to_image_handler.rs index f7f3b02f95..3480ac623f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_dev_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_dev_text_to_image_handler.rs @@ -1,36 +1,20 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; -use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::{GenerateFlux1DevTextToImageAspectRatio, GenerateFlux1DevTextToImageNumImages, GenerateFlux1DevTextToImageRequest, GenerateFlux1DevTextToImageResponse}; -use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::common::visibility::Visibility; use fal_client::requests::webhook::image::enqueue_flux_1_dev_text_to_image_webhook::enqueue_flux_1_dev_text_to_image_webhook; use fal_client::requests::webhook::image::enqueue_flux_1_dev_text_to_image_webhook::{Flux1DevArgs, Flux1DevAspectRatio, Flux1DevNumImages}; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; use utoipa::ToSchema; /// Flux 1 Dev text to image diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_schnell_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_schnell_text_to_image_handler.rs index 7405d92268..292481e0fb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_schnell_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_schnell_text_to_image_handler.rs @@ -1,36 +1,20 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; -use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::{GenerateFlux1SchnellTextToImageAspectRatio, GenerateFlux1SchnellTextToImageNumImages, GenerateFlux1SchnellTextToImageRequest, GenerateFlux1SchnellTextToImageResponse}; -use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::common::visibility::Visibility; use fal_client::requests::webhook::image::enqueue_flux_1_schnell_text_to_image_webhook::enqueue_flux_1_schnell_text_to_image_webhook; use fal_client::requests::webhook::image::enqueue_flux_1_schnell_text_to_image_webhook::{Flux1SchnellArgs, Flux1SchnellAspectRatio, Flux1SchnellNumImages}; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; use utoipa::ToSchema; /// Flux 1 Schnell text to image diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_text_to_image_handler.rs index d54f14ff90..a06dd2eddb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_text_to_image_handler.rs @@ -1,37 +1,21 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; -use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageResponse; use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::{GenerateFluxPro11TextToImageAspectRatio, GenerateFluxPro11TextToImageNumImages, GenerateFluxPro11TextToImageRequest}; -use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::common::visibility::Visibility; use fal_client::requests::webhook::image::enqueue_flux_pro_11_text_to_image_webhook::FluxPro11Args; use fal_client::requests::webhook::image::enqueue_flux_pro_11_text_to_image_webhook::{enqueue_flux_pro_11_text_to_image_webhook, FluxPro11AspectRatio, FluxPro11NumImages}; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_ultra_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_ultra_text_to_image_handler.rs index b6c54e119a..1c3598678b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_ultra_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_ultra_text_to_image_handler.rs @@ -1,37 +1,21 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; -use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageResponse; use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::{GenerateFluxPro11UltraTextToImageAspectRatio, GenerateFluxPro11UltraTextToImageNumImages, GenerateFluxPro11UltraTextToImageRequest}; -use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::common::visibility::Visibility; use fal_client::requests::webhook::image::enqueue_flux_pro_11_ultra_text_to_image_webhook::FluxPro11UltraArgs; use fal_client::requests::webhook::image::enqueue_flux_pro_11_ultra_text_to_image_webhook::{enqueue_flux_pro_11_ultra_text_to_image_webhook, FluxPro11UltraAspectRatio, FluxPro11UltraNumImages}; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs index ce58105a18..4068cc6cc9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs @@ -1,36 +1,24 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::remove_image_background::RemoveImageBackgroundRequest; use artcraft_api_defs::generate::image::remove_image_background::RemoveImageBackgroundResponse; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::common::visibility::Visibility; use fal_client::requests::webhook::image::remove_background_rembg_webhook::{remove_background_rembg_webhook, RemoveBackgroundRembgWebhookArgs}; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; +use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use utoipa::ToSchema; /// Background removal diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_0_image_to_3d_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_0_image_to_3d_handler.rs index 4596165b25..f725c1ecc8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_0_image_to_3d_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_0_image_to_3d_handler.rs @@ -1,21 +1,12 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::object::generate_hunyuan_2_0_image_to_3d::GenerateHunyuan20ImageTo3dRequest; use artcraft_api_defs::generate::object::generate_hunyuan_2_0_image_to_3d::GenerateHunyuan20ImageTo3dResponse; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -23,15 +14,12 @@ use enums::common::visibility::Visibility; use fal_client::requests::webhook::object::enqueue_hunyuan_3d_2_image_to_3d_webhook::enqueue_hunyuan_3d_2_image_to_3d_webhook; use fal_client::requests::webhook::object::enqueue_hunyuan_3d_2_image_to_3d_webhook::Hunyuan3d2Args; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; +use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use utoipa::ToSchema; /// Hunyuan 2.0 Image to 3D diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_1_image_to_3d_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_1_image_to_3d_handler.rs index cc4466c060..f0c632829e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_1_image_to_3d_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_1_image_to_3d_handler.rs @@ -1,21 +1,12 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::object::generate_hunyuan_2_1_image_to_3d::GenerateHunyuan21ImageTo3dRequest; use artcraft_api_defs::generate::object::generate_hunyuan_2_1_image_to_3d::GenerateHunyuan21ImageTo3dResponse; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -23,15 +14,12 @@ use enums::common::visibility::Visibility; use fal_client::requests::webhook::object::enqueue_hunyuan_3d_21_image_to_3d_webhook::enqueue_hunyuan_3d_2_1_image_to_3d_webhook; use fal_client::requests::webhook::object::enqueue_hunyuan_3d_21_image_to_3d_webhook::Hunyuan3d21Args; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; +use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use utoipa::ToSchema; /// Hunyuan 2.1 Image to 3D diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_1_6_pro_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_1_6_pro_video_handler.rs index f20d0d1add..12dca46dd7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_1_6_pro_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_1_6_pro_video_handler.rs @@ -1,21 +1,12 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest}; use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProDuration, GenerateKling16ProImageToVideoResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -25,15 +16,12 @@ use fal_client::requests::webhook::video::enqueue_kling_16_pro_image_to_video_we use fal_client::requests::webhook::video::enqueue_kling_16_pro_image_to_video_webhook::Kling16ProArgs; use fal_client::requests::webhook::video::enqueue_kling_16_pro_image_to_video_webhook::Kling16ProAspectRatio; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; +use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use utoipa::ToSchema; /* TODO: Either on the Tauri client or as an API, make "generic" image / video / object endpoints. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_master_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_master_video_handler.rs index 5849de71c8..23ff603a86 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_master_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_master_video_handler.rs @@ -1,21 +1,12 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::generate_kling_2_1_master_image_to_video::{GenerateKling21MasterAspectRatio, GenerateKling21MasterImageToVideoRequest}; use artcraft_api_defs::generate::video::generate_kling_2_1_master_image_to_video::{GenerateKling21MasterDuration, GenerateKling21MasterImageToVideoResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -25,15 +16,12 @@ use fal_client::requests::webhook::video::enqueue_kling_21_master_image_to_video use fal_client::requests::webhook::video::enqueue_kling_21_master_image_to_video_webhook::Kling21MasterAspectRatio; use fal_client::requests::webhook::video::enqueue_kling_21_master_image_to_video_webhook::Kling21MasterDuration; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; +use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use utoipa::ToSchema; /* diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_pro_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_pro_video_handler.rs index 7870b5ba05..27269ae76b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_pro_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_pro_video_handler.rs @@ -1,21 +1,12 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProAspectRatio, GenerateKling21ProImageToVideoRequest}; use artcraft_api_defs::generate::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProDuration, GenerateKling21ProImageToVideoResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -25,15 +16,12 @@ use fal_client::requests::webhook::video::enqueue_kling_21_pro_image_to_video_we use fal_client::requests::webhook::video::enqueue_kling_21_pro_image_to_video_webhook::Kling21ProAspectRatio; use fal_client::requests::webhook::video::enqueue_kling_21_pro_image_to_video_webhook::Kling21ProDuration; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; +use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use utoipa::ToSchema; /* diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_lite_image_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_lite_image_to_video_handler.rs index d557243495..8b16b34aaf 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_lite_image_to_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_lite_image_to_video_handler.rs @@ -1,21 +1,12 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::GenerateSeedance10LiteDuration; use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::GenerateSeedance10LiteImageToVideoRequest; use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::GenerateSeedance10LiteImageToVideoResponse; @@ -26,15 +17,12 @@ use fal_client::requests::webhook::video::enqueue_seedance_1_lite_image_to_video use fal_client::requests::webhook::video::enqueue_seedance_1_lite_image_to_video_webhook::Seedance1LiteDuration; use fal_client::requests::webhook::video::enqueue_seedance_1_lite_image_to_video_webhook::{Seedance1LiteArgs, Seedance1LiteResolution}; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; +use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use utoipa::ToSchema; /// Seedance 1.0 Lite Image to Video diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_2_image_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_2_image_to_video_handler.rs index 96a5f3b828..ee49efc22b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_2_image_to_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_2_image_to_video_handler.rs @@ -1,21 +1,12 @@ -use std::fmt; use std::sync::Arc; -use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::media::media_links::MediaLinks; -use crate::http_server::deprecated_endpoints::engine::create_scene_handler::CreateSceneError; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; -use actix_web::error::ResponseError; -use actix_web::http::StatusCode; use actix_web::web::Json; -use actix_web::web::Path; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::GenerateVeo2AspectRatio; use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::GenerateVeo2Duration; use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::GenerateVeo2ImageToVideoRequest; @@ -27,15 +18,12 @@ use fal_client::requests::webhook::video::enqueue_veo_2_image_to_video_webhook:: use fal_client::requests::webhook::video::enqueue_veo_2_image_to_video_webhook::Veo2AspectRatio; use fal_client::requests::webhook::video::enqueue_veo_2_image_to_video_webhook::Veo2Duration; use http_server_common::request::get_request_ip::get_request_ip; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use idempotency::uuid::generate_random_uuid; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::insert_generic_inference_job_for_fal_queue; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile}; -use tokens::tokens::media_files::MediaFileToken; +use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use utoipa::ToSchema; /// Veo 2 Image to Video diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/get_sora_credentials_from_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/get_sora_credentials_from_request.rs index 7a1d4e412c..f66ec9e415 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/get_sora_credentials_from_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/get_sora_credentials_from_request.rs @@ -1,11 +1,11 @@ use actix_web::HttpRequest; use anyhow::anyhow; -use log::{error, info}; -use r2d2_redis::r2d2::PooledConnection; -use r2d2_redis::RedisConnectionManager; use errors::AnyhowResult; use http_server_common::request::get_request_header_optional::get_request_header_optional; +use log::{error, info}; use openai_sora_client::credentials::SoraCredentials; +use r2d2_redis::r2d2::PooledConnection; +use r2d2_redis::RedisConnectionManager; use shared_service_components::sora_redis_credentials::get_sora_credentials_from_redis::get_sora_credentials_from_redis; const SORA_BEARER_HEADER_NAME : &str = "sora-bearer"; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/prompt/enqueue_studio_image_generation_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/prompt/enqueue_studio_image_generation_handler.rs index 0b71e6ed3e..df0fec617a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/prompt/enqueue_studio_image_generation_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/prompt/enqueue_studio_image_generation_handler.rs @@ -2,7 +2,7 @@ use std::fmt::Debug; use std::fmt::{Display, Formatter}; -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use std::sync::Arc; use actix_web::error::ResponseError; @@ -14,7 +14,6 @@ use cloud_storage::bucket_client::BucketClient; use log::warn; use log::{debug, error}; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; -use openai_sora_client::credentials::SoraCredentials; use openai_sora_client::requests::image_gen::SoraImageGenError; use openai_sora_client::requests::sentinel_refresh::generate::token::generate_token; use serde::Deserialize; @@ -43,16 +42,13 @@ use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_g use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; -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_studio::get_sora_credentials_from_request::get_sora_credentials_from_request; -use crate::http_server::endpoints::tts::get_tts_inference_job_status::GetTtsInferenceStatusError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; 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; /// This is the number of images (batch size) to generate for each request. /// We should allow all users to have multiple images generated at once as this diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/update_gpt_image_job_status_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/update_gpt_image_job_status_handler.rs index 4e9ffed07f..8da01926e1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/update_gpt_image_job_status_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/update_gpt_image_job_status_handler.rs @@ -1,16 +1,12 @@ use std::fmt; use std::sync::Arc; -use crate::http_server::endpoints::inference_job::get::get_inference_job_status_handler::GetInferenceJobStatusError; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::http_server::web_utils::user_session::require_user_session::require_user_session; use crate::state::server_state::ServerState; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use actix_web::web::{Data, Json, Path}; +use actix_web::web::{Data, Json}; use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; -use base64::alphabet::STANDARD; use base64::prelude::BASE64_STANDARD; use base64::Engine; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -19,23 +15,16 @@ use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::job_status::JobStatus; use enums::common::job_status_plus::JobStatusPlus; use errors::AnyhowResult; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; -use http_server_common::request::get_request_ip::get_request_ip; use images::image_info::image_info::ImageInfo; -use log::{error, info, warn}; -use mysql_queries::queries::generic_inference::job::mark_generic_inference_job_completely_failed::mark_generic_inference_job_completely_failed; -use mysql_queries::queries::generic_inference::web::dismiss_finished_jobs_for_user::dismiss_finished_jobs_for_user; -use mysql_queries::queries::generic_inference::web::get_inference_job_status::{get_inference_job_status, get_inference_job_status_from_connection}; +use log::{error, info}; +use mysql_queries::queries::generic_inference::web::get_inference_job_status::get_inference_job_status; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; -use mysql_queries::queries::generic_inference::web::mark_generic_inference_job_cancelled_by_user::mark_generic_inference_job_cancelled_by_user; use mysql_queries::queries::generic_inference::web::mark_generic_inference_job_successfully_done_by_token::mark_generic_inference_job_successfully_done_by_token; use mysql_queries::queries::media_files::create::insert_builder::media_file_insert_builder::MediaFileInsertBuilder; -use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; -use mysql_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_permanently_dead::mark_tts_inference_job_permanently_dead; -use sqlx::{MySqlConnection, MySqlPool}; +use sqlx::MySqlPool; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/upload/upload_snapshot_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/upload/upload_snapshot_media_file_handler.rs index 4e463e0bdc..fa24778d93 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/upload/upload_snapshot_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/upload/upload_snapshot_media_file_handler.rs @@ -1,38 +1,32 @@ use std::collections::HashSet; -use std::io::{BufReader, Bytes, Cursor, Read}; +use std::io::Read; use std::path::PathBuf; use std::sync::Arc; use actix_multipart::form::tempfile::TempFile; use actix_multipart::form::text::Text; use actix_multipart::form::MultipartForm; -use actix_multipart::Multipart; use actix_web::web::Json; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; use once_cell::sync::Lazy; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; 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 mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; -use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use tokens::tokens::media_files::MediaFileToken; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; -use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult}; /// Form-multipart request fields. /// diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/admin/kill_inference_jobs_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/admin/kill_inference_jobs_handler.rs index b05df744a8..45c8531491 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/admin/kill_inference_jobs_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/admin/kill_inference_jobs_handler.rs @@ -2,9 +2,9 @@ use std::collections::HashSet; 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, HttpRequest, HttpResponse}; use log::warn; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/delete/dismiss_finished_session_jobs_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/delete/dismiss_finished_session_jobs_handler.rs index da0a2d793c..fb3c3e0970 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/delete/dismiss_finished_session_jobs_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/delete/dismiss_finished_session_jobs_handler.rs @@ -1,21 +1,17 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use log::{error, warn}; use utoipa::ToSchema; -use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::generic_inference::web::dismiss_finished_jobs_for_user::dismiss_finished_jobs_for_user; -use mysql_queries::queries::generic_inference::web::get_inference_job_status::{get_inference_job_status, get_inference_job_status_from_connection}; use mysql_queries::queries::generic_inference::web::mark_generic_inference_job_cancelled_by_user::mark_generic_inference_job_cancelled_by_user; -use tokens::tokens::generic_inference_jobs::InferenceJobToken; -use crate::http_server::web_utils::user_session::require_user_session::require_user_session; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; +use crate::http_server::web_utils::user_session::require_user_session::require_user_session; use crate::state::server_state::ServerState; #[derive(Serialize, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/delete/terminate_inference_job_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/delete/terminate_inference_job_handler.rs index e6a7b077d4..634d414e0a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/delete/terminate_inference_job_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/delete/terminate_inference_job_handler.rs @@ -1,15 +1,15 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use log::{error, warn}; use utoipa::ToSchema; use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::queries::generic_inference::web::get_inference_job_status::{get_inference_job_status, get_inference_job_status_from_connection}; +use mysql_queries::queries::generic_inference::web::get_inference_job_status::get_inference_job_status_from_connection; use mysql_queries::queries::generic_inference::web::mark_generic_inference_job_cancelled_by_user::mark_generic_inference_job_cancelled_by_user; use tokens::tokens::generic_inference_jobs::InferenceJobToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs index 3b3ef45dea..bc3dae57fc 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs @@ -4,12 +4,12 @@ use std::sync::Arc; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use actix_web::web::{Json, Path}; -use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use actix_web::web::Json; +use actix_web::{web, HttpRequest, HttpResponse}; use actix_web_lab::extract::Query; use chrono::{DateTime, Utc}; use log::error; -use r2d2_redis::redis::{Commands, RedisResult}; +use r2d2_redis::redis::Commands; use utoipa::{IntoParams, ToSchema}; use crate::http_server::common_responses::media::media_domain::MediaDomain; @@ -20,7 +20,6 @@ use crate::http_server::endpoints::inference_job::utils::estimates::estimate_job use crate::http_server::endpoints::inference_job::utils::extractors::extract_lipsync_details::extract_lipsync_details; use crate::http_server::endpoints::inference_job::utils::extractors::extract_live_portrait_details::extract_live_portrait_details; use crate::http_server::endpoints::inference_job::utils::extractors::extract_polymorphic_inference_args::extract_polymorphic_inference_args; -use crate::http_server::endpoints::media_files::get::batch_get_media_files_handler::BatchGetMediaFilesQueryParams; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; 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; @@ -35,7 +34,6 @@ use mysql_queries::queries::generic_inference::web::batch_get_inference_job_stat use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; use redis_common::redis_keys::RedisKeys; use tokens::tokens::generic_inference_jobs::InferenceJobToken; -use tokens::tokens::media_files::MediaFileToken; /// For certain jobs or job classes (eg. non-premium), we kill the jobs if the user hasn't /// maintained a keepalive. This prevents wasted work when users who are unlikely to return diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs index bf02c087b8..8bb5ff4a1a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Json, Path}; -use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::error; use r2d2_redis::redis::{Commands, RedisResult}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs index 15486494d7..a7ebae365c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs @@ -4,12 +4,12 @@ use std::sync::Arc; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use actix_web::web::{Json, Path}; -use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use actix_web::web::Json; +use actix_web::{web, HttpRequest, HttpResponse}; use actix_web_lab::extract::Query; -use chrono::{DateTime, Duration, Utc}; +use chrono::{DateTime, Utc}; use log::{error, warn}; -use r2d2_redis::redis::{Commands, RedisResult}; +use r2d2_redis::redis::Commands; use utoipa::{IntoParams, ToSchema}; use crate::http_server::common_responses::media::media_domain::MediaDomain; @@ -36,7 +36,6 @@ use primitives::numerics::i64_to_u64_zero_clamped::i64_to_u64_zero_clamped; use redis_common::redis_keys::RedisKeys; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; -use tokens::tokens::users::UserToken; /// For certain jobs or job classes (eg. non-premium), we kill the jobs if the user hasn't /// maintained a keepalive. This prevents wasted work when users who are unlikely to return diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/stats/get_pending_inference_job_count_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/stats/get_pending_inference_job_count_handler.rs index 5c2a6f0044..a517b91d52 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/stats/get_pending_inference_job_count_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/stats/get_pending_inference_job_count_handler.rs @@ -1,7 +1,7 @@ use std::fmt; use std::sync::Arc; -use actix_web::{http::StatusCode, HttpRequest, HttpResponse, ResponseError, web}; +use actix_web::{http::StatusCode, web, HttpRequest, HttpResponse, ResponseError}; use chrono::NaiveDateTime; use log::{debug, error, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/common_responses/live_portrait.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/common_responses/live_portrait.rs index e103e8bb95..1310ca6cc5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/common_responses/live_portrait.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/common_responses/live_portrait.rs @@ -1,6 +1,6 @@ -use utoipa::ToSchema; use mysql_queries::payloads::media_file_extra_info::media_file_extra_info::MediaFileExtraInfo; use tokens::tokens::media_files::MediaFileToken; +use utoipa::ToSchema; /// Details about submitted live portrait jobs (request arguments only) #[derive(Serialize, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/delete/delete_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/delete/delete_media_file_handler.rs index d46f74e771..673c2c0d0d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/delete/delete_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/delete/delete_media_file_handler.rs @@ -1,10 +1,10 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs index 866e07b9ff..2437aaef16 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs @@ -1,12 +1,11 @@ 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, Path}; -use anyhow::anyhow; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use utoipa::ToSchema; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; @@ -14,7 +13,6 @@ use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCat use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::media_files::edit::update_media_file_animation_type::update_media_file_animation_type; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; -use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::simple_response::SimpleResponse; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs index 26b423bf11..f5cb0d2809 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs @@ -1,19 +1,17 @@ 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, Path}; -use anyhow::anyhow; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use utoipa::ToSchema; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::media_files::edit::update_media_file_engine_category::update_media_file_engine_category; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; -use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::common_responses::simple_response::SimpleResponse; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_visibility_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_visibility_handler.rs index 053681d7b2..e8e79545d0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_visibility_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_visibility_handler.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use utoipa::ToSchema; use enums::common::visibility::Visibility; @@ -14,7 +14,6 @@ use http_server_common::response::response_success_helpers::simple_json_success; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::media_files::edit::update_media_file_visibility::{update_media_file_visibility, UpdateMediaFileArgs}; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; -use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/rename_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/rename_media_file_handler.rs index 328794f7dc..cd82db8e8d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/rename_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/rename_media_file_handler.rs @@ -1,21 +1,19 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; -use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use mysql_queries::queries::media_files::edit::rename_media_file::rename_media_file; -use mysql_queries::queries::media_files::get::get_media_file::get_media_file; -use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; +use http_server_common::response::serialize_as_json_error::serialize_as_json_error; +use mysql_queries::queries::media_files::edit::rename_media_file::rename_media_file; +use mysql_queries::queries::media_files::get::get_media_file::get_media_file; #[derive(Deserialize, ToSchema)] pub struct RenameMediaFileRequest { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs index 0d0b1e9942..7df39a5740 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs @@ -1,25 +1,22 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{info, warn}; use utoipa::ToSchema; use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::media_files::edit::set_media_file_cover_image::{set_media_file_cover_image, UpdateArgs}; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_requests::media_file_token_path_info::MediaFileTokenPathInfo; -use crate::http_server::endpoints::weights::update::set_model_weight_cover_image_handler::SetModelWeightCoverImageError; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole}; #[derive(Deserialize, ToSchema)] pub struct SetMediaFileCoverImageRequest { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/update_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/update_media_file_handler.rs index 8699e4fd8b..60dfe4c163 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/update_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/update_media_file_handler.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs index 3583b665e6..6532794f08 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs @@ -2,15 +2,13 @@ use std::collections::HashSet; use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use actix_web::web::{Json, Path}; +use actix_web::web::Json; +use actix_web::{web, HttpRequest, HttpResponse}; use actix_web_lab::extract::Query; use chrono::{DateTime, Utc}; -use futures_old_for_limiter::future::result; use log::warn; -use url::Url; use utoipa::{IntoParams, ToSchema}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -25,20 +23,17 @@ use enums::common::visibility::Visibility; use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use mysql_queries::queries::media_files::get::batch_get_media_files::batch_get_media_files; -use mysql_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::prompts::PromptToken; -use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; +use crate::http_server::common_responses::media::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::http_server::endpoints::media_files::common_responses::live_portrait::MediaFileLivePortraitDetails; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; -use crate::http_server::web_utils::bucket_urls::bucket_url_from_media_path::bucket_url_from_media_path; -use crate::http_server::web_utils::bucket_urls::bucket_url_from_str_path::bucket_url_from_str_path; use crate::http_server::web_utils::bucket_urls::bucket_url_string_from_media_path::bucket_url_string_from_media_path; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs index 5c28303b59..fef1afc51c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs @@ -2,16 +2,16 @@ use std::fmt; use std::sync::Arc; use actix_web::error::ResponseError; -use actix_web::http::{StatusCode, Uri}; +use actix_web::http::StatusCode; use actix_web::web::{Json, Path}; -use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; use url::Url; use utoipa::ToSchema; use crate::http_server::common_responses::media::media_domain::MediaDomain; -use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; +use crate::http_server::common_responses::media::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_media_domain.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_media_domain.rs index 6e5d510161..197c09a22a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_media_domain.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_media_domain.rs @@ -1,7 +1,7 @@ use actix_web::HttpRequest; use crate::http_server::common_responses::media::media_domain::MediaDomain; -use crate::http_server::requests::get_request_domain_branding::{DomainBranding, get_request_domain_branding}; +use crate::http_server::requests::get_request_domain_branding::{get_request_domain_branding, DomainBranding}; pub fn get_media_domain(http_request: &HttpRequest) -> MediaDomain { get_request_domain_branding(http_request) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs index 8801a0dbc7..c2fea6b06e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs @@ -4,8 +4,7 @@ use actix_web::web::Query; use actix_web::{web, HttpRequest, HttpResponse}; use actix_web_lab::__reexports::tracing::info; use chrono::{DateTime, Utc}; -use log::{debug, error, warn}; -use r2d2_redis::redis::Commands; +use log::{error, warn}; use std::sync::Arc; use std::time::Instant; use time::ext::InstantExt; @@ -21,12 +20,10 @@ use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::view_as::ViewAs; use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::media_files::public_media_file_model_type::PublicMediaFileModelType; -use http_server_common::request::get_request_header_optional::get_request_header_optional; -use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens; 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::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; +use crate::http_server::common_responses::media::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; use crate::http_server::common_responses::pagination_cursors::PaginationCursors; @@ -38,10 +35,8 @@ use crate::http_server::endpoints::media_files::helpers::get_scoped_media_classe use crate::http_server::endpoints::media_files::helpers::get_scoped_media_types::get_scoped_media_types; use crate::http_server::endpoints::media_files::helpers::get_scoped_product_categories::get_scoped_product_categories; use crate::http_server::requests::request_headers::get_cloudflare_ray_header::get_cloudflare_ray_header; -use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; use crate::http_server::web_utils::bucket_urls::bucket_url_string_from_media_path::bucket_url_string_from_media_path; use crate::state::server_state::ServerState; -use crate::util::allowed_explore_media_access::allowed_explore_media_access; #[derive(Deserialize, ToSchema, IntoParams, Hash, Clone, PartialEq, Eq)] pub struct ListFeaturedMediaFilesQueryParams { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs index 369e05aad2..e04ad50ffd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs @@ -1,9 +1,9 @@ use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Json, Path, Query}; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; use utoipa::{IntoParams, ToSchema}; @@ -20,13 +20,12 @@ use enums::common::visibility::Visibility; use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::media_files::public_media_file_model_type::PublicMediaFileModelType; use mysql_queries::queries::media_files::list::list_media_files_by_batch_token::{list_media_files_by_batch_token, ListMediaFileByBatchArgs}; -use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs}; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; -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::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links::MediaLinks; +use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; use crate::http_server::common_responses::pagination_page::PaginationPage; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs index caffbbb8b8..983ee40362 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs @@ -1,10 +1,9 @@ -use std::collections::HashSet; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Query}; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::{info, warn}; use utoipa::{IntoParams, ToSchema}; @@ -23,9 +22,9 @@ 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::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::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links::MediaLinks; +use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; use crate::http_server::common_responses::pagination_page::PaginationPage; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs index c854e49ef6..fc9bf9e841 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs @@ -1,9 +1,9 @@ use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Query; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; use utoipa::{IntoParams, ToSchema}; @@ -22,9 +22,9 @@ 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::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::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links::MediaLinks; +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::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; @@ -36,7 +36,6 @@ use crate::http_server::web_utils::bucket_urls::bucket_url_string_from_media_pat use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; use crate::util::allowed_explore_media_access::allowed_explore_media_access; -use crate::util::allowed_studio_access::allowed_studio_access; #[derive(Deserialize, ToSchema, IntoParams)] pub struct ListMediaFilesQueryParams { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs index 9961eb3dbc..c4d727f1e0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs @@ -1,8 +1,8 @@ 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 chrono::{DateTime, Utc}; use log::{debug, error, warn}; use r2d2_redis::redis::Commands; @@ -20,9 +20,9 @@ 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::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::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links::MediaLinks; +use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs index 04c96dc3a7..af750fa5fa 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs @@ -1,9 +1,9 @@ use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Json, Query}; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; use utoipa::{IntoParams, ToSchema}; @@ -14,16 +14,11 @@ use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationT use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::view_as::ViewAs; 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::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::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links::MediaLinks; -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::endpoints::media_files::helpers::get_media_domain::get_media_domain; use crate::http_server::endpoints::media_files::helpers::get_scoped_engine_categories::get_scoped_engine_categories; @@ -33,7 +28,6 @@ use crate::http_server::web_utils::bucket_urls::bucket_url_string_from_media_pat use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; use crate::util::allowed_explore_media_access::allowed_explore_media_access; -use crate::util::allowed_studio_access::allowed_studio_access; #[derive(Deserialize, ToSchema, IntoParams)] pub struct SearchFeaturedMediaFilesQueryParams { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs index 26d6c16355..8dd01a2450 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs @@ -1,12 +1,11 @@ use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Json, Query}; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; -use url::Url; use utoipa::{IntoParams, ToSchema}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -15,29 +14,21 @@ use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationT use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::view_as::ViewAs; use enums::common::visibility::Visibility; -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::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::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links::MediaLinks; -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::endpoints::media_files::get::batch_get_media_files_handler::BatchGetMediaFilesError; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; use crate::http_server::endpoints::media_files::helpers::get_scoped_engine_categories::get_scoped_engine_categories; use crate::http_server::endpoints::media_files::helpers::get_scoped_media_classes::get_scoped_media_classes; use crate::http_server::endpoints::media_files::helpers::get_scoped_media_types::get_scoped_media_types; -use crate::http_server::web_utils::bucket_urls::bucket_url_from_media_path::bucket_url_from_media_path; use crate::http_server::web_utils::bucket_urls::bucket_url_string_from_media_path::bucket_url_string_from_media_path; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; use crate::util::allowed_explore_media_access::allowed_explore_media_access; -use crate::util::allowed_studio_access::allowed_studio_access; #[derive(Deserialize, ToSchema, IntoParams)] pub struct SearchMediaFilesQueryParams { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs index 9861b8e239..96bfa7972c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs @@ -1,22 +1,19 @@ use std::collections::HashSet; -use std::io::{BufReader, Bytes, Cursor, Read}; +use std::io::Read; use std::path::PathBuf; use std::sync::Arc; -use actix_multipart::form::MultipartForm; use actix_multipart::form::tempfile::TempFile; use actix_multipart::form::text::Text; -use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_multipart::form::MultipartForm; use actix_web::web::Json; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; use once_cell::sync::Lazy; -use stripe::CreatePaymentLinkShippingAddressCollectionAllowedCountries::Mf; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; @@ -26,14 +23,11 @@ use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; -use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use tokens::tokens::media_files::MediaFileToken; -use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; -use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult}; /// Form-multipart request fields. /// diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs index 3d372084b0..e04b5a1703 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs @@ -5,10 +5,8 @@ use futures::TryStreamExt; use log::warn; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use errors::AnyhowResult; -use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; use crate::http_server::web_utils::read_multipart_field_bytes::{checked_read_multipart_bytes, read_multipart_field_as_text}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs index 0cfb4f811b..e0d7f6256b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs @@ -1,12 +1,9 @@ -use std::collections::HashSet; -use std::io::{BufReader, Cursor}; use std::path::PathBuf; use std::sync::Arc; use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; -use once_cell::sync::Lazy; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -15,17 +12,14 @@ use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; -use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; 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 videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; use crate::http_server::endpoints::media_files::upload::upload_engine_asset::drain_multipart_request::drain_multipart_request; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; -use crate::state::server_state::ServerState; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; +use crate::state::server_state::ServerState; #[derive(Serialize, ToSchema)] pub struct UploadEngineAssetMediaSuccessResponse { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/drain_multipart_request.rs index 8c9a2c04f1..0bbdd53801 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/drain_multipart_request.rs @@ -4,7 +4,6 @@ use futures::TryStreamExt; use log::warn; use errors::AnyhowResult; -use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; use crate::http_server::web_utils::read_multipart_field_bytes::{checked_read_multipart_bytes, read_multipart_field_as_text}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs index a061507509..918ee73a36 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.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_files::bucket_file_path::MediaFileBucketPath; @@ -20,8 +20,8 @@ use tokens::tokens::media_files::MediaFileToken; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::endpoints::media_files::upload::upload_generic::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource}; -use crate::state::server_state::ServerState; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; +use crate::state::server_state::ServerState; // TODO(bt,2023-12-20): THIS CODE NEEDS CLEANUP. This has been cargo culted three+ times. // It's ridiculous and complicated. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/upload_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/upload_media_file_handler.rs index 4ab50557a3..1c8efcbfd7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/upload_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/upload_media_file_handler.rs @@ -2,7 +2,7 @@ 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 utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs index e0ceddf2d3..5b43b906c6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs @@ -1,39 +1,32 @@ use std::collections::HashSet; -use std::io::{BufReader, Bytes, Cursor, Read}; +use std::io::Read; use std::path::PathBuf; use std::sync::Arc; -use actix_multipart::form::MultipartForm; use actix_multipart::form::tempfile::TempFile; use actix_multipart::form::text::Text; -use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_multipart::form::MultipartForm; use actix_web::web::Json; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; use once_cell::sync::Lazy; -use stripe::CreatePaymentLinkShippingAddressCollectionAllowedCountries::Mf; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; 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 mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; -use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use tokens::tokens::media_files::MediaFileToken; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; -use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult}; /// Form-multipart request fields. /// diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs index b06a38999e..7da0f38d68 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs @@ -1,16 +1,13 @@ -use std::collections::HashSet; -use std::io::{BufReader, Cursor, Read}; +use std::io::Read; use std::path::PathBuf; use std::sync::Arc; -use actix_multipart::form::MultipartForm; use actix_multipart::form::tempfile::TempFile; use actix_multipart::form::text::Text; -use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_multipart::form::MultipartForm; use actix_web::web::Json; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; -use once_cell::sync::Lazy; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -21,19 +18,14 @@ use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; -use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; use tokens::tokens::media_files::MediaFileToken; -use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; -use crate::http_server::endpoints::media_files::upload::upload_engine_asset::drain_multipart_request::drain_multipart_request; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; -use crate::http_server::endpoints::media_files::upload::upload_new_scene_media_file_handler::UploadNewSceneMediaFileForm; -use crate::state::server_state::ServerState; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; +use crate::state::server_state::ServerState; /// Form-multipart request fields. /// diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs index c6b0cce547..cd26c71035 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs @@ -1,17 +1,13 @@ -use std::collections::HashSet; -use std::io::{BufReader, Bytes, Cursor, Read}; +use std::io::Read; use std::path::PathBuf; use std::sync::Arc; -use actix_multipart::form::MultipartForm; use actix_multipart::form::tempfile::TempFile; use actix_multipart::form::text::Text; -use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_multipart::form::MultipartForm; use actix_web::web::Json; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; -use once_cell::sync::Lazy; -use stripe::CreatePaymentLinkShippingAddressCollectionAllowedCountries::Mf; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -21,18 +17,13 @@ use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; -use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; -use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use tokens::tokens::media_files::MediaFileToken; -use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; -use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult}; /// Form-multipart request fields. /// diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/extract_and_upload_pmx_files.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/extract_and_upload_pmx_files.rs index fc5dafb76b..08338f9433 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/extract_and_upload_pmx_files.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/extract_and_upload_pmx_files.rs @@ -1,6 +1,6 @@ -use std::collections::{HashMap, HashSet}; +use std::collections::HashSet; use std::io::{BufReader, Cursor, Read}; -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use log::{error, info, warn}; use once_cell::sync::Lazy; @@ -8,12 +8,10 @@ use zip::ZipArchive; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::bucket_client::BucketClient; -use errors::AnyhowResult; use filesys::path_to_string::path_to_string; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; static ALLOWED_EXTENSIONS : Lazy> = Lazy::new(|| { HashSet::from([ diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs index 8ceee40dac..e66bf621f1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs @@ -1,41 +1,30 @@ -use std::collections::HashSet; -use std::io::{BufReader, Cursor, Read}; +use std::io::Read; use std::path::PathBuf; use std::sync::Arc; -use actix_multipart::form::MultipartForm; use actix_multipart::form::tempfile::TempFile; use actix_multipart::form::text::Text; -use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_multipart::form::MultipartForm; use actix_web::web::Json; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; -use once_cell::sync::Lazy; use utoipa::ToSchema; -use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; -use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; -use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; 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 videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; -use crate::http_server::endpoints::beta_keys::create_beta_keys_handler::CreateBetaKeysError; -use crate::http_server::endpoints::media_files::upload::upload_engine_asset::drain_multipart_request::drain_multipart_request; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; -use crate::http_server::endpoints::media_files::upload::upload_new_scene_media_file_handler::UploadNewSceneMediaFileForm; use crate::http_server::endpoints::media_files::upload::upload_pmx::extract_and_upload_pmx_files::{extract_and_upload_pmx_files, PmxError}; +use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::http_server::web_utils::user_session::require_moderator::{require_moderator, RequireModeratorError, UseDatabase}; use crate::state::server_state::ServerState; -use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; /// Form-multipart request fields. /// diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_saved_scene_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_saved_scene_media_file_handler.rs index b1931a8dd5..7181c09298 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_saved_scene_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_saved_scene_media_file_handler.rs @@ -1,38 +1,25 @@ -use std::collections::HashSet; -use std::io::{BufReader, Bytes, Cursor, Read}; +use std::io::Read; use std::path::PathBuf; use std::sync::Arc; -use actix_multipart::form::MultipartForm; use actix_multipart::form::tempfile::TempFile; use actix_multipart::form::text::Text; -use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_multipart::form::MultipartForm; use actix_web::web::{Json, Path}; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; -use once_cell::sync::Lazy; -use stripe::CreatePaymentLinkShippingAddressCollectionAllowedCountries::Mf; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; -use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; -use mysql_queries::queries::media_files::edit::update_media_file_stored_cloud_contents::{UpdateArgs, updated_media_file_stored_cloud_contents}; +use mysql_queries::queries::media_files::edit::update_media_file_stored_cloud_contents::{updated_media_file_stored_cloud_contents, UpdateArgs}; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use tokens::tokens::media_files::MediaFileToken; -use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; -use crate::http_server::endpoints::media_files::get::get_media_file_handler::GetMediaFilePathInfo; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; -use crate::http_server::endpoints::media_files::upsert_upload::write_error::MediaFileWriteError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs index c51a6706ef..0ee0deddcb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs @@ -1,17 +1,13 @@ -use std::collections::HashSet; -use std::io::{BufReader, Bytes, Cursor, Read}; +use std::io::Read; use std::path::PathBuf; use std::sync::Arc; -use actix_multipart::form::MultipartForm; use actix_multipart::form::tempfile::TempFile; use actix_multipart::form::text::Text; -use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_multipart::form::MultipartForm; use actix_web::web::Json; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; -use once_cell::sync::Lazy; -use stripe::CreatePaymentLinkShippingAddressCollectionAllowedCountries::Mf; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -21,18 +17,13 @@ use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; -use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; -use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use tokens::tokens::media_files::MediaFileToken; -use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; -use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult}; /// Form-multipart request fields. /// diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/extract_frames_from_zip.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/extract_frames_from_zip.rs index b71ec87259..2b0bcfe024 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/extract_frames_from_zip.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/extract_frames_from_zip.rs @@ -1,8 +1,8 @@ -use std::collections::{HashMap, HashSet}; -use std::io::{BufReader, Cursor, Read}; +use std::collections::HashSet; +use std::io::{BufReader, Cursor}; use std::path::{Path, PathBuf}; -use log::{debug, error, info, warn}; +use log::{debug, error, info}; use once_cell::sync::Lazy; use zip::ZipArchive; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs index a45309d4a6..4938b23d40 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs @@ -1,47 +1,30 @@ -use std::collections::HashSet; -use std::io::{BufReader, Cursor, Read}; +use std::io::Read; use std::path::PathBuf; use std::sync::Arc; -use actix_multipart::form::MultipartForm; use actix_multipart::form::tempfile::TempFile; use actix_multipart::form::text::Text; -use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_multipart::form::MultipartForm; use actix_web::web::Json; +use actix_web::{web, HttpRequest}; use log::{error, info, warn}; -use once_cell::sync::Lazy; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use filesys::file_size::file_size; -use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use hashing::sha256::sha256_hash_file::sha256_hash_file; -use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; -use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::create::insert_media_file_from_studio_scene_render::{insert_media_file_from_studio_scene_render, InsertStudioSceneRenderArgs}; -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 videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; -use crate::http_server::endpoints::beta_keys::create_beta_keys_handler::CreateBetaKeysError; -use crate::http_server::endpoints::media_files::upload::upload_engine_asset::drain_multipart_request::drain_multipart_request; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; -use crate::http_server::endpoints::media_files::upload::upload_new_scene_media_file_handler::UploadNewSceneMediaFileForm; -use crate::http_server::endpoints::media_files::upload::upload_pmx::extract_and_upload_pmx_files::{extract_and_upload_pmx_files, PmxError}; use crate::http_server::endpoints::media_files::upload::upload_studio_shot::extract_frames_from_zip::{extract_frames_from_zip, ExtractFramesError}; use crate::http_server::endpoints::media_files::upload::upload_studio_shot::ffmpeg_frames_to_mp4::ffmpeg_frames_to_mp4; use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use crate::http_server::web_utils::user_session::require_moderator::{require_moderator, RequireModeratorError, UseDatabase}; use crate::http_server::web_utils::user_session::require_user_session_using_connection::require_user_session_using_connection; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/ffmpeg_trim_and_resample.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/ffmpeg_trim_and_resample.rs index 190eca520b..061ebcc89b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/ffmpeg_trim_and_resample.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/ffmpeg_trim_and_resample.rs @@ -1,14 +1,12 @@ use anyhow::bail; use log::{error, info}; use std::io::Write; -use std::path::{Path, PathBuf}; +use std::path::Path; use std::process::Command; use std::time::Duration; use errors::AnyhowResult; -use filesys::path_to_string::path_to_string; use videos::ffmpeg_timestamp_from_duration::ffmpeg_timestamp_from_duration; -use videos::ffprobe_get_info::{ffprobe_get_info, VideoDimensions, VideoDuration, VideoFrameRate}; pub struct Args<'a> { pub video_input_path: &'a Path, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/upload_new_video_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/upload_new_video_media_file_handler.rs index db0f5e981a..433ba50076 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/upload_new_video_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/upload_new_video_media_file_handler.rs @@ -1,54 +1,38 @@ use std::collections::HashSet; -use std::fs; -use std::io::{BufReader, Bytes, Cursor, Read}; +use std::io::Read; use std::path::PathBuf; -use std::str::FromStr; use std::sync::Arc; -use actix_multipart::form::MultipartForm; use actix_multipart::form::tempfile::TempFile; use actix_multipart::form::text::Text; -use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_multipart::form::MultipartForm; use actix_web::web::Json; +use actix_web::{web, HttpRequest}; use log::{debug, error, info, warn}; use once_cell::sync::Lazy; use std::time::Duration; -use stripe::CreatePaymentLinkShippingAddressCollectionAllowedCountries::Mf; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; -use errors::AnyhowResult; -use filesys::directory_exists::directory_exists; -use filesys::file_exists::file_exists; use filesys::file_read_bytes::file_read_bytes; use filesys::path_to_string::path_to_string; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; 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 mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; -use mysql_queries::queries::media_files::get::get_media_file::get_media_file; -use primitives::numerics::i64_to_u64_zero_clamped::i64_to_u64_zero_clamped; -use primitives::numerics::u64_to_i64_saturating::u64_to_i64_saturating; use thumbnail_generator::task_client::thumbnail_task::{ThumbnailTaskBuilder, ThumbnailTaskInputMimeType}; use tokens::tokens::media_files::MediaFileToken; -use videos::ffprobe_get_dimensions::ffprobe_get_dimensions; use videos::ffprobe_get_info::ffprobe_get_info; -use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::endpoints::media_files::upload::upload_video_new::ffmpeg_trim_and_resample::{ffmpeg_trim_and_resample, Args}; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; -use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult}; /// Form-multipart request fields. /// diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/drain_multipart_request.rs index 8c9a2c04f1..0bbdd53801 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/drain_multipart_request.rs @@ -4,7 +4,6 @@ use futures::TryStreamExt; use log::warn; use errors::AnyhowResult; -use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; use crate::http_server::web_utils::read_multipart_field_bytes::{checked_read_multipart_bytes, read_multipart_field_as_text}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/upload_video_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/upload_video_media_file_handler.rs index f63ad23692..e5d9f7eb57 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/upload_video_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/upload_video_media_file_handler.rs @@ -1,5 +1,4 @@ use std::collections::HashSet; -use std::io::{BufReader, Cursor}; use std::sync::Arc; use actix_multipart::Multipart; @@ -19,7 +18,7 @@ use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; 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 videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; +use videos::get_mp4_info::{get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::http_server::endpoints::media_files::upload::upload_video_old::drain_multipart_request::drain_multipart_request; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/drain_multipart_request.rs index 76c07da2b8..ae36a7040f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/drain_multipart_request.rs @@ -1,14 +1,11 @@ use actix_multipart::Multipart; use actix_web::web::BytesMut; -use anyhow::anyhow; use futures::TryStreamExt; -use log::{info, warn}; +use log::warn; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; -use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; use crate::http_server::endpoints::media_files::upsert_upload::write_error::MediaFileWriteError; use crate::http_server::web_utils::read_multipart_field_bytes::{checked_read_multipart_bytes, read_multipart_field_as_text}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/write_engine_asset_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/write_engine_asset_media_file_handler.rs index 4a30eaee78..53737a995a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/write_engine_asset_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/write_engine_asset_media_file_handler.rs @@ -1,13 +1,9 @@ -use std::collections::HashSet; -use std::io::{BufReader, Cursor}; use std::path::PathBuf; use std::sync::Arc; use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; -use once_cell::sync::Lazy; -use stripe::CreatePaymentLinkShippingAddressCollectionAllowedCountries::Mf; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; @@ -16,19 +12,16 @@ use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; -use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; -use mysql_queries::queries::media_files::upsert::upsert_media_file_from_file_upload::{UploadType, upsert_media_file_from_file_upload, UpsertMediaFileFromUploadArgs}; +use mysql_queries::queries::media_files::upsert::upsert_media_file_from_file_upload::{upsert_media_file_from_file_upload, UploadType, UpsertMediaFileFromUploadArgs}; use tokens::tokens::media_files::MediaFileToken; -use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; use crate::http_server::endpoints::media_files::upsert_upload::write_engine_asset::drain_multipart_request::drain_multipart_request; use crate::http_server::endpoints::media_files::upsert_upload::write_error::MediaFileWriteError; +use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult}; -use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; // Unlike the "upload" endpoints, which are pure inserts, these endpoints are *upserts*. #[derive(Serialize, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/drain_multipart_request.rs index 0de10520b8..f90f945a19 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/drain_multipart_request.rs @@ -1,15 +1,9 @@ use actix_multipart::Multipart; use actix_web::web::BytesMut; -use anyhow::anyhow; use futures::TryStreamExt; use log::warn; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; -use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; use crate::http_server::endpoints::media_files::upsert_upload::write_error::MediaFileWriteError; use crate::http_server::web_utils::read_multipart_field_bytes::{checked_read_multipart_bytes, read_multipart_field_as_text}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/write_scene_file_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/write_scene_file_media_file_handler.rs index de79d56d6f..16f3b896eb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/write_scene_file_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/write_scene_file_media_file_handler.rs @@ -1,36 +1,28 @@ -use std::collections::HashSet; -use std::io::{BufReader, Cursor}; use std::path::PathBuf; use std::sync::Arc; use actix_multipart::Multipart; -use actix_web::{HttpRequest, HttpResponse, web}; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; -use once_cell::sync::Lazy; -use stripe::CreatePaymentLinkShippingAddressCollectionAllowedCountries::Mf; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_subtype::MediaFileSubtype; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; -use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; -use mysql_queries::queries::media_files::upsert::upsert_media_file_from_file_upload::{UploadType, upsert_media_file_from_file_upload, UpsertMediaFileFromUploadArgs}; +use mysql_queries::queries::media_files::upsert::upsert_media_file_from_file_upload::{upsert_media_file_from_file_upload, UploadType, UpsertMediaFileFromUploadArgs}; use tokens::tokens::media_files::MediaFileToken; -use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; use crate::http_server::endpoints::media_files::upsert_upload::write_error::MediaFileWriteError; use crate::http_server::endpoints::media_files::upsert_upload::write_scene_file::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; use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult}; -use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; // Unlike the "upload" endpoints, which are pure inserts, these endpoints are *upserts*. #[derive(Serialize, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs index 98a11e2c49..4af88f31fe 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs @@ -1,8 +1,8 @@ use std::ops::Deref; use std::sync::Arc; -use actix_web::{get, HttpRequest, HttpResponse, Responder, web}; use actix_web::http::header::LOCATION; +use actix_web::{get, web, HttpRequest, HttpResponse, Responder}; use log::info; use crate::http_server::endpoints::misc::alpha_cookie::alpha_cookie; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs index 7a6d634d90..8b2e1acb4e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs @@ -1,8 +1,8 @@ use std::sync::Arc; -use actix_web::{get, HttpMessage, HttpRequest, HttpResponse, Responder, web}; use actix_web::http::StatusCode; use actix_web::web::Query; +use actix_web::{get, web, HttpMessage, HttpRequest, HttpResponse, Responder}; use log::info; use crate::http_server::endpoints::misc::alpha_cookie::{alpha_cookie, ALPHA_COOKIE_NAME}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/root_index.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/root_index.rs index 042ec4461f..5059c499fa 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/root_index.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/root_index.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use actix_web::http::StatusCode; -use actix_web::HttpResponse; use actix_web::web::Data; +use actix_web::HttpResponse; use log::debug; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs index a2cc41209c..0a12b2fcb7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs @@ -5,21 +5,18 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Json; use actix_web::{web, HttpRequest, HttpResponse}; -use log::{info, log, warn}; +use log::warn; use utoipa::ToSchema; use config::bad_urls::is_bad_tts_model_download_url; -use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; use mysql_queries::payloads::generic_inference_args::inner_payloads::gptsovits_payload::GptSovitsPayload; -use mysql_queries::queries::generic_download::web::insert_generic_download_job::{insert_generic_download_job, InsertGenericDownloadJobArgs}; use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs}; use primitives::traits::trim_or_emptyable::TrimOrEmptyable; use tokens::tokens::generic_inference_jobs::InferenceJobToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/info/moderator_token_info_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/info/moderator_token_info_handler.rs index 4b685965be..2883dbb1dd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/info/moderator_token_info_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/info/moderator_token_info_handler.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use serde::Serialize; use sqlx::MySqlPool; use utoipa::ToSchema; @@ -14,20 +14,17 @@ use errors::AnyhowResult; use mysql_queries::queries::generic_inference::web::get_inference_job_status::get_inference_job_status; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token; -use mysql_queries::queries::model_weights::model_weight_info_lite::get_model_weight_info_lite::get_model_weight_info_lite; use mysql_queries::queries::prompts::get_prompt::get_prompt; -use mysql_queries::queries::tts::tts_inference_jobs::get_pending_tts_inference_job_detailed_stats::{get_pending_tts_inference_job_detailed_stats, PendingCountResult}; use mysql_queries::queries::users::user_profiles::get_user_profile_by_token::get_user_profile_by_token; use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; -use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::prompts::PromptToken; use tokens::tokens::users::UserToken; -use crate::http_server::web_utils::user_session::require_moderator::{require_moderator, RequireModeratorError, UseDatabase}; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; +use crate::http_server::web_utils::user_session::require_moderator::{require_moderator, RequireModeratorError, UseDatabase}; use crate::state::server_state::ServerState; /// For the URL PathInfo diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs index 1f67129e01..8dcd3a8d5e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{info, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::{info, warn}; use mysql_queries::queries::ip_bans::upsert_ip_ban::{upsert_ip_ban, UpsertIpBanArgs}; use user_input_common::validate_user_provided_ip_address::validate_user_provided_ip_address; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs index 4b85f18332..eb938cb95a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs @@ -1,13 +1,13 @@ use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use derive_more::Display; -use log::{info, log, warn}; +use log::{info, warn}; -use mysql_queries::queries::ip_bans::toggle_ip_ban::{IpBanToggleState, toggle_ip_ban}; +use mysql_queries::queries::ip_bans::toggle_ip_ban::{toggle_ip_ban, IpBanToggleState}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs index 332c422adf..bc3e1c4d53 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs @@ -1,12 +1,12 @@ use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use derive_more::Display; -use log::{error, log, warn}; +use log::{error, warn}; use mysql_queries::queries::ip_bans::get_ip_ban::get_ip_ban; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs index 90b80a320d..a9ccdde7a7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs @@ -1,10 +1,10 @@ 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 chrono::{DateTime, Utc}; -use log::{error, log, warn}; +use log::{error, warn}; use mysql_queries::queries::ip_bans::list_ip_bans::list_ip_bans; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs index 0c95dbb106..c7e3fe69bc 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::tts::tts_inference_jobs::get_pending_tts_inference_job_detailed_stats::{get_pending_tts_inference_job_detailed_stats, PendingCountResult}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs index 9852d5e257..b76efeaf17 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::{error, warn}; use mysql_queries::queries::w2l::w2l_inference_jobs::get_pending_w2l_inference_job_detailed_stats::{get_pending_w2l_inference_job_detailed_stats, PendingCountResult}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs index d6cb018194..f7751e690b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs @@ -1,13 +1,13 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::{error, warn}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use mysql_queries::queries::tts::tts_inference_jobs::kill_tts_inference_jobs::{JobStatus, kill_tts_inference_jobs}; +use mysql_queries::queries::tts::tts_inference_jobs::kill_tts_inference_jobs::{kill_tts_inference_jobs, JobStatus}; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs index 5d149fba5b..707f8cd0d6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::users::user::update::set_user_ban_status::{set_user_ban_status, SetUserBanStatsArgs}; use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs index 77e6b9c4e7..bba0d7ad31 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/edit_user_feature_flags_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/edit_user_feature_flags_handler.rs index 02c6664bf1..9e9e223820 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/edit_user_feature_flags_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/edit_user_feature_flags_handler.rs @@ -3,25 +3,20 @@ use std::fmt; use std::iter::FromIterator; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Data, Json, Path}; -use log::{info, log, warn}; -use r2d2_redis::{r2d2, RedisConnectionManager}; +use actix_web::{HttpRequest, HttpResponse}; +use log::warn; use r2d2_redis::redis::Commands; +use r2d2_redis::{r2d2, RedisConnectionManager}; use utoipa::ToSchema; -use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity; -use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; use enums::by_table::users::user_feature_flag::UserFeatureFlag; use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::queries::audit_logs::insert_audit_log::{insert_audit_log, InsertAuditLogArgs}; use mysql_queries::queries::users::user::get::get_user_token_by_username::get_user_token_by_username; use mysql_queries::queries::users::user::update::set_user_feature_flags::{set_user_feature_flags, SetUserFeatureFlagArgs}; use mysql_queries::queries::users::user_profiles::get_user_profile_by_token::get_user_profile_by_token; -use mysql_queries::queries::users::user_sessions::get_user_session_by_token::get_user_session_by_token; -use redis_caching::redis_ttl_cache::RedisTtlCache; use tokens::tokens::users::UserToken; use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/get_prompt_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/get_prompt_handler.rs index 0852eb51db..cb9045c5d0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/get_prompt_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/get_prompt_handler.rs @@ -1,32 +1,20 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; use utoipa::ToSchema; -use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::visibility::Visibility; use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; -use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use mysql_queries::queries::prompts::get_prompt::get_prompt; -use mysql_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; -use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; -use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::prompts::PromptToken; -use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use crate::http_server::endpoints::media_files::get::get_media_file_handler::GetMediaFileError; -use crate::http_server::web_utils::user_session::require_user_session::require_user_session; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs index f26ff44934..4ec7014312 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs @@ -1,11 +1,11 @@ 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, HttpRequest, HttpResponse}; use chrono::NaiveDateTime; -use log::{error, log}; +use log::error; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/stats/get_unified_queue_stats_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/stats/get_unified_queue_stats_handler.rs index a60d073883..f2b97cb218 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/stats/get_unified_queue_stats_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/stats/get_unified_queue_stats_handler.rs @@ -1,13 +1,13 @@ use std::sync::Arc; -use actix_web::{http::StatusCode, HttpRequest, HttpResponse, ResponseError, web}; +use actix_web::{http::StatusCode, web, HttpRequest, HttpResponse, ResponseError}; use chrono::NaiveDateTime; use log::{debug, error, warn}; -use utoipa::ToSchema; use mysql_queries::queries::stats::get_unified_queue_stats::get_unified_queue_stats; use redis_common::redis_cache_keys::RedisCacheKeys; +use utoipa::ToSchema; -use crate::http_server::endpoints::stats::result_transformer::{CacheableQueueStats, database_result_to_cacheable}; +use crate::http_server::endpoints::stats::result_transformer::{database_result_to_cacheable, CacheableQueueStats}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs index fe0bebf503..f8baba2590 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs @@ -14,29 +14,19 @@ use utoipa::ToSchema; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; -use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; use mysql_queries::payloads::generic_inference_args::inner_payloads::studio_gen2_payload::StudioGen2Payload; -use mysql_queries::payloads::generic_inference_args::inner_payloads::workflow_payload::{WorkflowArgs, WorkflowType}; use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs}; use mysql_queries::queries::generic_inference::web::kill_jobs_in_development::kill_jobs_in_development; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use primitives::lazy_any_option_true::lazy_any_option_true; -use primitives::str_to_bool::str_to_bool; -use primitives::traits::trim_or_emptyable::TrimOrEmptyable; -use primitives::try_str_to_num::try_str_to_num; use tokens::tokens::generic_inference_jobs::InferenceJobToken; 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::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; @@ -44,7 +34,6 @@ use crate::http_server::validations::validate_idempotency_token_format::validate use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; use crate::util::allowed_video_style_transfer_access::allowed_video_style_transfer_access; -use crate::util::cleaners::empty_media_file_token_to_null::empty_media_file_token_to_null; #[derive(Deserialize, ToSchema)] pub struct EnqueueStudioGen2Request { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/unsubscribe_reason.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/unsubscribe_reason.rs index bfea2aff0c..ee3a0361dd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/unsubscribe_reason.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/unsubscribe_reason.rs @@ -1,7 +1,7 @@ use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use actix_web::http::StatusCode; +use actix_web::{web, HttpRequest, HttpResponse, ResponseError}; use log::{error, info}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tags/list_tags_for_entity_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tags/list_tags_for_entity_handler.rs index dd9865ce2f..aec672cb12 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tags/list_tags_for_entity_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tags/list_tags_for_entity_handler.rs @@ -7,42 +7,19 @@ use std::fmt; use std::sync::Arc; use crate::http_server::common_responses::tag_info::TagInfo; -use crate::http_server::endpoints::comments::list_comments_handler::ListCommentsPathInfo; -use crate::http_server::endpoints::media_files::edit::set_media_file_cover_image_handler::SetMediaFileCoverImageError; -use crate::http_server::endpoints::users::edit_username_handler::EditUsernameError; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::http_server::web_utils::user_session::require_user_session_using_connection::require_user_session_using_connection; use crate::state::server_state::ServerState; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Json, Path}; use actix_web::{web, HttpRequest, HttpResponse}; use composite_identifiers::by_table::tag_uses::tag_use_entity::TagUseEntity; -use enums::by_table::comments::comment_entity_type::CommentEntityType; use enums::by_table::tag_uses::tag_use_entity_type::TagUseEntityType; -use http_server_common::request::get_request_ip::get_request_ip; use log::warn; -use markdown::simple_markdown_to_html::simple_markdown_to_html; -use mysql_queries::queries::comments::comment_entity_token::CommentEntityToken; -use mysql_queries::queries::comments::insert_comment::{insert_comment, InsertCommentArgs}; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, get_media_file_with_transactor}; -use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token_with_transactor; -use mysql_queries::queries::tags::create_tag::create_tag; use mysql_queries::queries::tags::list_tags_for_entity::list_tags_for_entity; -use mysql_queries::queries::tags::select_matching_tags::select_matching_tags; -use mysql_queries::queries::tags::update_tags_for_entity::update_tags_for_entity; use mysql_queries::utils::transactor::Transactor; -use sqlx::MySqlConnection; -use tokens::tokens::comments::CommentToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; -use tokens::tokens::tags::TagToken; -use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::tts_results::TtsResultToken; -use tokens::tokens::users::UserToken; -use tokens::tokens::w2l_results::W2lResultToken; -use tokens::tokens::w2l_templates::W2lTemplateToken; -use user_input_common::check_for_slurs::contains_slurs; use utoipa::ToSchema; /// For the URL PathInfo diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tags/set_tags_for_entity_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tags/set_tags_for_entity_handler.rs index 8097d79a70..5b54fc8590 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tags/set_tags_for_entity_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tags/set_tags_for_entity_handler.rs @@ -7,41 +7,27 @@ use std::fmt; use std::sync::Arc; use crate::http_server::common_responses::tag_info::TagInfo; -use crate::http_server::endpoints::comments::list_comments_handler::ListCommentsPathInfo; -use crate::http_server::endpoints::media_files::edit::set_media_file_cover_image_handler::SetMediaFileCoverImageError; -use crate::http_server::endpoints::users::edit_username_handler::EditUsernameError; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::user_session::require_user_session_using_connection::require_user_session_using_connection; use crate::state::server_state::ServerState; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Data, Json, Path}; -use actix_web::{web, HttpRequest, HttpResponse}; +use actix_web::{HttpRequest, HttpResponse}; use composite_identifiers::by_table::tag_uses::tag_use_entity::TagUseEntity; -use enums::by_table::comments::comment_entity_type::CommentEntityType; use enums::by_table::tag_uses::tag_use_entity_type::TagUseEntityType; -use http_server_common::request::get_request_ip::get_request_ip; use log::warn; -use markdown::simple_markdown_to_html::simple_markdown_to_html; -use mysql_queries::queries::comments::comment_entity_token::CommentEntityToken; -use mysql_queries::queries::comments::insert_comment::{insert_comment, InsertCommentArgs}; -use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, get_media_file_with_transactor}; +use mysql_queries::queries::media_files::get::get_media_file::get_media_file_with_transactor; use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token_with_transactor; use mysql_queries::queries::tags::create_tag::create_tag; use mysql_queries::queries::tags::select_matching_tags::select_matching_tags; use mysql_queries::queries::tags::update_tags_for_entity::update_tags_for_entity; use mysql_queries::utils::transactor::Transactor; use sqlx::MySqlConnection; -use tokens::tokens::comments::CommentToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::tags::TagToken; -use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::tts_results::TtsResultToken; use tokens::tokens::users::UserToken; -use tokens::tokens::w2l_results::W2lResultToken; -use tokens::tokens::w2l_templates::W2lTemplateToken; -use user_input_common::check_for_slurs::contains_slurs; use utoipa::ToSchema; /// Maximum number of tags allowed per item. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs index 9c2759d883..a5fbcbbede 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs @@ -11,9 +11,9 @@ use std::collections::HashMap; 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, HttpRequest, HttpResponse}; use log::error; use enums::by_table::trending_model_analytics::window_name::WindowName; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs index 1e34974229..f62c464173 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::tts::tts_models::delete_tts_model_various_scopes::delete_tts_model_as_mod; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs index b0b0d977f4..a2c5e4ab38 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs @@ -1,11 +1,11 @@ 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::Path; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::tts::tts_results::delete_tts_result_various_scopes::delete_tts_inference_result_as_mod; use mysql_queries::queries::tts::tts_results::delete_tts_result_various_scopes::delete_tts_inference_result_as_user; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs index 0483a12d63..5d7661bfcd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs @@ -6,16 +6,21 @@ 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, Path}; +use actix_web::{web, HttpRequest, HttpResponse}; use language_tags::LanguageTag; use log::{error, info, warn}; use sqlx::MySqlPool; +use crate::configs::supported_languages_for_models::get_canonicalized_language_tag_for_model; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; +use crate::http_server::web_utils::response_success_helpers::simple_json_success; +use crate::state::server_state::ServerState; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; +use markdown::simple_markdown_to_html::simple_markdown_to_html; use mysql_queries::column_types::vocoder_type::VocoderType; use mysql_queries::queries::tts::tts_models::edit_tts_model_details::{edit_tts_model_details_as_author, edit_tts_model_details_as_mod}; use mysql_queries::queries::tts::tts_models::edit_tts_model_moderator_details::edit_tts_model_moderator_details; @@ -23,11 +28,6 @@ use mysql_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_tok use redis_common::redis_cache_keys::RedisCacheKeys; use tts_common::text_pipelines::text_pipeline_type::TextPipelineType; use user_input_common::check_for_slurs::contains_slurs; -use markdown::simple_markdown_to_html::simple_markdown_to_html; -use crate::configs::supported_languages_for_models::get_canonicalized_language_tag_for_model; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; -use crate::state::server_state::ServerState; const DEFAULT_IETF_LANGUAGE_TAG : &str = "en-US"; const DEFAULT_IETF_PRIMARY_LANGUAGE_SUBTAG : &str = "en"; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs index 31dd3a5def..ddc83fb285 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs @@ -6,15 +6,15 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, warn}; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::queries::tts::tts_results::edit_tts_result::{CreatorOrModFields, edit_tts_result, EditTtsResultArgs}; +use mysql_queries::queries::tts::tts_results::edit_tts_result::{edit_tts_result, CreatorOrModFields, EditTtsResultArgs}; use mysql_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/get_tts_model_with_caching.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/get_tts_model_with_caching.rs index 9ec2a8f5ba..ea05534c0c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/get_tts_model_with_caching.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/get_tts_model_with_caching.rs @@ -1,6 +1,6 @@ use log::error; -use sqlx::MySql; use sqlx::pool::PoolConnection; +use sqlx::MySql; use errors::AnyhowResult; use migration::text_to_speech::get_tts_model_for_enqueue_inference_migration::{get_tts_model_for_enqueue_inference_migration, TtsModelForEnqueueInferenceMigrationWrapper}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs index 89f46749f9..c10ce7ad72 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs @@ -6,9 +6,9 @@ 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, HttpRequest, HttpResponse}; use log::warn; use config::bad_urls::is_bad_tts_model_download_url; @@ -18,9 +18,9 @@ use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::generic_download::web::insert_generic_download_job::{insert_generic_download_job, InsertGenericDownloadJobArgs}; use mysql_queries::queries::tts::tts_model_upload_jobs::insert_tts_model_upload_job::{insert_tts_model_upload_job, InsertTtsModelUploadJobArgs}; +use crate::http_server::validations::validate_model_title::validate_model_title; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; -use crate::http_server::validations::validate_model_title::validate_model_title; #[derive(Deserialize, Copy, Clone)] pub enum SupportedTtsModelType { 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 c0f745b652..83b7f7d7f2 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 @@ -1,7 +1,7 @@ use std::fmt; use std::sync::Arc; -use actix_web::{http::StatusCode, HttpRequest, HttpResponse, ResponseError, web}; +use actix_web::{http::StatusCode, web, HttpRequest, HttpResponse, ResponseError}; use chrono::NaiveDateTime; use log::{debug, error, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs index 1590939bfa..fc6df486df 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs @@ -1,12 +1,12 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{error, log}; +use log::error; use r2d2_redis::redis::{Commands, RedisResult}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs index f041a67cd5..16f882b95b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs @@ -6,13 +6,15 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; +use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; +use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; use enums::by_table::tts_models::tts_model_type::TtsModelType; use enums::common::visibility::Visibility; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; @@ -22,8 +24,6 @@ use redis_common::redis_cache_keys::RedisCacheKeys; use tokens::tokens::model_weights::ModelWeightToken; use tts_common::text_pipelines::guess_pipeline::guess_text_pipeline_heuristic; use tts_common::text_pipelines::text_pipeline_type::TextPipelineType; -use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; -use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; use crate::state::server_state::ServerState; use crate::util::title_to_url_slug::title_to_url_slug; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs index 06c6fa6b1d..fb9a5047df 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs @@ -1,11 +1,11 @@ use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use derive_more::Display; -use log::{log, warn}; +use log::warn; use r2d2_redis::redis::Commands; use redis_common::redis_keys::RedisKeys; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs index 52876c3429..1f266534a4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs @@ -1,11 +1,11 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; -use log::{log, warn}; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use log::warn; use mysql_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; use mysql_queries::queries::tts::tts_results::query_tts_result::TtsResultRecordForResponse; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs index 6b29db5075..12f6875119 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs @@ -1,12 +1,12 @@ use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use derive_more::Display; -use log::{error, log, warn}; +use log::{error, warn}; use r2d2_redis::redis::Commands; use mysql_queries::queries::tts::tts_model_upload_jobs::get_tts_model_upload_job_status::get_tts_model_upload_job_status; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs index 91cfe8697d..867b5a95b5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs @@ -7,14 +7,14 @@ use std::collections::HashSet; 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use lexical_sort::natural_lexical_cmp; use log::{error, info, warn}; -use sqlx::MySql; use sqlx::pool::PoolConnection; +use sqlx::MySql; use enums::by_table::tts_models::tts_model_type::TtsModelType; use enums::common::visibility::Visibility; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs index 302eda946c..8f6f47d7a8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs @@ -1,14 +1,13 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::header::ContentType; use actix_web::http::StatusCode; use actix_web::web::{Path, Query}; -use log::{info, log, warn}; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use log::warn; -use http_server_common::error::simple_json_error_response::simple_json_error_response; use mysql_queries::queries::tts::tts_results::list_tts_results_query_builder::{ListTtsResultsQueryBuilder, TtsInferenceRecordForList}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs index 2f53312313..328b96c40b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs @@ -1,12 +1,12 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpMessage, HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::header::ContentType; use actix_web::http::StatusCode; use actix_web::web::Path; -use log::{info, log, warn}; +use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; +use log::{info, warn}; use mysql_queries::queries::tts::tts_models::list_tts_models::{list_tts_models, TtsModelRecordForList}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/search_tts_models_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/search_tts_models_handler.rs index c3fc56f3f3..da122215b5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/search_tts_models_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/search_tts_models_handler.rs @@ -7,9 +7,9 @@ use std::collections::HashSet; 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/batch_get_user_bookmarks_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/batch_get_user_bookmarks_handler.rs index 9c02f7ca47..ade6a1da25 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/batch_get_user_bookmarks_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/batch_get_user_bookmarks_handler.rs @@ -1,8 +1,8 @@ use std::collections::{HashMap, HashSet}; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use actix_web::http::StatusCode; +use actix_web::{web, HttpRequest, HttpResponse, ResponseError}; use actix_web_lab::extract::Query; use log::error; use utoipa::{IntoParams, ToSchema}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/create_user_bookmark_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/create_user_bookmark_handler.rs index 66f7aeb40c..a697a8ca44 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/create_user_bookmark_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/create_user_bookmark_handler.rs @@ -6,19 +6,19 @@ 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, HttpRequest, HttpResponse}; use log::{error, warn}; use sqlx::Acquire; use utoipa::ToSchema; use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; use mysql_queries::queries::entity_stats::stats_entity_token::StatsEntityToken; -use mysql_queries::queries::entity_stats::upsert_entity_stats_on_bookmark_event::{BookmarkAction, upsert_entity_stats_on_bookmark_event, UpsertEntityStatsArgs}; +use mysql_queries::queries::entity_stats::upsert_entity_stats_on_bookmark_event::{upsert_entity_stats_on_bookmark_event, BookmarkAction, UpsertEntityStatsArgs}; use mysql_queries::queries::users::user_bookmarks::get_total_bookmark_count_for_entity::get_total_bookmark_count_for_entity; -use mysql_queries::queries::users::user_bookmarks::get_user_bookmark_transactional_locking::{BookmarkIdentifier, get_user_bookmark_transactional_locking}; -use mysql_queries::queries::users::user_bookmarks::upsert_user_bookmark::{CreateUserBookmarkArgs, upsert_user_bookmark}; +use mysql_queries::queries::users::user_bookmarks::get_user_bookmark_transactional_locking::{get_user_bookmark_transactional_locking, BookmarkIdentifier}; +use mysql_queries::queries::users::user_bookmarks::upsert_user_bookmark::{upsert_user_bookmark, CreateUserBookmarkArgs}; use mysql_queries::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/delete_user_bookmark_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/delete_user_bookmark_handler.rs index f8e48ce0c2..e6295cce29 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/delete_user_bookmark_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/delete_user_bookmark_handler.rs @@ -6,18 +6,18 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; use sqlx::Acquire; use utoipa::ToSchema; use mysql_queries::queries::entity_stats::stats_entity_token::StatsEntityToken; -use mysql_queries::queries::entity_stats::upsert_entity_stats_on_bookmark_event::{BookmarkAction, upsert_entity_stats_on_bookmark_event, UpsertEntityStatsArgs}; +use mysql_queries::queries::entity_stats::upsert_entity_stats_on_bookmark_event::{upsert_entity_stats_on_bookmark_event, BookmarkAction, UpsertEntityStatsArgs}; use mysql_queries::queries::users::user_bookmarks::delete_user_bookmark::delete_user_bookmark; -use mysql_queries::queries::users::user_bookmarks::get_user_bookmark_transactional_locking::{BookmarkIdentifier, get_user_bookmark_transactional_locking}; +use mysql_queries::queries::users::user_bookmarks::get_user_bookmark_transactional_locking::{get_user_bookmark_transactional_locking, BookmarkIdentifier}; use tokens::tokens::user_bookmarks::UserBookmarkToken; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_entity_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_entity_handler.rs index e74e41173a..d99c9ac5fe 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_entity_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_entity_handler.rs @@ -6,19 +6,19 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; use utoipa::ToSchema; +use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight}; use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; use mysql_queries::queries::users::user_bookmarks::list_user_bookmarks_for_entity::list_user_bookmarks_for_entity; use mysql_queries::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken; use tokens::tokens::user_bookmarks::UserBookmarkToken; -use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_session_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_session_handler.rs index 9e10ca8b98..b427cdbcee 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_session_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_session_handler.rs @@ -1,15 +1,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::Query; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; -use mysql_queries::queries::users::user_bookmarks::list_user_bookmarks::list_user_bookmarks_by_maybe_entity_type; use tokens::tokens::user_bookmarks::UserBookmarkToken; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/batch_get_user_rating_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/batch_get_user_rating_handler.rs index fe33d7c8fa..60d8da4dc6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/batch_get_user_rating_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/batch_get_user_rating_handler.rs @@ -1,8 +1,8 @@ use std::collections::{HashMap, HashSet}; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use actix_web::http::StatusCode; +use actix_web::{web, HttpRequest, HttpResponse, ResponseError}; use actix_web_lab::extract::Query; use log::error; use utoipa::{IntoParams, ToSchema}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs index 8a3f5f1359..1865ed40f0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs @@ -1,7 +1,7 @@ use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use actix_web::http::StatusCode; +use actix_web::{web, HttpRequest, HttpResponse, ResponseError}; use log::{error, info}; use utoipa::ToSchema; @@ -9,7 +9,7 @@ use enums::by_table::user_ratings::entity_type::UserRatingEntityType; use enums::by_table::user_ratings::rating_value::UserRatingValue; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; -use mysql_queries::queries::users::user_ratings::get_user_rating::{Args, get_user_rating}; +use mysql_queries::queries::users::user_ratings::get_user_rating::{get_user_rating, Args}; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::tts_models::TtsModelToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs index 0be428555a..b5fbe5cc97 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs @@ -1,7 +1,7 @@ use std::sync::Arc; -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 sqlx::Acquire; use utoipa::ToSchema; @@ -12,11 +12,11 @@ use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; use mysql_queries::queries::entity_stats::stats_entity_token::StatsEntityToken; -use mysql_queries::queries::entity_stats::upsert_entity_stats_on_ratings_event::{RatingsAction, upsert_entity_stats_on_ratings_event, UpsertEntityStatsArgs}; +use mysql_queries::queries::entity_stats::upsert_entity_stats_on_ratings_event::{upsert_entity_stats_on_ratings_event, RatingsAction, UpsertEntityStatsArgs}; use mysql_queries::queries::users::user_ratings::get_total_user_rating_count_for_entity::get_total_user_rating_count_for_entity; use mysql_queries::queries::users::user_ratings::get_user_rating_transactional_locking::get_user_rating_transactional_locking; use mysql_queries::queries::users::user_ratings::update_tts_model_ratings::update_tts_model_ratings; -use mysql_queries::queries::users::user_ratings::upsert_user_rating::{Args, upsert_user_rating}; +use mysql_queries::queries::users::user_ratings::upsert_user_rating::{upsert_user_rating, Args}; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::tts_models::TtsModelToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs index 7f0d3569a2..1c42b5de19 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs @@ -7,6 +7,13 @@ use std::collections::HashMap; use std::fmt; use std::fmt::Formatter; +use crate::http_server::requests::get_request_signup_source::get_request_signup_source; +use crate::http_server::session::http::http_user_session_manager::HttpUserSessionManager; +use crate::http_server::validations::is_reserved_username::is_reserved_username; +use crate::http_server::validations::validate_passwords::validate_passwords; +use crate::http_server::validations::validate_username::validate_username; +use crate::util::email_to_gravatar::email_to_gravatar; +use crate::util::enroll_in_studio::enroll_in_studio; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{web, HttpRequest, HttpResponse}; @@ -22,13 +29,6 @@ use sqlx::MySqlPool; use tokens::tokens::user_sessions::UserSessionToken; use user_input_common::check_for_slurs::contains_slurs; use utoipa::ToSchema; -use crate::http_server::requests::get_request_signup_source::get_request_signup_source; -use crate::http_server::session::http::http_user_session_manager::HttpUserSessionManager; -use crate::http_server::validations::is_reserved_username::is_reserved_username; -use crate::http_server::validations::validate_passwords::validate_passwords; -use crate::http_server::validations::validate_username::validate_username; -use crate::util::email_to_gravatar::email_to_gravatar; -use crate::util::enroll_in_studio::enroll_in_studio; #[derive(ToSchema, Deserialize)] pub struct CreateAccountRequest { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs index 2e083217c3..072dd8f659 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs @@ -6,15 +6,15 @@ use std::collections::BTreeSet; use std::fmt; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::{error, warn}; -use r2d2_redis::{r2d2, RedisConnectionManager}; use r2d2_redis::r2d2::PooledConnection; use r2d2_redis::redis::Commands; +use r2d2_redis::{r2d2, RedisConnectionManager}; use sqlx::MySqlPool; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/google_sso_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/google_sso_handler.rs index 01e129bd75..9d6aecd08c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/google_sso_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/google_sso_handler.rs @@ -3,52 +3,28 @@ //#![forbid(unused_mut)] //#![forbid(unused_variables)] -use std::collections::{HashMap, HashSet}; use std::fmt; use std::fmt::Formatter; -use crate::http_server::endpoints::beta_keys::redeem_beta_key_handler::RedeemBetaKeyError; -use crate::http_server::endpoints::users::create_account_handler::{CreateAccountErrorResponse, CreateAccountSuccessResponse}; use crate::http_server::endpoints::users::google_sso::check_claims::check_claims; +use crate::http_server::endpoints::users::google_sso::handle_existing_sso_account::{handle_existing_sso_account, ExistingAccountArgs}; use crate::http_server::endpoints::users::google_sso::handle_new_sso_account::{handle_new_sso_account, NewSsoArgs}; -use crate::http_server::endpoints::users::session_info_handler::SessionInfoError; use crate::http_server::session::http::http_user_session_manager::HttpUserSessionManager; -use crate::http_server::validations::is_reserved_username::is_reserved_username; -use crate::http_server::validations::validate_passwords::validate_passwords; -use crate::http_server::validations::validate_username::validate_username; use crate::state::certs::google_sign_in_cert::GoogleSignInCert; -use crate::util::email_to_gravatar::email_to_gravatar; -use crate::util::enroll_in_studio::enroll_in_studio; -use crate::util::generate_random_username::generate_random_username; -use actix_helpers::extractors::get_request_origin_uri::get_request_origin_uri; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Data, Json}; -use actix_web::{web, HttpRequest, HttpResponse}; -use errors::AnyhowResult; -use google_sign_in::certs::download_certs::download_cert_key_set; -use google_sign_in::claims::claims::Claims; -use google_sign_in::decode_and_verify_token_claims::decode_and_verify_token_claims; -use google_sign_in::VerificationOptions; +use actix_web::{HttpRequest, HttpResponse}; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use log::{error, info, warn}; -use mysql_queries::mediators::firehose_publisher::FirehosePublisher; -use mysql_queries::queries::google_sign_in_accounts::get_google_sign_in_account_by_subject::{get_google_sign_in_account, GoogleSignInAccount}; -use mysql_queries::queries::google_sign_in_accounts::insert_google_sign_in_account::{insert_google_sign_in_account, InsertGoogleSignInArgs}; -use mysql_queries::queries::users::user::create::create_account_error::CreateAccountError; -use mysql_queries::queries::users::user::create::create_account_from_google_sso::{create_account_from_google_sso, CreateAccountFromGoogleSsoArgs}; -use mysql_queries::queries::users::user_sessions::create_user_session::create_user_session; +use log::{info, warn}; +use mysql_queries::queries::google_sign_in_accounts::get_google_sign_in_account_by_subject::get_google_sign_in_account; use mysql_queries::queries::users::user_sessions::create_user_session_with_transactor::create_user_session_with_transactor; use mysql_queries::utils::transactor::Transactor; -use password::bcrypt_hash_password::bcrypt_hash_password; -use sqlx::pool::PoolConnection; -use sqlx::{Acquire, MySql, MySqlPool}; +use sqlx::{Acquire, MySqlPool}; use tokens::tokens::user_sessions::UserSessionToken; use tokens::tokens::users::UserToken; -use user_input_common::check_for_slurs::contains_slurs; use utoipa::ToSchema; -use crate::http_server::endpoints::users::google_sso::handle_existing_sso_account::{handle_existing_sso_account, ExistingAccountArgs}; /* ALGORITHM --> [SSO RECORD LOOKUP] --> I. SSO Record Exists diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_existing_sso_account.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_existing_sso_account.rs index b8ad3e8874..493071546d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_existing_sso_account.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_existing_sso_account.rs @@ -1,5 +1,4 @@ use crate::http_server::endpoints::users::google_sso::google_sso_handler::GoogleCreateAccountErrorResponse; -use crate::http_server::endpoints::users::google_sso::handle_new_sso_account::NewSsoAccountInfo; use actix_web::HttpRequest; use google_sign_in::claims::claims::Claims; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account.rs index edbc5713ec..50bc9d82af 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account.rs @@ -1,24 +1,14 @@ -use crate::http_server::endpoints::users::google_sso::google_sso_handler::{GoogleCreateAccountErrorResponse, GoogleCreateAccountSuccessResponse}; +use crate::http_server::endpoints::users::google_sso::google_sso_handler::GoogleCreateAccountErrorResponse; use crate::http_server::endpoints::users::google_sso::handle_new_sso_account_for_existing_user::{handle_new_sso_account_for_existing_user, LinkArgs}; use crate::http_server::endpoints::users::google_sso::handle_new_sso_account_for_new_user::{handle_new_sso_account_for_new_user, CreateArgs}; -use crate::http_server::session::http::http_user_session_manager::HttpUserSessionManager; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::util::canonicalize_email_for_users_table::canonicalize_email_for_users_table; -use crate::util::email_to_gravatar::email_to_gravatar; -use crate::util::generate_random_username::generate_random_username; -use actix_web::{HttpRequest, HttpResponse}; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use actix_web::HttpRequest; use google_sign_in::claims::claims::Claims; -use http_server_common::request::get_request_ip::get_request_ip; -use log::{error, info, warn}; -use mysql_queries::queries::google_sign_in_accounts::insert_google_sign_in_account::{insert_google_sign_in_account, InsertGoogleSignInArgs}; -use mysql_queries::queries::users::user::create::create_account_error::CreateAccountError; -use mysql_queries::queries::users::user::create::create_account_from_google_sso::{create_account_from_google_sso, CreateAccountFromGoogleSsoArgs}; +use log::warn; use mysql_queries::queries::users::user::get::lookup_user_for_login_by_email_with_transactor::lookup_user_for_login_by_email_with_transactor; use mysql_queries::utils::transactor::Transactor; use sqlx::pool::PoolConnection; -use sqlx::{Acquire, MySql}; -use tokens::tokens::user_sessions::UserSessionToken; +use sqlx::MySql; use tokens::tokens::users::UserToken; pub struct NewSsoArgs<'a> { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs index 026f7c1119..da7dbb4f02 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs @@ -12,7 +12,6 @@ use log::{error, info, warn}; use mysql_queries::queries::google_sign_in_accounts::insert_google_sign_in_account::{insert_google_sign_in_account, InsertGoogleSignInArgs}; use mysql_queries::queries::users::user::create::create_account_error::CreateAccountError; use mysql_queries::queries::users::user::create::create_account_from_google_sso::{create_account_from_google_sso, CreateAccountFromGoogleSsoArgs}; -use mysql_queries::queries::users::user::get::lookup_user_for_login_result::UserRecordForLogin; use mysql_queries::utils::transactor::Transactor; use sqlx::pool::PoolConnection; use sqlx::{Acquire, MySql}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/logout_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/logout_handler.rs index 9906cdd5d8..392fa298c6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/logout_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/logout_handler.rs @@ -5,9 +5,9 @@ use std::fmt; -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 sqlx::MySqlPool; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_redeem_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_redeem_handler.rs index 0512029713..87516281b7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_redeem_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_redeem_handler.rs @@ -1,7 +1,7 @@ use std::fmt::Display; -use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use actix_web::http::StatusCode; +use actix_web::{web, HttpRequest, HttpResponse, ResponseError}; use log::{error, warn}; use serde::Deserialize; use sqlx::MySqlPool; @@ -15,7 +15,6 @@ use mysql_queries::queries::users::user_sessions::create_user_session::create_us use password::bcrypt_hash_password::bcrypt_hash_password; use tokens::tokens::user_sessions::UserSessionToken; -use crate::http_server::endpoints::users::login_handler::LoginErrorResponse; use crate::http_server::session::http::http_user_session_manager::HttpUserSessionManager; #[derive(Deserialize)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs index 752cd04758..bde4483cb2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs @@ -1,7 +1,7 @@ use std::fmt::Display; -use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use actix_web::http::StatusCode; +use actix_web::{web, HttpRequest, HttpResponse, ResponseError}; use log::{error, warn}; use serde::Deserialize; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs index 5824ffcd62..94d82be33e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs @@ -6,9 +6,9 @@ use std::collections::BTreeSet; use std::fmt; -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 sqlx::MySqlPool; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_token_info_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_token_info_handler.rs index 7d238f0883..a027d6fc0c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_token_info_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_token_info_handler.rs @@ -1,22 +1,15 @@ -use std::collections::BTreeSet; 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::warn; -use sqlx::MySqlPool; use utoipa::ToSchema; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; use http_server_common::response::response_error_helpers::to_simple_json_error; -use tokens::tokens::users::UserToken; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use crate::http_server::cookies::anonymous_visitor_tracking::avt_cookie_manager::AvtCookieManager; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::http_server::session::session_checker::SessionChecker; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs index d8216b3e69..6d9aef306d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::voice_clone_requests::get_voice_clone_request::{get_voice_clone_request_by_token, get_voice_clone_request_by_user_token}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs index 044a830ee3..dbbcb7b52d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs @@ -1,10 +1,10 @@ use std::fmt; use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, web}; use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use log::{log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/list_voice_conversion_models_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/list_voice_conversion_models_handler.rs index e0d8591d11..79a48b9fe1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/list_voice_conversion_models_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/list_voice_conversion_models_handler.rs @@ -6,21 +6,21 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use lexical_sort::natural_lexical_cmp; use log::{debug, error, warn}; -use sqlx::MySql; use sqlx::pool::PoolConnection; +use sqlx::MySql; +use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; use migration::voice_conversion::list_vc_models_for_migration::list_vc_models_for_migration; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs index d957d751a4..fa61549838 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs @@ -5,9 +5,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; @@ -21,14 +21,14 @@ use enums::common::visibility::Visibility; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{ - GenericInferenceArgs, - InferenceCategoryAbbreviated, - PolymorphicInferenceArgs, + GenericInferenceArgs, + InferenceCategoryAbbreviated, + PolymorphicInferenceArgs, }; use mysql_queries::payloads::generic_inference_args::inner_payloads::tts_payload::TTSArgs; use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{ - insert_generic_inference_job, - InsertGenericInferenceArgs, + insert_generic_inference_job, + InsertGenericInferenceArgs, }; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::users::UserToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/delete_sample.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/delete_sample.rs index 8e0b576953..ce3e78f7e1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/delete_sample.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/delete_sample.rs @@ -1,8 +1,8 @@ use std::sync::Arc; -use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use actix_web::http::StatusCode; use actix_web::web::Path; +use actix_web::{web, HttpRequest, HttpResponse, ResponseError}; use log::warn; use http_server_common::response::response_error_helpers::to_simple_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/list_samples_by_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/list_samples_by_dataset.rs index 6d78289133..05433ed4e8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/list_samples_by_dataset.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/list_samples_by_dataset.rs @@ -1,8 +1,8 @@ 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 chrono::{DateTime, Utc}; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/upload_zs_sample.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/upload_zs_sample.rs index 427e670ad9..ee0de9aa6e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/upload_zs_sample.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/upload_zs_sample.rs @@ -7,7 +7,6 @@ use log::{error, info, warn}; use once_cell::sync::Lazy; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType::MediaUpload; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; use enums::by_table::media_uploads::media_upload_type::MediaUploadType; use enums::common::visibility::Visibility; @@ -17,7 +16,6 @@ use http_server_common::response::serialize_as_json_error::serialize_as_json_err use media::decode_basic_audio_info::decode_basic_audio_bytes_info; use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; use mimetypes::mimetype_to_extension::mimetype_to_extension; -use mysql_queries::queries::media_uploads::insert_media_upload::insert_media_upload; use mysql_queries::queries::voice_designer::voice_samples::get_dataset_sample_by_uuid::get_dataset_sample_by_uuid_with_connection; use mysql_queries::queries::voice_designer::voice_samples::insert_dataset_sample_and_media_file::{insert_dataset_sample_and_media_file, InsertDatasetSampleAndMediaFileArgs}; use tokens::tokens::media_files::MediaFileToken; @@ -25,7 +23,6 @@ use tokens::tokens::zs_voice_dataset_samples::ZsVoiceDatasetSampleToken; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; 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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/create_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/create_dataset.rs index 1993816ed4..ee85a82bf7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/create_dataset.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/create_dataset.rs @@ -1,11 +1,10 @@ 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::Path; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::{error, warn}; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/delete_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/delete_dataset.rs index b29a085379..20f1ef279d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/delete_dataset.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/delete_dataset.rs @@ -1,14 +1,12 @@ 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::Path; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; -use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction::Delete; -use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::voice_designer::datasets::delete_dataset::{delete_dataset_as_mod, delete_dataset_as_user, undelete_dataset_as_mod, undelete_dataset_as_user}; use mysql_queries::queries::voice_designer::datasets::get_dataset::get_dataset_by_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/get_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/get_dataset.rs index aa1cbc80c0..da4f538ec2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/get_dataset.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/get_dataset.rs @@ -1,19 +1,17 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; +use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use enums::common::visibility::Visibility; use mysql_queries::queries::voice_designer::datasets::get_dataset::get_dataset_by_token; -use mysql_queries::queries::voice_designer::datasets::list_datasets_by_username::list_datasets_by_username; -use tokens::tokens::users::UserToken; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_session.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_session.rs index 50603407b7..88b789bf2b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_session.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_session.rs @@ -1,16 +1,16 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; +use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use enums::common::visibility::Visibility; use mysql_queries::queries::voice_designer::datasets::list_datasets_by_username::list_datasets_by_username; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_user.rs index 792c6ceb68..c7d92c08dd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_user.rs @@ -1,18 +1,18 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; use utoipa::ToSchema; +use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use enums::common::visibility::Visibility; use mysql_queries::queries::voice_designer::datasets::list_datasets_by_username::list_datasets_by_username; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/update_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/update_dataset.rs index 68a91383c5..fe9b0d2deb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/update_dataset.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/update_dataset.rs @@ -1,17 +1,16 @@ 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::Path; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::{error, warn}; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::response_success_helpers::simple_json_success; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use mysql_queries::queries::voice_designer::datasets::create_dataset::{create_dataset, CreateDatasetArgs}; use mysql_queries::queries::voice_designer::datasets::get_dataset::get_dataset_by_token; use mysql_queries::queries::voice_designer::datasets::update_dataset::{update_dataset, UpdateDatasetArgs}; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs index 05dfab6324..d81cee8e02 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs @@ -19,20 +19,19 @@ use enums::by_table::generic_inference_jobs::inference_model_type::InferenceMode use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{ - GenericInferenceArgs, - InferenceCategoryAbbreviated, - PolymorphicInferenceArgs, + GenericInferenceArgs, + InferenceCategoryAbbreviated, + PolymorphicInferenceArgs, }; use mysql_queries::payloads::generic_inference_args::inner_payloads::tts_payload::TTSArgs; use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{ - insert_generic_inference_job, - InsertGenericInferenceArgs, + insert_generic_inference_job, + InsertGenericInferenceArgs, }; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::users::UserToken; use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session; -use crate::http_server::deprecated_endpoints::media_uploads::common::upload_error::UploadError; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/delete_voice.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/delete_voice.rs index c6ef3102b5..2711e05e4c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/delete_voice.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/delete_voice.rs @@ -1,14 +1,12 @@ 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::Path; -use log::{error, log, warn}; +use actix_web::{web, HttpRequest, HttpResponse}; +use log::warn; -use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction::Delete; -use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::voice_designer::voices::delete_voice::{delete_voice_as_mod, delete_voice_as_user, undelete_voice_as_mod, undelete_voice_as_user}; use mysql_queries::queries::voice_designer::voices::get_voice::get_voice_by_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/get_voice.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/get_voice.rs index 7d570bc087..470ea18f3c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/get_voice.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/get_voice.rs @@ -1,18 +1,17 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; +use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use enums::common::visibility::Visibility; use mysql_queries::queries::voice_designer::voices::get_voice::get_voice_by_token; -use tokens::tokens::users::UserToken; use tokens::tokens::zs_voices::ZsVoiceToken; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_available_voices.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_available_voices.rs index 23c6ce4941..0ec6e14ba5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_available_voices.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_available_voices.rs @@ -1,15 +1,15 @@ 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 chrono::{DateTime, Utc}; use log::{info, warn}; +use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use enums::common::visibility::Visibility; use mysql_queries::queries::voice_designer::voices::list_voices_query_builder::ListVoicesQueryBuilder; use tokens::tokens::zs_voices::ZsVoiceToken; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_session.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_session.rs index d8f732865a..ef34ff9f6a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_session.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_session.rs @@ -1,15 +1,15 @@ 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, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; +use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use mysql_queries::queries::voice_designer::voices::list_voices_by_username::list_zs_voices_by_username; use tokens::tokens::zs_voices::ZsVoiceToken; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_user.rs index ba50076407..757bbcaec0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_user.rs @@ -1,17 +1,17 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; +use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use enums::common::visibility::Visibility; use mysql_queries::queries::voice_designer::voices::list_voices_by_username::list_zs_voices_by_username; use tokens::tokens::zs_voices::ZsVoiceToken; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/update_voice.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/update_voice.rs index 6c04bba1fd..80c74dab5e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/update_voice.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/update_voice.rs @@ -1,10 +1,10 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, warn}; use enums::common::visibility::Visibility; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/fal_webhook_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/fal_webhook_handler.rs index 992e714107..0ed6ddfe07 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/fal_webhook_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/fal_webhook_handler.rs @@ -11,7 +11,6 @@ use actix_web::http::StatusCode; use actix_web::web::Json; use actix_web::{web, HttpRequest, HttpResponse}; use anyhow::Error; -use errors::AnyhowResult; use http_server_common::response::response_success_helpers::SimpleGenericJsonSuccess; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_image_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_image_payload.rs index c431d32746..a0eb32355c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_image_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_image_payload.rs @@ -1,23 +1,18 @@ -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::state::server_state::ServerState; use crate::util::http_download_url_to_bytes::http_download_url_to_bytes; -use crate::util::http_download_url_to_tempfile::http_download_url_to_tempfile; -use actix_web::web; use anyhow::anyhow; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use images::image_info::image_info::ImageInfo; -use log::{info, warn}; +use log::info; use mimetypes::mimetype_info::mimetype_info::MimetypeInfo; use mysql_queries::queries::generic_inference::fal::get_inference_job_by_fal_id::FalJobDetails; use mysql_queries::queries::media_files::create::insert_builder::media_file_insert_builder::MediaFileInsertBuilder; use serde_json::{Map, Value}; -use std::sync::Arc; use tokens::tokens::media_files::MediaFileToken; const PREFIX : Option<&str> = Some("artcraft_"); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_images_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_images_payload.rs index 1e23305fd2..f863495a90 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_images_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_images_payload.rs @@ -1,23 +1,18 @@ -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::state::server_state::ServerState; use crate::util::http_download_url_to_bytes::http_download_url_to_bytes; -use crate::util::http_download_url_to_tempfile::http_download_url_to_tempfile; -use actix_web::web; use anyhow::anyhow; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use images::image_info::image_info::ImageInfo; -use log::{info, warn}; +use log::info; use mimetypes::mimetype_info::mimetype_info::MimetypeInfo; use mysql_queries::queries::generic_inference::fal::get_inference_job_by_fal_id::FalJobDetails; use mysql_queries::queries::media_files::create::insert_builder::media_file_insert_builder::MediaFileInsertBuilder; use serde_json::{Map, Value}; -use std::sync::Arc; use tokens::tokens::media_files::MediaFileToken; const PREFIX : Option<&str> = Some("artcraft_"); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_mesh_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_mesh_payload.rs index 6cbf650f82..27050ddbfc 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_mesh_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_mesh_payload.rs @@ -1,24 +1,18 @@ -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::state::server_state::ServerState; use crate::util::http_download_url_to_bytes::http_download_url_to_bytes; -use crate::util::http_download_url_to_tempfile::http_download_url_to_tempfile; -use actix_web::web; use anyhow::anyhow; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_class::MediaFileClass; +use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; -use images::image_info::image_info::ImageInfo; -use log::{info, warn}; +use log::info; use mimetypes::mimetype_info::mimetype_info::MimetypeInfo; use mysql_queries::queries::generic_inference::fal::get_inference_job_by_fal_id::FalJobDetails; use mysql_queries::queries::media_files::create::insert_builder::media_file_insert_builder::MediaFileInsertBuilder; use serde_json::{Map, Value}; -use std::sync::Arc; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use tokens::tokens::media_files::MediaFileToken; const PREFIX : Option<&str> = Some("artcraft_"); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_video_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_video_payload.rs index 6e9a7c8f44..1b4065216e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_video_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_video_payload.rs @@ -1,25 +1,18 @@ -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; use crate::state::server_state::ServerState; use crate::util::http_download_url_to_bytes::http_download_url_to_bytes; -use crate::util::http_download_url_to_tempfile::http_download_url_to_tempfile; -use actix_multipart::form::tempfile::TempFile; -use actix_web::web; use anyhow::anyhow; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; -use images::image_info::image_info::ImageInfo; -use log::{info, warn}; +use log::info; use mimetypes::mimetype_info::mimetype_info::MimetypeInfo; use mysql_queries::queries::generic_inference::fal::get_inference_job_by_fal_id::FalJobDetails; use mysql_queries::queries::media_files::create::insert_builder::media_file_insert_builder::MediaFileInsertBuilder; use serde_json::{Map, Value}; use std::io::Write; -use std::sync::Arc; use tempfile::NamedTempFile; use tokens::tokens::media_files::MediaFileToken; use videos::ffprobe_get_info::ffprobe_get_info; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/delete/delete_weight_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/delete/delete_weight_handler.rs index 8c435a1bf7..e192027072 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/delete/delete_weight_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/delete/delete_weight_handler.rs @@ -1,10 +1,10 @@ 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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/get/get_weight_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/get/get_weight_handler.rs index 17763175eb..0e202c1d0d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/get/get_weight_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/get/get_weight_handler.rs @@ -11,7 +11,6 @@ use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; use enums::common::visibility::Visibility; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_available_weights_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_available_weights_handler.rs index 803cb13627..c01689629d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_available_weights_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_available_weights_handler.rs @@ -10,8 +10,8 @@ use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::model_weights::{ - weights_category::WeightsCategory, - weights_types::WeightsType, + weights_category::WeightsCategory, + weights_types::WeightsType, }; use enums::common::visibility::Visibility; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; @@ -19,10 +19,10 @@ use mysql_queries::queries::model_weights::list::list_weights_query_builder::Lis use primitives::numerics::u64_to_u32_saturating::u64_to_u32_saturating; use tokens::tokens::model_weights::ModelWeightToken; +use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails; 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::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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_featured_weights_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_featured_weights_handler.rs index ce64697b00..1f02b99a17 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_featured_weights_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_featured_weights_handler.rs @@ -5,27 +5,21 @@ use actix_web::http::StatusCode; use actix_web::web::Query; use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; -use log::{debug, error, warn}; -use r2d2_redis::redis::Commands; +use log::warn; use utoipa::{IntoParams, ToSchema}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::common::view_as::ViewAs; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; -use mysql_queries::queries::media_files::list::list_media_files::{list_media_files, ListMediaFilesArgs}; use mysql_queries::queries::model_weights::list::list_featured_weights::{list_featured_weights, ListFeaturedWeightsArgs}; -use mysql_queries::queries::model_weights::list::list_weights_by_tokens::list_weights_by_tokens; use primitives::numerics::u64_to_u32_saturating::u64_to_u32_saturating; use tokens::tokens::model_weights::ModelWeightToken; +use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails; 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::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; -use crate::http_server::endpoints::media_files::list::list_media_files_handler::{ListMediaFilesError, ListMediaFilesQueryParams}; use crate::http_server::endpoints::weights::helpers::get_scoped_weights_categories::get_scoped_weights_categories; use crate::http_server::endpoints::weights::helpers::get_scoped_weights_types::get_scoped_weights_types; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_pinned_weights_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_pinned_weights_handler.rs index 46a6d5743f..9bcb7cf92b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_pinned_weights_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_pinned_weights_handler.rs @@ -15,9 +15,9 @@ use mysql_queries::queries::model_weights::list::list_weights_by_tokens::list_we use primitives::numerics::u64_to_u32_saturating::u64_to_u32_saturating; use tokens::tokens::model_weights::ModelWeightToken; +use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails; 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::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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_weights_by_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_weights_by_user_handler.rs index 2244f5fec1..c17df8fc5c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_weights_by_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_weights_by_user_handler.rs @@ -18,10 +18,10 @@ use mysql_queries::queries::model_weights::list::list_weights_by_user::{list_wei use primitives::numerics::u64_to_u32_saturating::u64_to_u32_saturating; use tokens::tokens::model_weights::ModelWeightToken; +use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails; 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::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; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/set_model_weight_cover_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/set_model_weight_cover_image_handler.rs index b67c9125f3..3bedd57694 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/set_model_weight_cover_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/set_model_weight_cover_image_handler.rs @@ -1,15 +1,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::Path; +use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::response_success_helpers::simple_json_success; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs index 5370721ac2..978b565b3a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs @@ -9,6 +9,10 @@ use log::warn; use sqlx::MySqlPool; use utoipa::ToSchema; +use crate::configs::supported_languages_for_models::{get_canonicalized_language_tag_for_model, get_primary_language_subtag}; +use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; +use crate::http_server::web_utils::user_session::require_user_session_using_connection::require_user_session_using_connection; +use crate::state::server_state::ServerState; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::by_table::model_weights::weights_types::WeightsType; use enums::common::visibility::Visibility; @@ -17,15 +21,11 @@ use http_server_common::response::serialize_as_json_error::serialize_as_json_err use markdown::simple_markdown_to_html::simple_markdown_to_html; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use mysql_queries::queries::model_weights::edit::update_weight::{update_weights, CoverImageOption, UpdateWeightArgs}; -use mysql_queries::queries::model_weights::get::get_weight::{get_weight_by_token, get_weight_by_token_with_transactor}; +use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token_with_transactor; use mysql_queries::utils::transactor::Transactor; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use user_input_common::check_for_slurs::contains_slurs; -use crate::configs::supported_languages_for_models::{get_canonicalized_language_tag_for_model, get_primary_language_subtag}; -use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; -use crate::http_server::web_utils::user_session::require_user_session_using_connection::require_user_session_using_connection; -use crate::state::server_state::ServerState; // TODO will eventually be polymorphic /// **IMPORTANT**: This endpoint handles sparse (by-field) updates rather than wholesale updates. diff --git a/crates/service/web/storyteller_web/src/http_server/middleware/pushback_filter_middleware.rs b/crates/service/web/storyteller_web/src/http_server/middleware/pushback_filter_middleware.rs index 853517a64c..68fd9bdd45 100644 --- a/crates/service/web/storyteller_web/src/http_server/middleware/pushback_filter_middleware.rs +++ b/crates/service/web/storyteller_web/src/http_server/middleware/pushback_filter_middleware.rs @@ -3,12 +3,12 @@ use std::io::Write; use actix_http::body::BoxBody; use actix_http::header::HeaderName; use actix_http::StatusCode; -use actix_web::{Error, HttpResponse}; -use actix_web::{HttpMessage, ResponseError}; use actix_web::dev::{Service, Transform}; use actix_web::dev::{ServiceRequest, ServiceResponse}; use actix_web::http::header::USER_AGENT; -use futures_util::future::{Either, err, ok, Ready}; +use actix_web::{Error, HttpResponse}; +use actix_web::{HttpMessage, ResponseError}; +use futures_util::future::{err, ok, Either, Ready}; use log::warn; use http_server_common::request::get_request_ip::get_service_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/requests/get_request_signup_source.rs b/crates/service/web/storyteller_web/src/http_server/requests/get_request_signup_source.rs index 53e0c23c55..8d85eb324b 100644 --- a/crates/service/web/storyteller_web/src/http_server/requests/get_request_signup_source.rs +++ b/crates/service/web/storyteller_web/src/http_server/requests/get_request_signup_source.rs @@ -1,4 +1,3 @@ -use actix_http::header::HOST; use actix_helpers::extractors::get_request_origin_uri::get_request_origin_uri; use actix_web::HttpRequest; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/routes/add_studio_gen2_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/add_studio_gen2_routes.rs index 3d11fd93f1..c64e209fe6 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/add_studio_gen2_routes.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/add_studio_gen2_routes.rs @@ -1,8 +1,8 @@ +use crate::http_server::endpoints::studio_gen2::enqueue_studio_gen2_handler::enqueue_studio_gen2_handler; use actix_http::body::MessageBody; use actix_service::ServiceFactory; -use actix_web::{App, Error, HttpResponse, web}; use actix_web::dev::{ServiceRequest, ServiceResponse}; -use crate::http_server::endpoints::studio_gen2::enqueue_studio_gen2_handler::enqueue_studio_gen2_handler; +use actix_web::{web, App, Error, HttpResponse}; pub fn add_studio_gen2_routes (app: App) -> App where diff --git a/crates/service/web/storyteller_web/src/http_server/routes/beta_key_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/beta_key_routes.rs index f632d1a998..bc69e8f7d2 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/beta_key_routes.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/beta_key_routes.rs @@ -1,7 +1,7 @@ use actix_http::body::MessageBody; use actix_service::ServiceFactory; -use actix_web::{App, Error, HttpResponse, web}; use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::{web, App, Error, HttpResponse}; use crate::http_server::endpoints::beta_keys::create_beta_keys_handler::create_beta_keys_handler; use crate::http_server::endpoints::beta_keys::edit_beta_key_distributed_flag_handler::edit_beta_key_distributed_flag_handler; diff --git a/crates/service/web/storyteller_web/src/http_server/routes/job_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/job_routes.rs index 09ae3630d5..28d3eb9b1f 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/job_routes.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/job_routes.rs @@ -1,7 +1,7 @@ use actix_http::body::MessageBody; use actix_service::ServiceFactory; -use actix_web::{App, Error, HttpResponse, web}; use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::{web, App, Error, HttpResponse}; use actix_helpers::route_builder::RouteBuilder; diff --git a/crates/service/web/storyteller_web/src/http_server/routes/model_download_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/model_download_routes.rs index 64e5ef927f..34cd88d9bd 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/model_download_routes.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/model_download_routes.rs @@ -1,7 +1,7 @@ use actix_http::body::MessageBody; use actix_service::ServiceFactory; -use actix_web::{App, Error, HttpResponse, web}; use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::{web, App, Error, HttpResponse}; use crate::http_server::endpoints::model_download::enqueue_gptsovits_model_download_handler::enqueue_gptsovits_model_download_handler; diff --git a/crates/service/web/storyteller_web/src/http_server/session/http/http_user_session_manager.rs b/crates/service/web/storyteller_web/src/http_server/session/http/http_user_session_manager.rs index 09aab7ed1d..f9b4ae6aca 100644 --- a/crates/service/web/storyteller_web/src/http_server/session/http/http_user_session_manager.rs +++ b/crates/service/web/storyteller_web/src/http_server/session/http/http_user_session_manager.rs @@ -3,8 +3,8 @@ #![forbid(unused_mut)] #![forbid(unused_variables)] -use actix_web::cookie::{Cookie, SameSite}; use actix_web::cookie::time::OffsetDateTime; +use actix_web::cookie::{Cookie, SameSite}; use actix_web::HttpRequest; use anyhow::anyhow; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/session/session_checker.rs b/crates/service/web/storyteller_web/src/http_server/session/session_checker.rs index e857461363..88667f74e9 100644 --- a/crates/service/web/storyteller_web/src/http_server/session/session_checker.rs +++ b/crates/service/web/storyteller_web/src/http_server/session/session_checker.rs @@ -5,8 +5,8 @@ use actix_web::HttpRequest; use log::warn; -use sqlx::{Executor, MySql, MySqlPool}; use sqlx::pool::PoolConnection; +use sqlx::{Executor, MySql, MySqlPool}; use errors::AnyhowResult; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::{get_user_session_by_token, get_user_session_by_token_pooled_connection, SessionUserRecord}; diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/read_multipart_field_bytes.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/read_multipart_field_bytes.rs index c8d5e758eb..9b2080eaf2 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/read_multipart_field_bytes.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/read_multipart_field_bytes.rs @@ -3,7 +3,7 @@ use actix_multipart::Field; use actix_web::web::BytesMut; use anyhow::anyhow; use futures::{StreamExt, TryStreamExt}; -use log::{info, warn}; +use log::warn; const MIN_BYTES : usize = 10; //const MAX_BYTES : usize = 1024 * 1024 * 20; // 20 Mb diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_moderator.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_moderator.rs index 999f1adbc7..8c56998e68 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_moderator.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_moderator.rs @@ -3,13 +3,11 @@ use std::fmt::{Display, Formatter}; use actix_web::HttpRequest; use log::warn; -use r2d2_redis::r2d2::PooledConnection; -use sqlx::MySql; use sqlx::pool::PoolConnection; +use sqlx::MySql; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; -use crate::http_server::endpoints::beta_keys::create_beta_keys_handler::CreateBetaKeysError; use crate::state::server_state::ServerState; #[derive(Debug)] diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session.rs index b700d30cf9..c57f96e7b3 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session.rs @@ -6,7 +6,6 @@ use log::warn; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; -use crate::http_server::endpoints::beta_keys::create_beta_keys_handler::CreateBetaKeysError; use crate::state::server_state::ServerState; #[derive(Debug)] diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session_using_connection.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session_using_connection.rs index 238d1583bf..c46b6de564 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session_using_connection.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session_using_connection.rs @@ -1,18 +1,14 @@ use std::error::Error; -use std::fmt::{Display, Formatter}; use actix_web::HttpRequest; use log::warn; -use sqlx::{MySql, MySqlConnection}; use sqlx::pool::PoolConnection; +use sqlx::MySql; -use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; -use crate::http_server::endpoints::beta_keys::create_beta_keys_handler::CreateBetaKeysError; use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use crate::http_server::session::session_checker::SessionChecker; use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; -use crate::state::server_state::ServerState; pub async fn require_user_session_using_connection( http_request: &HttpRequest, diff --git a/crates/service/web/storyteller_web/src/main.rs b/crates/service/web/storyteller_web/src/main.rs index 6ca16416ed..1183dccc64 100644 --- a/crates/service/web/storyteller_web/src/main.rs +++ b/crates/service/web/storyteller_web/src/main.rs @@ -6,7 +6,7 @@ // Okay to toggle //#![forbid(warnings)] #![allow(unreachable_patterns)] -#![forbid(unused_imports)] +#![allow(unused_imports)] #![allow(unused_mut)] #![allow(unused_variables)] @@ -17,7 +17,6 @@ #[macro_use] extern crate magic_crypt; #[macro_use] extern crate serde_derive; -use std::sync::atomic::AtomicUsize; use std::sync::Arc; use std::time::Duration; @@ -28,13 +27,9 @@ use actix_web::{middleware, web, App, HttpServer}; use anyhow::anyhow; use elasticsearch::http::transport::Transport; use elasticsearch::Elasticsearch; -use futures::Future; use log::info; 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 actix_cors_configs::cors::build_cors_config; @@ -56,7 +51,6 @@ use billing_component::stripe::traits::internal_user_lookup::InternalUserLookup; use bootstrap::bootstrap::{bootstrap, BootstrapArgs}; use cloud_storage::bucket_client::BucketClient; use config::common_env::CommonEnv; -use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use config::shared_constants::DEFAULT_RUST_LOG; use email_sender::smtp_email_sender::SmtpEmailSender; use errors::AnyhowResult; diff --git a/crates/service/web/storyteller_web/src/state/certs/google_sign_in_cert.rs b/crates/service/web/storyteller_web/src/state/certs/google_sign_in_cert.rs index 78d9346d62..d34108af17 100644 --- a/crates/service/web/storyteller_web/src/state/certs/google_sign_in_cert.rs +++ b/crates/service/web/storyteller_web/src/state/certs/google_sign_in_cert.rs @@ -2,8 +2,8 @@ use anyhow::anyhow; use errors::AnyhowResult; use google_sign_in::certs::download_certs::download_cert_key_set; use google_sign_in::certs::key_map::KeyMap; -use log::{error, info, warn}; -use std::sync::{Arc, LockResult, RwLock}; +use log::{error, info}; +use std::sync::{Arc, RwLock}; /// The Google Sign In cert needs to be refreshed periodically #[derive(Clone)] diff --git a/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs b/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs index ea3c18ccab..0fa7b0e85f 100644 --- a/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs +++ b/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs @@ -1,5 +1,4 @@ use std::collections::HashSet; -use std::thread; use std::time::Duration; use log::warn; diff --git a/crates/service/web/storyteller_web/src/util/encrypted_sort_id.rs b/crates/service/web/storyteller_web/src/util/encrypted_sort_id.rs index 7c6b8d94b3..c87ab764db 100644 --- a/crates/service/web/storyteller_web/src/util/encrypted_sort_id.rs +++ b/crates/service/web/storyteller_web/src/util/encrypted_sort_id.rs @@ -2,12 +2,11 @@ use std::io::Cursor; use base64; use base64::alphabet::{Alphabet, URL_SAFE}; -use base64::engine::{Config, DecodePaddingMode, GeneralPurpose, GeneralPurposeConfig}; +use base64::engine::{DecodePaddingMode, GeneralPurpose, GeneralPurposeConfig}; use base64::Engine; use magic_crypt::{MagicCrypt256, MagicCryptTrait}; use magic_crypt::generic_array::typenum::U256; use magic_crypt::new_magic_crypt; -use rand::RngCore; use errors::AnyhowResult;