diff --git a/Cranky.toml b/Cranky.toml index fde4959aa1..822a055381 100644 --- a/Cranky.toml +++ b/Cranky.toml @@ -39,6 +39,9 @@ deny = [ "clippy::redundant_field_names", # Lint: Duplicate names is a burden when reading: you wonder why they're dupes. "clippy::redundant_static_lifetimes", # Lint: feels more modern to elide static lifetimes + # Rust + "unused_imports", # These are easy to automatically cull + # Possible: # "clippy::ptr_arg", # "clippy::too_many_lines" (note: this is configurable) diff --git a/crates/_types/buckets/src/public/media_files/directory.rs b/crates/_types/buckets/src/public/media_files/directory.rs index b0e628cb80..e0083da128 100644 --- a/crates/_types/buckets/src/public/media_files/directory.rs +++ b/crates/_types/buckets/src/public/media_files/directory.rs @@ -1,6 +1,7 @@ +use crockford::crockford_entropy_lower; + use crate::public::public_path::PublicPath; use crate::util::hashed_directory_path_long_string::hashed_directory_path_long_string; -use crockford::crockford_entropy_lower; // TODO: Generate these from a macro. diff --git a/crates/_types/buckets/src/public/media_files/original_file.rs b/crates/_types/buckets/src/public/media_files/original_file.rs index 1a65bc07c0..2ef349b580 100644 --- a/crates/_types/buckets/src/public/media_files/original_file.rs +++ b/crates/_types/buckets/src/public/media_files/original_file.rs @@ -1,7 +1,9 @@ +use std::path::PathBuf; + +use crockford::crockford_entropy_lower; + use crate::public::media_files::directory::MediaFileBucketDirectory; use crate::public::public_path::PublicPath; -use crockford::crockford_entropy_lower; -use std::path::PathBuf; const ORIGINAL_FILE_BASENAME : &str = "file.bin"; @@ -57,9 +59,10 @@ impl MediaFileBucketPath { #[cfg(test)] mod tests { - use crate::public::media_files::original_file::MediaFileBucketPath; use std::path::PathBuf; + use crate::public::media_files::original_file::MediaFileBucketPath; + #[test] pub fn generate_new_entropy() { let file = MediaFileBucketPath::generate_new(); diff --git a/crates/_types/buckets/src/public/media_uploads/directory.rs b/crates/_types/buckets/src/public/media_uploads/directory.rs index b6ba0612fc..aa4ffc0470 100644 --- a/crates/_types/buckets/src/public/media_uploads/directory.rs +++ b/crates/_types/buckets/src/public/media_uploads/directory.rs @@ -1,6 +1,7 @@ +use crockford::crockford_entropy_lower; + use crate::public::public_path::PublicPath; use crate::util::hashed_directory_path_long_string::hashed_directory_path_long_string; -use crockford::crockford_entropy_lower; // TODO: Generate these from a macro. diff --git a/crates/_types/buckets/src/public/media_uploads/original_file.rs b/crates/_types/buckets/src/public/media_uploads/original_file.rs index 3d0131f1a5..7f0a40a6b7 100644 --- a/crates/_types/buckets/src/public/media_uploads/original_file.rs +++ b/crates/_types/buckets/src/public/media_uploads/original_file.rs @@ -1,7 +1,9 @@ +use std::path::PathBuf; + +use crockford::crockford_entropy_lower; + use crate::public::media_uploads::directory::MediaUploadDirectory; use crate::public::public_path::PublicPath; -use crockford::crockford_entropy_lower; -use std::path::PathBuf; const ORIGINAL_FILE_BASENAME : &str = "original_upload.bin"; @@ -57,9 +59,10 @@ impl MediaUploadOriginalFilePath { #[cfg(test)] mod tests { - use crate::public::media_uploads::original_file::MediaUploadOriginalFilePath; use std::path::PathBuf; + use crate::public::media_uploads::original_file::MediaUploadOriginalFilePath; + #[test] pub fn generate_new_entropy() { let file = MediaUploadOriginalFilePath::generate_new(); diff --git a/crates/_types/buckets/src/public/voice_conversion_results/original_file.rs b/crates/_types/buckets/src/public/voice_conversion_results/original_file.rs index 344af84349..9e256e89d2 100644 --- a/crates/_types/buckets/src/public/voice_conversion_results/original_file.rs +++ b/crates/_types/buckets/src/public/voice_conversion_results/original_file.rs @@ -1,7 +1,9 @@ +use std::path::PathBuf; + +use crockford::crockford_entropy_lower; + use crate::public::public_path::PublicPath; use crate::public::voice_conversion_results::directory::VoiceConversionResultDirectory; -use crockford::crockford_entropy_lower; -use std::path::PathBuf; const ORIGINAL_FILE_PREFIX : &str = "fakeyou_"; const ORIGINAL_FILE_SUFFIX : &str = ".wav"; @@ -61,9 +63,10 @@ impl VoiceConversionResultOriginalFilePath { #[cfg(test)] mod tests { - use crate::public::voice_conversion_results::original_file::VoiceConversionResultOriginalFilePath; use std::path::PathBuf; + use crate::public::voice_conversion_results::original_file::VoiceConversionResultOriginalFilePath; + #[test] pub fn generate_new_entropy() { let file = VoiceConversionResultOriginalFilePath::generate_new(); diff --git a/crates/_types/buckets/src/util/hash_to_bucket_path.rs b/crates/_types/buckets/src/util/hash_to_bucket_path.rs index 770deede67..dc94c09311 100644 --- a/crates/_types/buckets/src/util/hash_to_bucket_path.rs +++ b/crates/_types/buckets/src/util/hash_to_bucket_path.rs @@ -1,6 +1,7 @@ +use std::path::PathBuf; + use errors::AnyhowResult; use errors::bail; -use std::path::PathBuf; #[deprecated(note = "this is a messy function and should be avoided")] pub (crate) fn hash_to_bucket_path(file_hash: &str, @@ -28,9 +29,10 @@ pub (crate) fn hash_to_bucket_path(file_hash: &str, #[cfg(test)] mod tests { - use crate::util::hash_to_bucket_path::hash_to_bucket_path; use std::path::PathBuf; + use crate::util::hash_to_bucket_path::hash_to_bucket_path; + #[test] fn test_bucket_without_root() { assert_eq!( diff --git a/crates/_types/buckets/src/util/hash_to_bucket_path_string.rs b/crates/_types/buckets/src/util/hash_to_bucket_path_string.rs index af2e3cbb0b..ad715cd9d3 100644 --- a/crates/_types/buckets/src/util/hash_to_bucket_path_string.rs +++ b/crates/_types/buckets/src/util/hash_to_bucket_path_string.rs @@ -1,6 +1,7 @@ -use crate::util::hash_to_bucket_path::hash_to_bucket_path; -use errors::AnyhowResult; use errors::anyhow; +use errors::AnyhowResult; + +use crate::util::hash_to_bucket_path::hash_to_bucket_path; #[deprecated(note = "this is a messy function and should be avoided")] pub fn hash_to_bucket_path_string(file_hash: &str, diff --git a/crates/_types/enums/src/by_table/audit_logs/audit_log_entity_action.rs b/crates/_types/enums/src/by_table/audit_logs/audit_log_entity_action.rs index 477cf79e39..d5b3aa3281 100644 --- a/crates/_types/enums/src/by_table/audit_logs/audit_log_entity_action.rs +++ b/crates/_types/enums/src/by_table/audit_logs/audit_log_entity_action.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/audit_logs/audit_log_entity_type.rs b/crates/_types/enums/src/by_table/audit_logs/audit_log_entity_type.rs index 723eefd57e..1caa97b10b 100644 --- a/crates/_types/enums/src/by_table/audit_logs/audit_log_entity_type.rs +++ b/crates/_types/enums/src/by_table/audit_logs/audit_log_entity_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/comments/comment_entity_type.rs b/crates/_types/enums/src/by_table/comments/comment_entity_type.rs index a6ba977589..72294e2b27 100644 --- a/crates/_types/enums/src/by_table/comments/comment_entity_type.rs +++ b/crates/_types/enums/src/by_table/comments/comment_entity_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_category.rs b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_category.rs index 2c20fdf1aa..faee8ff909 100644 --- a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_category.rs +++ b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_category.rs @@ -5,7 +5,6 @@ use strum::EnumCount; #[cfg(test)] use strum::EnumIter; - /// Used in the `generic_inference_jobs` table in `VARCHAR(32)` field `inference_category`. /// /// Our "generic inference" pipeline supports a wide variety of ML models and other media. diff --git a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_input_source_token_type.rs b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_input_source_token_type.rs index e86470596f..a8332f5679 100644 --- a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_input_source_token_type.rs +++ b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_input_source_token_type.rs @@ -5,7 +5,6 @@ use strum::EnumCount; #[cfg(test)] use strum::EnumIter; - /// Used in the `generic_inference_jobs` table in `VARCHAR(32)` field `maybe_input_source_token`. /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. diff --git a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs index a5d3317a66..79a6979b36 100644 --- a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs +++ b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs @@ -5,7 +5,6 @@ use strum::EnumCount; #[cfg(test)] use strum::EnumIter; - /// Used in the `generic_inference_jobs` table in `VARCHAR(32)` field `maybe_model_type`. /// /// Our "generic inference" pipeline supports a wide variety of ML models and other media. diff --git a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_result_type.rs b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_result_type.rs index ba254aa315..c687124416 100644 --- a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_result_type.rs +++ b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_result_type.rs @@ -5,7 +5,6 @@ use strum::EnumCount; #[cfg(test)] use strum::EnumIter; - /// Used in the `generic_inference_jobs` table in `VARCHAR(32)` field `on_success_result_entity_type`. /// /// Our "generic inference" pipeline supports a wide variety of output types. diff --git a/crates/_types/enums/src/by_table/generic_synthetic_ids/id_category.rs b/crates/_types/enums/src/by_table/generic_synthetic_ids/id_category.rs index dc9cdb2241..4bb8a5452b 100644 --- a/crates/_types/enums/src/by_table/generic_synthetic_ids/id_category.rs +++ b/crates/_types/enums/src/by_table/generic_synthetic_ids/id_category.rs @@ -5,7 +5,6 @@ use strum::EnumCount; #[cfg(test)] use strum::EnumIter; - /// Used in the `generic_synthetic_ids` table in `VARCHAR(32)` field `id_category`. /// /// This lets us create synthetic increment IDs on a per-user, per-category basis. diff --git a/crates/_types/enums/src/by_table/media_files/media_file_origin_category.rs b/crates/_types/enums/src/by_table/media_files/media_file_origin_category.rs index fabc661366..5eac9a9a9f 100644 --- a/crates/_types/enums/src/by_table/media_files/media_file_origin_category.rs +++ b/crates/_types/enums/src/by_table/media_files/media_file_origin_category.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/media_files/media_file_origin_model_type.rs b/crates/_types/enums/src/by_table/media_files/media_file_origin_model_type.rs index 90f2c8dc1a..b401758897 100644 --- a/crates/_types/enums/src/by_table/media_files/media_file_origin_model_type.rs +++ b/crates/_types/enums/src/by_table/media_files/media_file_origin_model_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/media_files/media_file_type.rs b/crates/_types/enums/src/by_table/media_files/media_file_type.rs index 39ba321dbd..ec2d77108f 100644 --- a/crates/_types/enums/src/by_table/media_files/media_file_type.rs +++ b/crates/_types/enums/src/by_table/media_files/media_file_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/media_uploads/media_upload_source.rs b/crates/_types/enums/src/by_table/media_uploads/media_upload_source.rs index ccbc95846c..f8a94e54ab 100644 --- a/crates/_types/enums/src/by_table/media_uploads/media_upload_source.rs +++ b/crates/_types/enums/src/by_table/media_uploads/media_upload_source.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/media_uploads/media_upload_type.rs b/crates/_types/enums/src/by_table/media_uploads/media_upload_type.rs index 2b4d9e713e..91f06ed283 100644 --- a/crates/_types/enums/src/by_table/media_uploads/media_upload_type.rs +++ b/crates/_types/enums/src/by_table/media_uploads/media_upload_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/model_categories/model_type.rs b/crates/_types/enums/src/by_table/model_categories/model_type.rs index b96b08a0dd..608064bb50 100644 --- a/crates/_types/enums/src/by_table/model_categories/model_type.rs +++ b/crates/_types/enums/src/by_table/model_categories/model_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/trending_model_analytics/model_type.rs b/crates/_types/enums/src/by_table/trending_model_analytics/model_type.rs index 5e9fe6a882..176bb34b2d 100644 --- a/crates/_types/enums/src/by_table/trending_model_analytics/model_type.rs +++ b/crates/_types/enums/src/by_table/trending_model_analytics/model_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/trending_model_analytics/window_name.rs b/crates/_types/enums/src/by_table/trending_model_analytics/window_name.rs index e14e44ac1a..798d3a4589 100644 --- a/crates/_types/enums/src/by_table/trending_model_analytics/window_name.rs +++ b/crates/_types/enums/src/by_table/trending_model_analytics/window_name.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/tts_models/tts_model_type.rs b/crates/_types/enums/src/by_table/tts_models/tts_model_type.rs index 03a9e49ec7..c1340dd04e 100644 --- a/crates/_types/enums/src/by_table/tts_models/tts_model_type.rs +++ b/crates/_types/enums/src/by_table/tts_models/tts_model_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/tts_render_tasks/tts_render_status.rs b/crates/_types/enums/src/by_table/tts_render_tasks/tts_render_status.rs index 4406e531f8..6e2da6a11a 100644 --- a/crates/_types/enums/src/by_table/tts_render_tasks/tts_render_status.rs +++ b/crates/_types/enums/src/by_table/tts_render_tasks/tts_render_status.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] @@ -62,8 +61,8 @@ impl TtsRenderStatus { #[cfg(test)] mod tests { - use crate::test_helpers::assert_serialization; use crate::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; + use crate::test_helpers::assert_serialization; mod serde { use super::*; diff --git a/crates/_types/enums/src/by_table/user_ratings/entity_type.rs b/crates/_types/enums/src/by_table/user_ratings/entity_type.rs index afcbb839ef..f463471a98 100644 --- a/crates/_types/enums/src/by_table/user_ratings/entity_type.rs +++ b/crates/_types/enums/src/by_table/user_ratings/entity_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/voice_conversion_models/voice_conversion_model_type.rs b/crates/_types/enums/src/by_table/voice_conversion_models/voice_conversion_model_type.rs index f3ef748d79..9e1ec7f6bf 100644 --- a/crates/_types/enums/src/by_table/voice_conversion_models/voice_conversion_model_type.rs +++ b/crates/_types/enums/src/by_table/voice_conversion_models/voice_conversion_model_type.rs @@ -5,7 +5,6 @@ use strum::EnumCount; #[cfg(test)] use strum::EnumIter; - /// Used in the `voice_conversion_models` table in `VARCHAR(32)` field `model_type`. /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. diff --git a/crates/_types/enums/src/by_table/voice_conversion_results/voice_conversion_media_token_type.rs b/crates/_types/enums/src/by_table/voice_conversion_results/voice_conversion_media_token_type.rs index 5b8ebcdb77..4a4b03a5d4 100644 --- a/crates/_types/enums/src/by_table/voice_conversion_results/voice_conversion_media_token_type.rs +++ b/crates/_types/enums/src/by_table/voice_conversion_results/voice_conversion_media_token_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/web_rendition_targets/rendition_status.rs b/crates/_types/enums/src/by_table/web_rendition_targets/rendition_status.rs index 4e4aae6550..b09b0be749 100644 --- a/crates/_types/enums/src/by_table/web_rendition_targets/rendition_status.rs +++ b/crates/_types/enums/src/by_table/web_rendition_targets/rendition_status.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/by_table/web_scraping_targets/scraping_status.rs b/crates/_types/enums/src/by_table/web_scraping_targets/scraping_status.rs index 2049f2a7d4..870e842f31 100644 --- a/crates/_types/enums/src/by_table/web_scraping_targets/scraping_status.rs +++ b/crates/_types/enums/src/by_table/web_scraping_targets/scraping_status.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/common/sqlite/awaitable_job_status.rs b/crates/_types/enums/src/common/sqlite/awaitable_job_status.rs index 2023425ac0..a58498e018 100644 --- a/crates/_types/enums/src/common/sqlite/awaitable_job_status.rs +++ b/crates/_types/enums/src/common/sqlite/awaitable_job_status.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/common/sqlite/chatbot_job_status.rs b/crates/_types/enums/src/common/sqlite/chatbot_job_status.rs index 9c5bffed70..63416304d0 100644 --- a/crates/_types/enums/src/common/sqlite/chatbot_job_status.rs +++ b/crates/_types/enums/src/common/sqlite/chatbot_job_status.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/common/sqlite/skip_reason.rs b/crates/_types/enums/src/common/sqlite/skip_reason.rs index f7bc4a2c6b..b7f941123b 100644 --- a/crates/_types/enums/src/common/sqlite/skip_reason.rs +++ b/crates/_types/enums/src/common/sqlite/skip_reason.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] diff --git a/crates/_types/enums/src/common/sqlite/web_content_type.rs b/crates/_types/enums/src/common/sqlite/web_content_type.rs index 9f1baf0302..46675e606b 100644 --- a/crates/_types/enums/src/common/sqlite/web_content_type.rs +++ b/crates/_types/enums/src/common/sqlite/web_content_type.rs @@ -1,6 +1,5 @@ use serde::Deserialize; use serde::Serialize; - #[cfg(test)] use strum::EnumCount; #[cfg(test)] @@ -83,8 +82,8 @@ impl WebContentType { #[cfg(test)] mod tests { - use crate::test_helpers::assert_serialization; use crate::common::sqlite::web_content_type::WebContentType; + use crate::test_helpers::assert_serialization; mod serde { use super::*; diff --git a/crates/_types/enums/src/common/visibility.rs b/crates/_types/enums/src/common/visibility.rs index cb8a280850..e5a8494005 100644 --- a/crates/_types/enums/src/common/visibility.rs +++ b/crates/_types/enums/src/common/visibility.rs @@ -144,6 +144,7 @@ mod tests { mod serde_serialization { use crate::common::visibility::Visibility; + use super::CompositeType; #[test] @@ -166,6 +167,7 @@ mod tests { mod serde_deserialization { use crate::common::visibility::Visibility; + use super::CompositeType; #[test] diff --git a/crates/_types/tokens/src/files/media_upload.rs b/crates/_types/tokens/src/files/media_upload.rs index b8e3249291..2cd999b605 100644 --- a/crates/_types/tokens/src/files/media_upload.rs +++ b/crates/_types/tokens/src/files/media_upload.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; // FIXME: I think that this file+module structure is an anti-pattern. // In the future, we should create two top-level directories: /tokens and /ids, and each token or diff --git a/crates/_types/tokens/src/jobs/download.rs b/crates/_types/tokens/src/jobs/download.rs index 9509998e79..a0cf4ed079 100644 --- a/crates/_types/tokens/src/jobs/download.rs +++ b/crates/_types/tokens/src/jobs/download.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; // FIXME: I think that this file+module structure is an anti-pattern. // In the future, we should create two top-level directories: /tokens and /ids, and each token or diff --git a/crates/_types/tokens/src/jobs/inference.rs b/crates/_types/tokens/src/jobs/inference.rs index 13efe332c7..9422247181 100644 --- a/crates/_types/tokens/src/jobs/inference.rs +++ b/crates/_types/tokens/src/jobs/inference.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; // FIXME: I think that this file+module structure is an anti-pattern. // In the future, we should create two top-level directories: /tokens and /ids, and each token or diff --git a/crates/_types/tokens/src/prefixes.rs b/crates/_types/tokens/src/prefixes.rs index 618da77f30..f95dce2d43 100644 --- a/crates/_types/tokens/src/prefixes.rs +++ b/crates/_types/tokens/src/prefixes.rs @@ -53,11 +53,13 @@ impl EntityType { #[cfg(test)] mod tests { - use crate::prefixes::EntityType; use std::collections::HashSet; + use strum::EnumCount; use strum::IntoEnumIterator; + use crate::prefixes::EntityType; + #[test] fn test_all_prefixes_are_unique() { let entities = EntityType::iter() diff --git a/crates/_types/tokens/src/tokens/audit_logs.rs b/crates/_types/tokens/src/tokens/audit_logs.rs index 3e1c84ee28..642d7767d3 100644 --- a/crates/_types/tokens/src/tokens/audit_logs.rs +++ b/crates/_types/tokens/src/tokens/audit_logs.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; /// The primary key for Audit Logs. #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize)] diff --git a/crates/_types/tokens/src/tokens/comments.rs b/crates/_types/tokens/src/tokens/comments.rs index e6b77a082a..44b37d4faa 100644 --- a/crates/_types/tokens/src/tokens/comments.rs +++ b/crates/_types/tokens/src/tokens/comments.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; /// The primary key for Audit Logs. #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize)] diff --git a/crates/_types/tokens/src/tokens/media_files.rs b/crates/_types/tokens/src/tokens/media_files.rs index a0df9a6f1e..52cfb19b19 100644 --- a/crates/_types/tokens/src/tokens/media_files.rs +++ b/crates/_types/tokens/src/tokens/media_files.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; /// The primary key for Audit Logs. #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize)] diff --git a/crates/_types/tokens/src/tokens/model_categories.rs b/crates/_types/tokens/src/tokens/model_categories.rs index aa1efb437a..7a53b7a1ba 100644 --- a/crates/_types/tokens/src/tokens/model_categories.rs +++ b/crates/_types/tokens/src/tokens/model_categories.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; /// The primary key for model categories. #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize)] diff --git a/crates/_types/tokens/src/tokens/news_stories.rs b/crates/_types/tokens/src/tokens/news_stories.rs index 956afb4220..9026b91f79 100644 --- a/crates/_types/tokens/src/tokens/news_stories.rs +++ b/crates/_types/tokens/src/tokens/news_stories.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; /// The primary key for news stories (Sqlite) #[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize)] diff --git a/crates/_types/tokens/src/tokens/tts_models.rs b/crates/_types/tokens/src/tokens/tts_models.rs index ea0fc2e32b..86a9fae4bd 100644 --- a/crates/_types/tokens/src/tokens/tts_models.rs +++ b/crates/_types/tokens/src/tokens/tts_models.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; /// The primary key for TTS models. #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize)] diff --git a/crates/_types/tokens/src/tokens/tts_render_tasks.rs b/crates/_types/tokens/src/tokens/tts_render_tasks.rs index e6996a5a21..36c2a00707 100644 --- a/crates/_types/tokens/src/tokens/tts_render_tasks.rs +++ b/crates/_types/tokens/src/tokens/tts_render_tasks.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; /// The primary key for TTS render tasks (Sqlite / AiChatBotSidecar) #[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize)] diff --git a/crates/_types/tokens/src/tokens/voice_conversion_results.rs b/crates/_types/tokens/src/tokens/voice_conversion_results.rs index a7e81977b2..8511f6913f 100644 --- a/crates/_types/tokens/src/tokens/voice_conversion_results.rs +++ b/crates/_types/tokens/src/tokens/voice_conversion_results.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; /// The primary key for model categories. #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize)] diff --git a/crates/_types/tokens/src/tokens/w2l_templates.rs b/crates/_types/tokens/src/tokens/w2l_templates.rs index 17380808c4..e15b37a949 100644 --- a/crates/_types/tokens/src/tokens/w2l_templates.rs +++ b/crates/_types/tokens/src/tokens/w2l_templates.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; /// The primary key for W2L templates. #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize)] diff --git a/crates/_types/tokens/src/users/user.rs b/crates/_types/tokens/src/users/user.rs index fb4d1281a7..6df5b83905 100644 --- a/crates/_types/tokens/src/users/user.rs +++ b/crates/_types/tokens/src/users/user.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; // FIXME: I think that this file+module structure is an anti-pattern. // In the future, we should create two top-level directories: /tokens and /ids, and each token or diff --git a/crates/_types/tokens/src/voice_conversion/model.rs b/crates/_types/tokens/src/voice_conversion/model.rs index 7e9bcee89a..2ba949d44b 100644 --- a/crates/_types/tokens/src/voice_conversion/model.rs +++ b/crates/_types/tokens/src/voice_conversion/model.rs @@ -1,7 +1,9 @@ -use crate::prefixes::EntityType; +use std::fmt::Debug; + use serde::Deserialize; use serde::Serialize; -use std::fmt::Debug; + +use crate::prefixes::EntityType; // FIXME: I think that this file+module structure is an anti-pattern. // In the future, we should create two top-level directories: /tokens and /ids, and each token or diff --git a/crates/_types/tokens/tests/media_file_token_tests.rs b/crates/_types/tokens/tests/media_file_token_tests.rs index ef09b78c2d..dc09692485 100644 --- a/crates/_types/tokens/tests/media_file_token_tests.rs +++ b/crates/_types/tokens/tests/media_file_token_tests.rs @@ -2,6 +2,7 @@ use serde::Deserialize; use serde::Serialize; + use tokens::tokens::media_files::MediaFileToken; #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -62,9 +63,10 @@ mod traits { } mod serialization { - use crate::CompositeType; use tokens::tokens::media_files::MediaFileToken; + use crate::CompositeType; + #[test] fn serialize() { let expected = "\"m_foo\"".to_string(); // NB: Quoted @@ -85,9 +87,10 @@ mod serialization { } mod deserialization { - use crate::CompositeType; use tokens::tokens::media_files::MediaFileToken; + use crate::CompositeType; + #[test] fn deserialize() { let payload = "\"m_foo\""; // NB: Quoted diff --git a/crates/_types/tokens/tests/media_upload_token_tests.rs b/crates/_types/tokens/tests/media_upload_token_tests.rs index 26c98c4fe5..b66eeffdb8 100644 --- a/crates/_types/tokens/tests/media_upload_token_tests.rs +++ b/crates/_types/tokens/tests/media_upload_token_tests.rs @@ -2,6 +2,7 @@ use serde::Deserialize; use serde::Serialize; + use tokens::files::media_upload::MediaUploadToken; #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -62,9 +63,10 @@ mod traits { } mod serialization { - use crate::CompositeType; use tokens::files::media_upload::MediaUploadToken; + use crate::CompositeType; + #[test] fn serialize() { let expected = "\"mu_foo\"".to_string(); // NB: Quoted @@ -85,9 +87,10 @@ mod serialization { } mod deserialization { - use crate::CompositeType; use tokens::files::media_upload::MediaUploadToken; + use crate::CompositeType; + #[test] fn deserialize() { let payload = "\"mu_foo\""; // NB: Quoted diff --git a/crates/_types/tokens/tests/user_token_tests.rs b/crates/_types/tokens/tests/user_token_tests.rs index 6013cdd8e9..7f37402ac6 100644 --- a/crates/_types/tokens/tests/user_token_tests.rs +++ b/crates/_types/tokens/tests/user_token_tests.rs @@ -2,6 +2,7 @@ use serde::Deserialize; use serde::Serialize; + use tokens::users::user::UserToken; #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -62,9 +63,10 @@ mod traits { } mod serialization { - use crate::CompositeType; use tokens::users::user::UserToken; + use crate::CompositeType; + #[test] fn serialize() { let expected = "\"U:foo\"".to_string(); // NB: Quoted @@ -85,9 +87,10 @@ mod serialization { } mod deserialization { - use crate::CompositeType; use tokens::users::user::UserToken; + use crate::CompositeType; + #[test] fn deserialize() { let payload = "\"U:foo\""; // NB: Quoted diff --git a/crates/cli/database_backup/src/main.rs b/crates/cli/database_backup/src/main.rs index dfcd3ade8e..cbe54167d7 100644 --- a/crates/cli/database_backup/src/main.rs +++ b/crates/cli/database_backup/src/main.rs @@ -1,7 +1,8 @@ -use container_common::anyhow_result::AnyhowResult; use easyenv::init_all_with_default_logging; use log::info; +use container_common::anyhow_result::AnyhowResult; + fn main() -> AnyhowResult<()> { init_all_with_default_logging(None); diff --git a/crates/cli/database_cleanup/src/main.rs b/crates/cli/database_cleanup/src/main.rs index 29e1d1a083..8e0e6818a4 100644 --- a/crates/cli/database_cleanup/src/main.rs +++ b/crates/cli/database_cleanup/src/main.rs @@ -1,7 +1,8 @@ -use container_common::anyhow_result::AnyhowResult; use easyenv::init_all_with_default_logging; use log::info; +use container_common::anyhow_result::AnyhowResult; + fn main() -> AnyhowResult<()> { init_all_with_default_logging(None); diff --git a/crates/cli/scrape_test/src/main.rs b/crates/cli/scrape_test/src/main.rs index 5169643e87..71abbd5d11 100644 --- a/crates/cli/scrape_test/src/main.rs +++ b/crates/cli/scrape_test/src/main.rs @@ -1,4 +1,5 @@ use clap::{App, Arg}; + use errors::{anyhow, AnyhowResult}; use web_scrapers::scrape_supported_webpage::scrape_supported_webpage; diff --git a/crates/lib/actix_helpers/src/extractors/get_ip_from_header.rs b/crates/lib/actix_helpers/src/extractors/get_ip_from_header.rs index 7eb82e7eaf..514b1b1fbb 100644 --- a/crates/lib/actix_helpers/src/extractors/get_ip_from_header.rs +++ b/crates/lib/actix_helpers/src/extractors/get_ip_from_header.rs @@ -1,6 +1,7 @@ +use std::str::FromStr; + use actix_http::header::HeaderMap; use actix_http::header::HeaderName; -use std::str::FromStr; pub (crate) fn get_ip_from_header(headers: &HeaderMap, header_name: &str) -> Option { if let Ok(header_name) = HeaderName::from_str(header_name) { diff --git a/crates/lib/actix_helpers/src/extractors/get_service_request_ip_address.rs b/crates/lib/actix_helpers/src/extractors/get_service_request_ip_address.rs index 726e825e32..634f03e387 100644 --- a/crates/lib/actix_helpers/src/extractors/get_service_request_ip_address.rs +++ b/crates/lib/actix_helpers/src/extractors/get_service_request_ip_address.rs @@ -1,4 +1,5 @@ use actix_web::dev::ServiceRequest; + use crate::extractors::get_ip_from_header::get_ip_from_header; pub fn get_service_request_ip_address(request: &ServiceRequest) -> String { diff --git a/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_filter.rs b/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_filter.rs index 0241074928..54ba046085 100644 --- a/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_filter.rs +++ b/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_filter.rs @@ -1,9 +1,10 @@ -use actix_web::Error; use actix_web::dev::{Service, Transform}; use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::Error; +use futures_util::future::{ok, Ready}; + use crate::middleware::banned_cidr_filter::banned_cidr_filter_middleware::BannedCidrFilterMiddleware; use crate::middleware::banned_cidr_filter::banned_cidr_set::BannedCidrSet; -use futures_util::future::{ok, Ready}; // There are two steps in middleware processing. // 1. Middleware initialization, middleware factory gets called with diff --git a/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_filter_middleware.rs b/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_filter_middleware.rs index b7086c8f6a..50a3c5f683 100644 --- a/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_filter_middleware.rs +++ b/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_filter_middleware.rs @@ -1,12 +1,15 @@ -use actix_web::Error; -use actix_web::dev::Service; +use std::net::IpAddr; +use std::str::FromStr; + use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::dev::Service; +use actix_web::Error; +use futures_util::future::{Either, err, Ready}; + use crate::extractors::get_service_request_ip_address::get_service_request_ip_address; use crate::middleware::banned_cidr_filter::banned_cidr_set::BannedCidrSet; use crate::middleware::banned_ip_filter::banned_error::BannedError; -use futures_util::future::{err, Either, Ready}; -use std::net::IpAddr; -use std::str::FromStr; + //use std::task::{Context, Poll}; pub struct BannedCidrFilterMiddleware { diff --git a/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_set.rs b/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_set.rs index 21f4e06790..e92cb76c7c 100644 --- a/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_set.rs +++ b/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/banned_cidr_set.rs @@ -1,11 +1,13 @@ -use cidr_utils::cidr::IpCidr; -use cidr_utils::num_bigint::BigUint; -use errors::{anyhow, AnyhowResult}; -use num_traits::cast::ToPrimitive; use std::collections::HashSet; use std::net::IpAddr; use std::sync::{Arc, RwLock}; +use cidr_utils::cidr::IpCidr; +use cidr_utils::num_bigint::BigUint; +use num_traits::cast::ToPrimitive; + +use errors::{anyhow, AnyhowResult}; + #[derive(Clone)] pub struct BannedCidrSet { cidr_set: Arc>> @@ -68,12 +70,15 @@ impl BannedCidrSet { #[cfg(test)] mod tests { - use cidr_utils::cidr::IpCidr; - use crate::middleware::banned_cidr_filter::banned_cidr_set::BannedCidrSet; use std::net::IpAddr; use std::str::FromStr; + + use cidr_utils::cidr::IpCidr; + use errors::AnyhowResult; + use crate::middleware::banned_cidr_filter::banned_cidr_set::BannedCidrSet; + fn to_ip(ip_address: &str) -> IpAddr { IpAddr::from_str(ip_address).expect("ip should have parsed") } diff --git a/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/load_cidr_ban_set_from_file.rs b/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/load_cidr_ban_set_from_file.rs index fe20cae033..fda7e59627 100644 --- a/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/load_cidr_ban_set_from_file.rs +++ b/crates/lib/actix_helpers/src/middleware/banned_cidr_filter/load_cidr_ban_set_from_file.rs @@ -1,11 +1,14 @@ -use cidr_utils::cidr::IpCidr; -use crate::middleware::banned_cidr_filter::banned_cidr_set::BannedCidrSet; -use errors::AnyhowResult; use std::collections::HashSet; use std::fs::File; use std::io::{BufRead, BufReader}; use std::path::Path; +use cidr_utils::cidr::IpCidr; + +use errors::AnyhowResult; + +use crate::middleware::banned_cidr_filter::banned_cidr_set::BannedCidrSet; + pub fn load_cidr_ban_set_from_file>(path: P) -> AnyhowResult { let file = File::open(path)?; let reader = BufReader::new(file); @@ -27,12 +30,14 @@ pub fn load_cidr_ban_set_from_file>(path: P) -> AnyhowResult PathBuf { // https://doc.rust-lang.org/cargo/reference/environment-variables.html let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR")); diff --git a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_error.rs b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_error.rs index 2815426b8f..0923700608 100644 --- a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_error.rs +++ b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_error.rs @@ -1,8 +1,8 @@ use actix_http::body::BoxBody; use actix_http::header::CONTENT_TYPE; -use actix_web::http::StatusCode; -use actix_web::http::header::ContentType; use actix_web::{HttpResponse, HttpResponseBuilder, ResponseError}; +use actix_web::http::header::ContentType; +use actix_web::http::StatusCode; #[derive(Debug)] pub struct BannedError; diff --git a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_ip_filter.rs b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_ip_filter.rs index e06f8f32bb..91d87ca159 100644 --- a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_ip_filter.rs +++ b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_ip_filter.rs @@ -1,9 +1,10 @@ -use actix_web::Error; use actix_web::dev::{Service, Transform}; use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::Error; +use futures_util::future::{ok, Ready}; + use crate::middleware::banned_ip_filter::banned_ip_filter_middleware::BannedIpFilterMiddleware; use crate::middleware::banned_ip_filter::ip_ban_list::ip_ban_list::IpBanList; -use futures_util::future::{ok, Ready}; // There are two steps in middleware processing. // 1. Middleware initialization, middleware factory gets called with diff --git a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_ip_filter_middleware.rs b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_ip_filter_middleware.rs index 1c5d0e8658..249891513a 100644 --- a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_ip_filter_middleware.rs +++ b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/banned_ip_filter_middleware.rs @@ -1,10 +1,12 @@ -use actix_web::Error; -use actix_web::dev::Service; use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::dev::Service; +use actix_web::Error; +use futures_util::future::{Either, err, Ready}; + use crate::extractors::get_service_request_ip_address::get_service_request_ip_address; use crate::middleware::banned_ip_filter::banned_error::BannedError; use crate::middleware::banned_ip_filter::ip_ban_list::ip_ban_list::IpBanList; -use futures_util::future::{err, Either, Ready}; + //use std::task::{Context, Poll}; // There are two steps in middleware processing. diff --git a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/ip_ban_list.rs b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/ip_ban_list.rs index 10ecd3c064..146d7df51d 100644 --- a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/ip_ban_list.rs +++ b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/ip_ban_list.rs @@ -1,8 +1,10 @@ -use crate::middleware::banned_ip_filter::ip_ban_list::ip_set::IpSet; -use errors::{anyhow, AnyhowResult}; use std::collections::HashMap; use std::sync::{Arc, RwLock}; +use errors::{anyhow, AnyhowResult}; + +use crate::middleware::banned_ip_filter::ip_ban_list::ip_set::IpSet; + #[derive(Clone)] pub struct IpBanList { ip_sets: Arc>> diff --git a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/load_ip_ban_list_from_directory.rs b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/load_ip_ban_list_from_directory.rs index 293fd2850b..a1edcde5cc 100644 --- a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/load_ip_ban_list_from_directory.rs +++ b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/load_ip_ban_list_from_directory.rs @@ -1,7 +1,9 @@ +use std::path::Path; + +use errors::AnyhowResult; + use crate::middleware::banned_ip_filter::ip_ban_list::ip_ban_list::IpBanList; use crate::middleware::banned_ip_filter::ip_ban_list::load_ip_set_from_file::load_ip_set_from_file; -use errors::AnyhowResult; -use std::path::Path; pub fn load_ip_ban_list_from_directory>(path: P) -> AnyhowResult { let ip_ban_list = IpBanList::new(); @@ -32,6 +34,7 @@ fn ignore_path(path: &Path) -> bool { #[cfg(test)] mod tests { use std::path::{Path, PathBuf}; + use crate::middleware::banned_ip_filter::ip_ban_list::load_ip_ban_list_from_directory::{ignore_path, load_ip_ban_list_from_directory}; fn test_file(path_from_repo_root: &str) -> PathBuf { diff --git a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/load_ip_set_from_file.rs b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/load_ip_set_from_file.rs index f465699c41..da8c29cd93 100644 --- a/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/load_ip_set_from_file.rs +++ b/crates/lib/actix_helpers/src/middleware/banned_ip_filter/ip_ban_list/load_ip_set_from_file.rs @@ -1,10 +1,12 @@ -use crate::middleware::banned_ip_filter::ip_ban_list::ip_set::IpSet; -use errors::AnyhowResult; use std::collections::HashSet; use std::fs::File; use std::io::{BufRead, BufReader}; use std::path::Path; +use errors::AnyhowResult; + +use crate::middleware::banned_ip_filter::ip_ban_list::ip_set::IpSet; + pub fn load_ip_set_from_file>(path: P) -> AnyhowResult { let file = File::open(path)?; let reader = BufReader::new(file); @@ -21,6 +23,7 @@ pub fn load_ip_set_from_file>(path: P) -> AnyhowResult { #[cfg(test)] mod tests { use std::path::PathBuf; + use crate::middleware::banned_ip_filter::ip_ban_list::load_ip_set_from_file::load_ip_set_from_file; fn test_file(path_from_repo_root: &str) -> PathBuf { diff --git a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoint_filter.rs b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoint_filter.rs index 4a314a6d31..a86cd8b7b7 100644 --- a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoint_filter.rs +++ b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoint_filter.rs @@ -1,9 +1,10 @@ -use actix_web::Error; use actix_web::dev::{Service, Transform}; use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::Error; +use futures_util::future::{ok, Ready}; + use crate::middleware::disabled_endpoint_filter::disabled_endpoint_filter_middleware::DisabledEndpointFilterMiddleware; use crate::middleware::disabled_endpoint_filter::disabled_endpoints::disabled_endpoints::DisabledEndpoints; -use futures_util::future::{ok, Ready}; // There are two steps in middleware processing. // 1. Middleware initialization, middleware factory gets called with diff --git a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoint_filter_middleware.rs b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoint_filter_middleware.rs index cf43ada21f..fad187995b 100644 --- a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoint_filter_middleware.rs +++ b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoint_filter_middleware.rs @@ -1,9 +1,11 @@ -use actix_web::Error; -use actix_web::dev::Service; use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::dev::Service; +use actix_web::Error; +use futures_util::future::{Either, err, Ready}; + use crate::middleware::disabled_endpoint_filter::disabled_endpoints::disabled_endpoints::DisabledEndpoints; use crate::middleware::disabled_endpoint_filter::disabled_error::DisabledError; -use futures_util::future::{err, Either, Ready}; + //use std::task::{Context, Poll}; // There are two steps in middleware processing. diff --git a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/disabled_endpoints.rs b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/disabled_endpoints.rs index 02304d100c..05f8913f49 100644 --- a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/disabled_endpoints.rs +++ b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/disabled_endpoints.rs @@ -1,6 +1,7 @@ +use std::sync::Arc; + use crate::middleware::disabled_endpoint_filter::disabled_endpoints::exact_match_disabled_endpoints::ExactMatchDisabledEndpoints; use crate::middleware::disabled_endpoint_filter::disabled_endpoints::prefix_disabled_endpoints::PrefixDisabledEndpoints; -use std::sync::Arc; #[derive(Clone)] pub struct DisabledEndpoints { diff --git a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/exact_match_disabled_endpoints.rs b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/exact_match_disabled_endpoints.rs index 61f181ff05..ab1a25f3d8 100644 --- a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/exact_match_disabled_endpoints.rs +++ b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/exact_match_disabled_endpoints.rs @@ -1,9 +1,10 @@ -use errors::AnyhowResult; use std::collections::HashSet; use std::fs::File; use std::io::{BufRead, BufReader}; use std::path::Path; +use errors::AnyhowResult; + pub struct ExactMatchDisabledEndpoints { endpoints: HashSet } diff --git a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/prefix_disabled_endpoints.rs b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/prefix_disabled_endpoints.rs index 78c0aef536..6ae653faa6 100644 --- a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/prefix_disabled_endpoints.rs +++ b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_endpoints/prefix_disabled_endpoints.rs @@ -1,9 +1,10 @@ -use errors::AnyhowResult; use std::collections::HashSet; use std::fs::File; use std::io::{BufRead, BufReader}; use std::path::Path; +use errors::AnyhowResult; + pub struct PrefixDisabledEndpoints { endpoint_prefixes: HashSet } diff --git a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_error.rs b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_error.rs index 6f33b0ac94..30ddd579d8 100644 --- a/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_error.rs +++ b/crates/lib/actix_helpers/src/middleware/disabled_endpoint_filter/disabled_error.rs @@ -1,8 +1,8 @@ use actix_http::body::BoxBody; use actix_http::header::CONTENT_TYPE; -use actix_web::http::StatusCode; -use actix_web::http::header::ContentType; use actix_web::{HttpResponse, HttpResponseBuilder, ResponseError}; +use actix_web::http::header::ContentType; +use actix_web::http::StatusCode; #[derive(Debug)] pub struct DisabledError; diff --git a/crates/lib/actix_helpers/src/response_serializers/error_to_json_http_response.rs b/crates/lib/actix_helpers/src/response_serializers/error_to_json_http_response.rs index 1ee91b1d7c..826a504020 100644 --- a/crates/lib/actix_helpers/src/response_serializers/error_to_json_http_response.rs +++ b/crates/lib/actix_helpers/src/response_serializers/error_to_json_http_response.rs @@ -1,7 +1,7 @@ -use actix_web::HttpResponse; -use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::header::ContentType; +use actix_web::HttpResponse; +use actix_web::HttpResponseBuilder; use serde::Serialize; /// Turn error responses into JSON HTTP responses with appropriate status code diff --git a/crates/lib/actix_helpers/src/route_builder.rs b/crates/lib/actix_helpers/src/route_builder.rs index 7fa16fecec..62e8b9979c 100644 --- a/crates/lib/actix_helpers/src/route_builder.rs +++ b/crates/lib/actix_helpers/src/route_builder.rs @@ -1,8 +1,8 @@ use actix_http::body::MessageBody; use actix_service::ServiceFactory; +use actix_web::{App, FromRequest, HttpResponse, Responder, web}; use actix_web::dev::{Handler, ServiceRequest, ServiceResponse}; use actix_web::error::Error; -use actix_web::{App, web, HttpResponse, FromRequest, Responder}; // TODO: Check that routes don't overlap. // TODO: Properly handle scoped routes in a nice DSL. diff --git a/crates/lib/api_clients/cloud_storage/src/bucket_client.rs b/crates/lib/api_clients/cloud_storage/src/bucket_client.rs index 4a3e3c7b0b..ea689d0b2f 100644 --- a/crates/lib/api_clients/cloud_storage/src/bucket_client.rs +++ b/crates/lib/api_clients/cloud_storage/src/bucket_client.rs @@ -1,3 +1,6 @@ +use std::path::Path; +use std::time::Duration; + use anyhow::anyhow; use anyhow::bail; use log::info; @@ -5,13 +8,8 @@ use log::warn; use s3::bucket::Bucket; use s3::creds::Credentials; use s3::region::Region; -use std::io::Read; -use std::path::{PathBuf, Path}; -use std::str::FromStr; -use std::time::Duration; use tokio::fs::File; -use tokio::io::AsyncBufReadExt; -use tokio::io::{AsyncBufRead, BufReader, AsyncReadExt}; +use tokio::io::AsyncReadExt; #[derive(Clone)] pub struct BucketClient { diff --git a/crates/lib/api_clients/cloud_storage/src/bucket_path_unifier.rs b/crates/lib/api_clients/cloud_storage/src/bucket_path_unifier.rs index fbe67eeb6e..876e285909 100644 --- a/crates/lib/api_clients/cloud_storage/src/bucket_path_unifier.rs +++ b/crates/lib/api_clients/cloud_storage/src/bucket_path_unifier.rs @@ -1,7 +1,7 @@ -use buckets::util::hashed_directory_path_short_string::hashed_directory_path_short_string; -use container_common::anyhow_result::AnyhowResult; use std::path::PathBuf; +use buckets::util::hashed_directory_path_short_string::hashed_directory_path_short_string; + /// This is designed to make it centrally configurable where /// different types of objects are stored. #[deprecated(note = "see the 'buckets' crate for a better approach")] @@ -261,9 +261,10 @@ impl BucketPathUnifier { #[cfg(test)] mod tests { - use crate::bucket_path_unifier::BucketPathUnifier; use std::path::PathBuf; + use crate::bucket_path_unifier::BucketPathUnifier; + fn get_instance() -> BucketPathUnifier { BucketPathUnifier { // TTS diff --git a/crates/lib/api_clients/fakeyou_client/src/fakeyou_api_client.rs b/crates/lib/api_clients/fakeyou_client/src/fakeyou_api_client.rs index 34e14d6d56..2b4a52310f 100644 --- a/crates/lib/api_clients/fakeyou_client/src/fakeyou_api_client.rs +++ b/crates/lib/api_clients/fakeyou_client/src/fakeyou_api_client.rs @@ -1,13 +1,15 @@ -use backoff::future::retry; -use backoff::{ExponentialBackoff, ExponentialBackoffBuilder}; -use crate::api::tts_inference::{CreateTtsInferenceRequest, CreateTtsInferenceResponse, TtsInferenceJobStatus}; -use crate::credentials::FakeYouCredentials; -use errors::{anyhow, AnyhowError, AnyhowResult}; -use reqwest::cookie::Jar; -use reqwest::{Client, ClientBuilder, RequestBuilder, StatusCode, Url}; use std::sync::Arc; use std::time::Duration; + +use backoff::{ExponentialBackoff, ExponentialBackoffBuilder}; +use backoff::future::retry; +use errors::{anyhow, AnyhowError, AnyhowResult}; use log::{error, warn}; +use reqwest::{Client, ClientBuilder, RequestBuilder, StatusCode, Url}; +use reqwest::cookie::Jar; + +use crate::api::tts_inference::{CreateTtsInferenceRequest, CreateTtsInferenceResponse, TtsInferenceJobStatus}; +use crate::credentials::FakeYouCredentials; const AUTHORIZATION_HEADER: &str = "Authorization"; const SESSION_COOKIE_NAME : &str = "session"; diff --git a/crates/lib/api_clients/google_drive_common/src/google_drive_download_command.rs b/crates/lib/api_clients/google_drive_common/src/google_drive_download_command.rs index fe8774ec28..85718c78bd 100644 --- a/crates/lib/api_clients/google_drive_common/src/google_drive_download_command.rs +++ b/crates/lib/api_clients/google_drive_common/src/google_drive_download_command.rs @@ -1,12 +1,12 @@ +use std::process::Command; + use anyhow::anyhow; +use log::info; +use tempdir::TempDir; + use container_common::anyhow_result::AnyhowResult; use container_common::token::random_crockford_token::random_crockford_token; -use log::{info, warn}; -use std::io::{BufReader, Read}; -use std::path::{PathBuf, Path}; -use std::process::Command; use subprocess_common::docker_options::DockerOptions; -use tempdir::TempDir; /// This is a Python script that uses the `gdown` package to download from Google Drive. /// We're using this because it's a hack that gets around OAuth gateways. All the Rust diff --git a/crates/lib/api_clients/twitch_common/src/cheers.rs b/crates/lib/api_clients/twitch_common/src/cheers.rs index 4d55ede5a0..91276c1d51 100644 --- a/crates/lib/api_clients/twitch_common/src/cheers.rs +++ b/crates/lib/api_clients/twitch_common/src/cheers.rs @@ -1,5 +1,6 @@ -use once_cell::sync::Lazy; use std::collections::HashSet; + +use once_cell::sync::Lazy; use regex::Regex; // NB: This can be used as a nice, succinct macro with once_cell: diff --git a/crates/lib/api_clients/twitch_common/src/oauth_token_builder.rs b/crates/lib/api_clients/twitch_common/src/oauth_token_builder.rs index 49588c7ed2..7409603aea 100644 --- a/crates/lib/api_clients/twitch_common/src/oauth_token_builder.rs +++ b/crates/lib/api_clients/twitch_common/src/oauth_token_builder.rs @@ -1,5 +1,5 @@ +use twitch_oauth2::{ClientId, ClientSecret, Scope}; use twitch_oauth2::tokens::UserTokenBuilder; -use twitch_oauth2::{Scope, ClientSecret, ClientId, CsrfToken}; use twitch_oauth2::url::Url; /// Get the token builder with the scopes our app needs diff --git a/crates/lib/bootstrap/src/bootstrap.rs b/crates/lib/bootstrap/src/bootstrap.rs index 62e2b311fb..3c8f64a3b5 100644 --- a/crates/lib/bootstrap/src/bootstrap.rs +++ b/crates/lib/bootstrap/src/bootstrap.rs @@ -1,7 +1,9 @@ +use std::path::Path; + +use log::info; + use errors::{anyhow, AnyhowResult}; use server_environment::ServerEnvironment; -use std::path::Path; -use log::info; pub struct BootstrapArgs<'a, P: AsRef> { /// The name of the application or service diff --git a/crates/lib/caching/memory_caching/src/multi_item_ttl_cache.rs b/crates/lib/caching/memory_caching/src/multi_item_ttl_cache.rs index 5c0c727b99..fa8ee84dc7 100644 --- a/crates/lib/caching/memory_caching/src/multi_item_ttl_cache.rs +++ b/crates/lib/caching/memory_caching/src/multi_item_ttl_cache.rs @@ -1,9 +1,11 @@ -use anyhow::bail; -use errors::AnyhowResult; -use lru_time_cache::LruCache; use std::sync::{Arc, Mutex}; use std::time::Duration; +use anyhow::bail; +use lru_time_cache::LruCache; + +use errors::AnyhowResult; + /// Essentially a wrapper around LruCache. #[derive(Clone)] pub struct MultiItemTtlCache { diff --git a/crates/lib/caching/memory_caching/src/single_item_ttl_cache.rs b/crates/lib/caching/memory_caching/src/single_item_ttl_cache.rs index ebcfced121..696a7782a9 100644 --- a/crates/lib/caching/memory_caching/src/single_item_ttl_cache.rs +++ b/crates/lib/caching/memory_caching/src/single_item_ttl_cache.rs @@ -1,9 +1,11 @@ -use anyhow::bail; -use errors::AnyhowResult; -use lru_time_cache::LruCache; use std::sync::{Arc, Mutex}; use std::time::Duration; +use anyhow::bail; +use lru_time_cache::LruCache; + +use errors::AnyhowResult; + /// NB: There's only ONE ITEM of ONE TYPE in the cache. We can use a single key. const CACHE_KEY : &str = "ITEM"; @@ -73,6 +75,7 @@ impl SingleItemTtlCache { mod tests { use std::thread; use std::time::Duration; + use crate::single_item_ttl_cache::SingleItemTtlCache; #[test] diff --git a/crates/lib/caching/memory_caching/src/ttl_key_counter.rs b/crates/lib/caching/memory_caching/src/ttl_key_counter.rs index 40c42c0b40..c14b589e5b 100644 --- a/crates/lib/caching/memory_caching/src/ttl_key_counter.rs +++ b/crates/lib/caching/memory_caching/src/ttl_key_counter.rs @@ -1,9 +1,11 @@ -use anyhow::bail; -use errors::AnyhowResult; -use lru_time_cache::LruCache; use std::sync::{Arc, Mutex}; use std::time::Duration; +use anyhow::bail; +use lru_time_cache::LruCache; + +use errors::AnyhowResult; + /// Maintain counters for keys with a TTL #[derive(Clone)] pub struct TtlKeyCounter { @@ -40,9 +42,10 @@ impl TtlKeyCounter { #[cfg(test)] mod tests { use std::thread; - use crate::ttl_key_counter::TtlKeyCounter; use std::time::Duration; + use crate::ttl_key_counter::TtlKeyCounter; + #[test] fn test_key_first_count() { let counter = TtlKeyCounter::create_with_duration(Duration::from_secs(2)); diff --git a/crates/lib/caching/redis_caching/src/redis_ttl_cache.rs b/crates/lib/caching/redis_caching/src/redis_ttl_cache.rs index 3449cf2c08..00c8a82bb1 100644 --- a/crates/lib/caching/redis_caching/src/redis_ttl_cache.rs +++ b/crates/lib/caching/redis_caching/src/redis_ttl_cache.rs @@ -1,8 +1,10 @@ use std::future::Future; -use r2d2_redis::RedisConnectionManager; + use r2d2_redis::r2d2::{Pool, PooledConnection}; use r2d2_redis::redis::Commands; +use r2d2_redis::RedisConnectionManager; use serde::{Deserialize, Serialize}; + use errors::AnyhowResult; const DEFAULT_TTL_SECONDS : usize = 60; diff --git a/crates/lib/concurrency/src/relaxed_atomic_bool.rs b/crates/lib/concurrency/src/relaxed_atomic_bool.rs index 88064f4a6c..08861c6030 100644 --- a/crates/lib/concurrency/src/relaxed_atomic_bool.rs +++ b/crates/lib/concurrency/src/relaxed_atomic_bool.rs @@ -29,6 +29,7 @@ impl RelaxedAtomicBool { mod tests { use std::thread; use std::time::{Duration, Instant}; + use crate::relaxed_atomic_bool::RelaxedAtomicBool; #[test] diff --git a/crates/lib/crockford/src/crockford_entropy.rs b/crates/lib/crockford/src/crockford_entropy.rs index d78fa1d28a..94f6d559c2 100644 --- a/crates/lib/crockford/src/crockford_entropy.rs +++ b/crates/lib/crockford/src/crockford_entropy.rs @@ -1,6 +1,7 @@ -use crate::{CROCKFORD_LOWERCASE_CHARSET, CROCKFORD_UPPERCASE_CHARSET}; use rand::Rng; +use crate::{CROCKFORD_LOWERCASE_CHARSET, CROCKFORD_UPPERCASE_CHARSET}; + // TODO: Modify these routines to filter out intra-string swear words. /// Generate a crockford-encoded entropy string (uppercase) @@ -26,6 +27,7 @@ fn crockford_entropy(length: usize, character_set: &[u8]) -> String { #[cfg(test)] mod tests { use std::collections::HashSet; + use crate::crockford_entropy::{crockford_entropy_lower, crockford_entropy_upper}; #[test] diff --git a/crates/lib/crockford/src/lib.rs b/crates/lib/crockford/src/lib.rs index c08fefaba0..919e62e374 100644 --- a/crates/lib/crockford/src/lib.rs +++ b/crates/lib/crockford/src/lib.rs @@ -17,6 +17,10 @@ #![allow(dead_code)] #![allow(non_snake_case)] +pub use crockford_entropy::crockford_entropy_lower; +// Re-export +pub use crockford_entropy::crockford_entropy_upper; + /// Crockford characters (uppercase) const CROCKFORD_UPPERCASE_CHARSET: &[u8] = b"0123456789ABCDEFGHJKMNPQRSTVWXYZ"; @@ -25,7 +29,3 @@ const CROCKFORD_LOWERCASE_CHARSET: &[u8] = b"0123456789abcdefghjkmnpqrstvwxyz"; mod crockford_entropy; -// Re-export -pub use crockford_entropy::crockford_entropy_upper; -pub use crockford_entropy::crockford_entropy_lower; - diff --git a/crates/lib/deprecated/container_common/src/files/read_toml_file_to_struct.rs b/crates/lib/deprecated/container_common/src/files/read_toml_file_to_struct.rs index 6fbeff1c95..f2308920bc 100644 --- a/crates/lib/deprecated/container_common/src/files/read_toml_file_to_struct.rs +++ b/crates/lib/deprecated/container_common/src/files/read_toml_file_to_struct.rs @@ -1,9 +1,11 @@ -use crate::anyhow_result::AnyhowResult; -use serde::de::DeserializeOwned; use std::fs::File; use std::io::Read; use std::path::Path; +use serde::de::DeserializeOwned; + +use crate::anyhow_result::AnyhowResult; + /// Read a TOML file into a struct. pub fn read_toml_file_to_struct(filename: P) -> AnyhowResult where @@ -20,11 +22,13 @@ where #[cfg(test)] mod tests { - use crate::files::read_toml_file_to_struct::read_toml_file_to_struct; - use serde::Deserialize; use std::io::Write; + + use serde::Deserialize; use tempfile::NamedTempFile; + use crate::files::read_toml_file_to_struct::read_toml_file_to_struct; + #[derive(Deserialize)] struct TestStruct { name: String, diff --git a/crates/lib/deprecated/container_common/src/filesystem/check_directory_exists.rs b/crates/lib/deprecated/container_common/src/filesystem/check_directory_exists.rs index c75aec81e1..43487de769 100644 --- a/crates/lib/deprecated/container_common/src/filesystem/check_directory_exists.rs +++ b/crates/lib/deprecated/container_common/src/filesystem/check_directory_exists.rs @@ -1,7 +1,9 @@ -use anyhow::bail; -use crate::anyhow_result::AnyhowResult; use std::path::PathBuf; +use anyhow::bail; + +use crate::anyhow_result::AnyhowResult; + pub fn check_directory_exists(path: &PathBuf) -> AnyhowResult<()> { if !path.exists() { bail!("Path doesn't exist: {:?}", path); diff --git a/crates/lib/deprecated/container_common/src/filesystem/check_file_exists.rs b/crates/lib/deprecated/container_common/src/filesystem/check_file_exists.rs index d7619aa77d..ef239c0bf8 100644 --- a/crates/lib/deprecated/container_common/src/filesystem/check_file_exists.rs +++ b/crates/lib/deprecated/container_common/src/filesystem/check_file_exists.rs @@ -1,7 +1,9 @@ -use anyhow::bail; -use crate::anyhow_result::AnyhowResult; use std::path::PathBuf; +use anyhow::bail; + +use crate::anyhow_result::AnyhowResult; + pub fn check_file_exists(path: &PathBuf) -> AnyhowResult<()> { if !path.exists() { bail!("Path doesn't exist: {:?}", path); diff --git a/crates/lib/deprecated/container_common/src/filesystem/safe_delete_possible_temp_file.rs b/crates/lib/deprecated/container_common/src/filesystem/safe_delete_possible_temp_file.rs index 0e083c39c3..5d2f25c8eb 100644 --- a/crates/lib/deprecated/container_common/src/filesystem/safe_delete_possible_temp_file.rs +++ b/crates/lib/deprecated/container_common/src/filesystem/safe_delete_possible_temp_file.rs @@ -1,6 +1,7 @@ -use crate::filesystem::safe_delete_temp_file::safe_delete_temp_file; use std::path::Path; +use crate::filesystem::safe_delete_temp_file::safe_delete_temp_file; + pub fn safe_delete_possible_temp_file>(maybe_file_path: Option

) { if let Some(file_path) = maybe_file_path { safe_delete_temp_file(file_path) diff --git a/crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_directory.rs b/crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_directory.rs index ac0a9b6171..e1a281ff09 100644 --- a/crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_directory.rs +++ b/crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_directory.rs @@ -1,8 +1,9 @@ -use log::info; -use log::warn; use std::fs; use std::path::Path; +use log::info; +use log::warn; + pub fn safe_delete_temp_directory>(directory_path: P) { // NB: We should be using a tempdir, but to make absolutely certain we don't overflow the disk... let printable_name = directory_path.as_ref().to_str().unwrap_or("bad directory"); diff --git a/crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_file.rs b/crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_file.rs index b4b955515e..c69411f013 100644 --- a/crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_file.rs +++ b/crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_file.rs @@ -1,8 +1,9 @@ -use log::info; -use log::warn; use std::fs; use std::path::Path; +use log::info; +use log::warn; + pub fn safe_delete_temp_file>(file_path: P) { // NB: We should be using a tempdir, but to make absolutely certain we don't overflow the disk... let printable_name = file_path.as_ref().to_str().unwrap_or("bad filename"); diff --git a/crates/lib/deprecated/container_common/src/i18n/supported_languages_for_models.rs b/crates/lib/deprecated/container_common/src/i18n/supported_languages_for_models.rs index eef57a4a03..fd8be04bf1 100644 --- a/crates/lib/deprecated/container_common/src/i18n/supported_languages_for_models.rs +++ b/crates/lib/deprecated/container_common/src/i18n/supported_languages_for_models.rs @@ -1,5 +1,6 @@ +use std::collections::{HashMap, HashSet}; + use once_cell::sync::Lazy; -use std::collections::{HashSet, HashMap}; /// These are language tags we try to support. static SUPPORTED_LANGUAGES_FOR_MODELS : Lazy> = Lazy::new(|| { diff --git a/crates/lib/deprecated/container_common/src/numerics/signed_to_unsigned.rs b/crates/lib/deprecated/container_common/src/numerics/signed_to_unsigned.rs index 205bb62b57..547af72351 100644 --- a/crates/lib/deprecated/container_common/src/numerics/signed_to_unsigned.rs +++ b/crates/lib/deprecated/container_common/src/numerics/signed_to_unsigned.rs @@ -57,11 +57,11 @@ pub fn isize_to_unsigned_zeroing_negatives(num: isize) -> usize { #[cfg(test)] mod tests { - use crate::numerics::signed_to_unsigned::i8_to_unsigned_zeroing_negatives; + use crate::numerics::signed_to_unsigned::i128_to_unsigned_zeroing_negatives; use crate::numerics::signed_to_unsigned::i16_to_unsigned_zeroing_negatives; use crate::numerics::signed_to_unsigned::i32_to_unsigned_zeroing_negatives; use crate::numerics::signed_to_unsigned::i64_to_unsigned_zeroing_negatives; - use crate::numerics::signed_to_unsigned::i128_to_unsigned_zeroing_negatives; + use crate::numerics::signed_to_unsigned::i8_to_unsigned_zeroing_negatives; use crate::numerics::signed_to_unsigned::isize_to_unsigned_zeroing_negatives; #[test] diff --git a/crates/lib/deprecated/container_common/src/thread/async_thread_kill_signal.rs b/crates/lib/deprecated/container_common/src/thread/async_thread_kill_signal.rs index b27fc13acb..2843fcc8c9 100644 --- a/crates/lib/deprecated/container_common/src/thread/async_thread_kill_signal.rs +++ b/crates/lib/deprecated/container_common/src/thread/async_thread_kill_signal.rs @@ -1,7 +1,9 @@ -use anyhow::anyhow; -use crate::anyhow_result::AnyhowResult; use std::sync::{Arc, RwLock}; -use std::time::{Instant, Duration}; +use std::time::{Duration, Instant}; + +use anyhow::anyhow; + +use crate::anyhow_result::AnyhowResult; /// Sometimes I need to kill a thread from somewhere else. This is a mechanism /// that enables it. This utility can be combined with logic that will kill a diff --git a/crates/lib/deprecated/container_common/src/token/random_prefix_crockford_token.rs b/crates/lib/deprecated/container_common/src/token/random_prefix_crockford_token.rs index 0a20607e6d..c03cd5fe6c 100644 --- a/crates/lib/deprecated/container_common/src/token/random_prefix_crockford_token.rs +++ b/crates/lib/deprecated/container_common/src/token/random_prefix_crockford_token.rs @@ -1,7 +1,8 @@ use anyhow::anyhow; -use crate::anyhow_result::AnyhowResult; use rand::Rng; +use crate::anyhow_result::AnyhowResult; + // Crockford characters const CROCKFORD_UPPERCASE_CHARSET: &[u8] = b"0123456789ABCDEFGHJKMNPQRSTVWXYZ"; diff --git a/crates/lib/deprecated/http_server_common/src/cors.rs b/crates/lib/deprecated/http_server_common/src/cors.rs index a388500040..8f9a38861b 100644 --- a/crates/lib/deprecated/http_server_common/src/cors.rs +++ b/crates/lib/deprecated/http_server_common/src/cors.rs @@ -1,5 +1,6 @@ use actix_cors::Cors; use log::info; + use reusable_types::server_environment::ServerEnvironment; /// Return cors config for FakeYou / Vocodes / OBS / local development @@ -204,13 +205,13 @@ pub fn add_development_only(cors: Cors) -> Cors { mod tests { use actix_cors::Cors; use actix_http::body::{BoxBody, EitherBody}; - use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform}; + use actix_web::dev::{ServiceResponse, Transform}; use actix_web::http::StatusCode; use actix_web::test::TestRequest; - use actix_web::{Error, test}; - use crate::cors::build_cors_config; + use actix_web::test; use reusable_types::server_environment::ServerEnvironment; - use speculoos::{assert_that, asserting}; + use speculoos::asserting; + use super::build_cors_config; async fn make_test_request(cors: &Cors, hostname: &str) -> ServiceResponse> { let cors= cors.new_transform(test::ok_service()) diff --git a/crates/lib/deprecated/http_server_common/src/endpoints/root_index.rs b/crates/lib/deprecated/http_server_common/src/endpoints/root_index.rs index e48a1be567..5fcc6dca30 100644 --- a/crates/lib/deprecated/http_server_common/src/endpoints/root_index.rs +++ b/crates/lib/deprecated/http_server_common/src/endpoints/root_index.rs @@ -1,8 +1,5 @@ use actix_http::StatusCode; use actix_web::HttpResponse; - - - use log::debug; pub async fn get_root_index() -> HttpResponse { diff --git a/crates/lib/deprecated/http_server_common/src/error/common_server_error.rs b/crates/lib/deprecated/http_server_common/src/error/common_server_error.rs index 875d6a57de..7f24b0a1c0 100644 --- a/crates/lib/deprecated/http_server_common/src/error/common_server_error.rs +++ b/crates/lib/deprecated/http_server_common/src/error/common_server_error.rs @@ -1,7 +1,9 @@ -use actix_web::HttpResponse; +use std::fmt; + use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use std::fmt; +use actix_web::HttpResponse; + use crate::error::simple_json_error_response::simple_json_error_response; /// Common server errors that should handle 90% of cases. diff --git a/crates/lib/deprecated/http_server_common/src/error/simple_json_error_response.rs b/crates/lib/deprecated/http_server_common/src/error/simple_json_error_response.rs index 90d11b05d8..d9c8569134 100644 --- a/crates/lib/deprecated/http_server_common/src/error/simple_json_error_response.rs +++ b/crates/lib/deprecated/http_server_common/src/error/simple_json_error_response.rs @@ -1,5 +1,5 @@ -use actix_web::http::StatusCode; use actix_web::{HttpResponse, HttpResponseBuilder}; +use actix_web::http::StatusCode; /// Convert a string and status code to a JSON error response. pub fn simple_json_error_response( @@ -30,10 +30,11 @@ struct SimpleGenericJsonError { #[cfg(test)] mod tests { - use actix_http::body::{BoxBody, MessageBody}; - use crate::error::simple_json_error_response::simple_json_error_response; + use actix_http::body::MessageBody; use actix_web::http::StatusCode; + use crate::error::simple_json_error_response::simple_json_error_response; + #[test] pub fn serialization() { let response = simple_json_error_response( diff --git a/crates/lib/deprecated/http_server_common/src/request/get_request_api_token.rs b/crates/lib/deprecated/http_server_common/src/request/get_request_api_token.rs index 663d63fbc0..eafaf1ec6e 100644 --- a/crates/lib/deprecated/http_server_common/src/request/get_request_api_token.rs +++ b/crates/lib/deprecated/http_server_common/src/request/get_request_api_token.rs @@ -1,4 +1,5 @@ use actix_web::HttpRequest; + use crate::request::get_request_header_optional::get_request_header_optional; const API_TOKEN_HEADER : &str = "AUTHORIZATION"; diff --git a/crates/lib/deprecated/http_server_common/src/request/get_request_host.rs b/crates/lib/deprecated/http_server_common/src/request/get_request_host.rs index 159d69facc..1f2c9cb352 100644 --- a/crates/lib/deprecated/http_server_common/src/request/get_request_host.rs +++ b/crates/lib/deprecated/http_server_common/src/request/get_request_host.rs @@ -1,5 +1,6 @@ -use actix_web::HttpRequest; use actix_web::http::header::HOST; +use actix_web::HttpRequest; + use crate::request::get_request_header_optional::get_request_header_optional; /// Get the request host diff --git a/crates/lib/deprecated/http_server_common/src/request/get_request_ip.rs b/crates/lib/deprecated/http_server_common/src/request/get_request_ip.rs index 9760f66716..11fe9b1eb6 100644 --- a/crates/lib/deprecated/http_server_common/src/request/get_request_ip.rs +++ b/crates/lib/deprecated/http_server_common/src/request/get_request_ip.rs @@ -1,9 +1,10 @@ +use std::str::FromStr; + use actix_http::header::HeaderMap; use actix_http::header::HeaderName; -use actix_web::HttpRequest; use actix_web::dev::ServiceRequest; +use actix_web::HttpRequest; use log::debug; -use std::str::FromStr; pub fn get_request_ip(request: &HttpRequest) -> String { let headers = request.headers(); diff --git a/crates/lib/deprecated/http_server_common/src/response/response_error_helpers.rs b/crates/lib/deprecated/http_server_common/src/response/response_error_helpers.rs index 20e0010716..4a6be85b17 100644 --- a/crates/lib/deprecated/http_server_common/src/response/response_error_helpers.rs +++ b/crates/lib/deprecated/http_server_common/src/response/response_error_helpers.rs @@ -1,7 +1,6 @@ -use actix_web::HttpResponseBuilder; use actix_web::http::StatusCode; use actix_web::HttpResponse; - +use actix_web::HttpResponseBuilder; #[derive(Serialize)] pub struct SimpleGenericJsonError { diff --git a/crates/lib/deprecated/http_server_common/src/response/serialize_as_json_error.rs b/crates/lib/deprecated/http_server_common/src/response/serialize_as_json_error.rs index 9dec81d745..563091ca0e 100644 --- a/crates/lib/deprecated/http_server_common/src/response/serialize_as_json_error.rs +++ b/crates/lib/deprecated/http_server_common/src/response/serialize_as_json_error.rs @@ -1,6 +1,6 @@ +use actix_web::error::ResponseError; use actix_web::HttpResponse; use actix_web::HttpResponseBuilder; -use actix_web::error::ResponseError; use serde::Serialize; /// Turn error responses into JSON HTTP responses diff --git a/crates/lib/deprecated/http_server_common/src/response/to_json_success_response.rs b/crates/lib/deprecated/http_server_common/src/response/to_json_success_response.rs index 50ac1a7484..1b8200447d 100644 --- a/crates/lib/deprecated/http_server_common/src/response/to_json_success_response.rs +++ b/crates/lib/deprecated/http_server_common/src/response/to_json_success_response.rs @@ -1,5 +1,6 @@ -use serde::Serialize; use actix_web::HttpResponse; +use serde::Serialize; + use errors::AnyhowResult; pub fn to_json_success_response(response: &impl Serialize) -> AnyhowResult { diff --git a/crates/lib/deprecated/http_server_common/src/util/timer.rs b/crates/lib/deprecated/http_server_common/src/util/timer.rs index 0afd419a8b..930f4d3baa 100644 --- a/crates/lib/deprecated/http_server_common/src/util/timer.rs +++ b/crates/lib/deprecated/http_server_common/src/util/timer.rs @@ -1,6 +1,7 @@ use std::future::Future; +use std::time::{Duration, Instant}; + use log::warn; -use std::time::{Instant, Duration}; use once_cell::sync::Lazy; use regex::Regex; diff --git a/crates/lib/envvar/src/lib.rs b/crates/lib/envvar/src/lib.rs index 332039842f..48e2d072a4 100644 --- a/crates/lib/envvar/src/lib.rs +++ b/crates/lib/envvar/src/lib.rs @@ -18,6 +18,7 @@ #![allow(non_snake_case)] use std::path::{Path, PathBuf}; + use errors::{anyhow, AnyhowResult}; pub fn read_from_filename>(filename: P) -> AnyhowResult { diff --git a/crates/lib/errors/src/lib.rs b/crates/lib/errors/src/lib.rs index 107b0cfd30..1e14f8494c 100644 --- a/crates/lib/errors/src/lib.rs +++ b/crates/lib/errors/src/lib.rs @@ -18,12 +18,13 @@ #![allow(dead_code)] #![allow(non_snake_case)] +/// Useful re-export. +pub use anyhow::anyhow; +pub use anyhow::bail; + /// Easier to import than anyhow::Result. /// (Naming things "Result" pollutes the import scope or requires nasty renames. Gross.) pub type AnyhowResult = anyhow::Result; pub type AnyhowError = anyhow::Error; -/// Useful re-export. -pub use anyhow::anyhow; -pub use anyhow::bail; diff --git a/crates/lib/files/archives/src/list_archive_files.rs b/crates/lib/files/archives/src/list_archive_files.rs index 46af211040..11318d5c0a 100644 --- a/crates/lib/files/archives/src/list_archive_files.rs +++ b/crates/lib/files/archives/src/list_archive_files.rs @@ -1,4 +1,5 @@ use std::path::Path; + use errors::{anyhow, AnyhowResult}; // NB: Untested diff --git a/crates/lib/files/filesys/src/create_dir_all_if_missing.rs b/crates/lib/files/filesys/src/create_dir_all_if_missing.rs index 7803964797..f320e6790a 100644 --- a/crates/lib/files/filesys/src/create_dir_all_if_missing.rs +++ b/crates/lib/files/filesys/src/create_dir_all_if_missing.rs @@ -1,6 +1,7 @@ -use crate::directory_exists::directory_exists; use std::path::Path; +use crate::directory_exists::directory_exists; + /// create_dir_all, but only if it doesn't already exist. /// (maybe this will miss permission errors.) pub fn create_dir_all_if_missing>(path: P) -> std::io::Result<()> { diff --git a/crates/lib/files/filesys/src/directory_exists.rs b/crates/lib/files/filesys/src/directory_exists.rs index db48c13519..66cbb00864 100644 --- a/crates/lib/files/filesys/src/directory_exists.rs +++ b/crates/lib/files/filesys/src/directory_exists.rs @@ -16,6 +16,7 @@ pub fn directory_exists>(path: P) -> bool { #[cfg(test)] mod tests { use std::path::PathBuf; + use crate::directory_exists::directory_exists; #[test] diff --git a/crates/lib/files/filesys/src/file_exists.rs b/crates/lib/files/filesys/src/file_exists.rs index ce8ef5479a..9eb5dd2e42 100644 --- a/crates/lib/files/filesys/src/file_exists.rs +++ b/crates/lib/files/filesys/src/file_exists.rs @@ -14,6 +14,7 @@ pub fn file_exists>(path: P) -> bool { #[cfg(test)] mod tests { use std::path::PathBuf; + use crate::file_exists::file_exists; #[test] diff --git a/crates/lib/files/filesys/src/file_size.rs b/crates/lib/files/filesys/src/file_size.rs index e922f98287..89dcd79416 100644 --- a/crates/lib/files/filesys/src/file_size.rs +++ b/crates/lib/files/filesys/src/file_size.rs @@ -1,4 +1,5 @@ use std::path::Path; + use errors::{anyhow, AnyhowResult}; /// Return the file size of the file. @@ -18,6 +19,7 @@ pub fn file_size>(filename: P) -> AnyhowResult { #[cfg(test)] mod tests { use std::path::PathBuf; + use crate::file_size::file_size; fn test_file(path_from_repo_root: &str) -> PathBuf { diff --git a/crates/lib/files/filesys/src/filename_concat.rs b/crates/lib/files/filesys/src/filename_concat.rs index 8ca80df2e0..40d7ca8966 100644 --- a/crates/lib/files/filesys/src/filename_concat.rs +++ b/crates/lib/files/filesys/src/filename_concat.rs @@ -1,4 +1,5 @@ use std::path::{Path, PathBuf}; + use crate::path_to_string::path_to_string; /// Concatenate filenames while preserving path information. Do not join paths as directories. @@ -21,7 +22,8 @@ pub fn filename_concat_pathbuf, Q: AsRef>(part_1: P, part_2 #[cfg(test)] mod tests { - use std::path::{PathBuf}; + use std::path::PathBuf; + use crate::filename_concat::filename_concat; // Layout: Base, Suffix, Expected Result diff --git a/crates/lib/files/filesys/src/path_to_string.rs b/crates/lib/files/filesys/src/path_to_string.rs index e68bc07385..d5635a2895 100644 --- a/crates/lib/files/filesys/src/path_to_string.rs +++ b/crates/lib/files/filesys/src/path_to_string.rs @@ -7,7 +7,8 @@ pub fn path_to_string>(path: P) -> String { #[cfg(test)] mod tests { - use std::path::{PathBuf}; + use std::path::PathBuf; + use crate::path_to_string::path_to_string; const TEST_CASES : [&'static str; 9] = [ diff --git a/crates/lib/files/hashing/src/sha256/sha256_digest_buffer.rs b/crates/lib/files/hashing/src/sha256/sha256_digest_buffer.rs index 895ed0e488..5a9bcde311 100644 --- a/crates/lib/files/hashing/src/sha256/sha256_digest_buffer.rs +++ b/crates/lib/files/hashing/src/sha256/sha256_digest_buffer.rs @@ -1,7 +1,9 @@ -use errors::AnyhowResult; -use ring::digest::{Context, Digest, SHA256}; use std::io::Read; +use ring::digest::{Context, Digest, SHA256}; + +use errors::AnyhowResult; + #[inline] pub fn sha256_digest_buffer(mut reader: R) -> AnyhowResult { let mut context = Context::new(&SHA256); diff --git a/crates/lib/files/hashing/src/sha256/sha256_hash_bytes.rs b/crates/lib/files/hashing/src/sha256/sha256_hash_bytes.rs index 07f92459a1..cca082caab 100644 --- a/crates/lib/files/hashing/src/sha256/sha256_hash_bytes.rs +++ b/crates/lib/files/hashing/src/sha256/sha256_hash_bytes.rs @@ -1,8 +1,11 @@ -use crate::sha256::sha256_digest_buffer::sha256_digest_buffer; -use data_encoding::HEXLOWER_PERMISSIVE; use std::io::BufReader; + +use data_encoding::HEXLOWER_PERMISSIVE; + use errors::AnyhowResult; +use crate::sha256::sha256_digest_buffer::sha256_digest_buffer; + pub fn sha256_hash_bytes(bytes: &[u8]) -> AnyhowResult { let reader = BufReader::new(bytes); let digest = sha256_digest_buffer(reader)?; diff --git a/crates/lib/files/hashing/src/sha256/sha256_hash_file.rs b/crates/lib/files/hashing/src/sha256/sha256_hash_file.rs index df06723106..d4bbaab756 100644 --- a/crates/lib/files/hashing/src/sha256/sha256_hash_file.rs +++ b/crates/lib/files/hashing/src/sha256/sha256_hash_file.rs @@ -1,10 +1,13 @@ -use crate::sha256::sha256_digest_buffer::sha256_digest_buffer; -use data_encoding::HEXLOWER_PERMISSIVE; -use errors::AnyhowResult; use std::fs::File; use std::io::BufReader; use std::path::Path; +use data_encoding::HEXLOWER_PERMISSIVE; + +use errors::AnyhowResult; + +use crate::sha256::sha256_digest_buffer::sha256_digest_buffer; + pub fn sha256_hash_file>(filename: P) -> AnyhowResult { let input = File::open(filename)?; let reader = BufReader::new(input); diff --git a/crates/lib/files/hashing/src/sha256/sha256_hash_string.rs b/crates/lib/files/hashing/src/sha256/sha256_hash_string.rs index 80143c5386..dc6a2eb40b 100644 --- a/crates/lib/files/hashing/src/sha256/sha256_hash_string.rs +++ b/crates/lib/files/hashing/src/sha256/sha256_hash_string.rs @@ -1,7 +1,9 @@ -use crate::sha256::sha256_digest_buffer::sha256_digest_buffer; use data_encoding::HEXLOWER_PERMISSIVE; + use errors::AnyhowResult; +use crate::sha256::sha256_digest_buffer::sha256_digest_buffer; + pub fn sha256_hash_string(string_input: &str) -> AnyhowResult { let digest = sha256_digest_buffer(string_input.as_bytes())?; let hash = HEXLOWER_PERMISSIVE.encode(digest.as_ref()); diff --git a/crates/lib/files/media/src/decode_basic_audio_info.rs b/crates/lib/files/media/src/decode_basic_audio_info.rs index 28eecad98f..015419c212 100644 --- a/crates/lib/files/media/src/decode_basic_audio_info.rs +++ b/crates/lib/files/media/src/decode_basic_audio_info.rs @@ -1,13 +1,16 @@ -use crate::decode_webm_opus_info::decode_mkv_or_webm; -use crate::open_media_source_stream::{open_bytes_media_source_stream, open_file_media_source_stream}; -use errors::AnyhowResult; use std::path::{Path, PathBuf}; + use symphonia::core::audio::SampleBuffer; use symphonia::core::formats::{FormatOptions, FormatReader, Track}; use symphonia::core::io::MediaSourceStream; use symphonia::core::meta::MetadataOptions; use symphonia::core::probe::Hint; +use errors::AnyhowResult; + +use crate::decode_webm_opus_info::decode_mkv_or_webm; +use crate::open_media_source_stream::{open_bytes_media_source_stream, open_file_media_source_stream}; + // Returned if nothing could be decoded const NO_AUDIO_INFO : BasicAudioInfo = BasicAudioInfo { duration_millis: None, @@ -248,7 +251,9 @@ fn read_duration(format: &mut Box) -> AnyhowResult #[cfg(test)] mod tests { use std::path::PathBuf; + use errors::AnyhowResult; + use crate::decode_basic_audio_info::decode_basic_audio_bytes_info; fn test_file(path_from_repo_root: &str) -> PathBuf { @@ -261,6 +266,7 @@ mod tests { // NB: The following tests make assertions on data that gets uploaded to us from the browser APIs. mod browser_api_data { use crate::decode_basic_audio_info::decode_basic_audio_file_info; + use super::*; #[test] diff --git a/crates/lib/files/media/src/decode_webm_opus_info.rs b/crates/lib/files/media/src/decode_webm_opus_info.rs index 161548dff4..423f33c9e5 100644 --- a/crates/lib/files/media/src/decode_webm_opus_info.rs +++ b/crates/lib/files/media/src/decode_webm_opus_info.rs @@ -1,9 +1,11 @@ -use crate::decode_basic_audio_info::BasicAudioInfo; -use errors::{anyhow, AnyhowResult}; use symphonia::core::formats::{FormatOptions, FormatReader}; use symphonia::core::io::MediaSourceStream; use symphonia::default::formats::MkvReader; +use errors::{anyhow, AnyhowResult}; + +use crate::decode_basic_audio_info::BasicAudioInfo; + pub fn decode_mkv_or_webm( media_source_stream: MediaSourceStream ) -> AnyhowResult { diff --git a/crates/lib/files/media/src/open_media_source_stream.rs b/crates/lib/files/media/src/open_media_source_stream.rs index 54c341823f..a3c7f57f57 100644 --- a/crates/lib/files/media/src/open_media_source_stream.rs +++ b/crates/lib/files/media/src/open_media_source_stream.rs @@ -1,9 +1,11 @@ -use errors::AnyhowResult; use std::fs::File; use std::io::{BufReader, Cursor}; use std::path::Path; + use symphonia::core::io::{MediaSourceStream, ReadOnlySource}; +use errors::AnyhowResult; + pub fn open_file_media_source_stream>(file_path: P) -> AnyhowResult { let file = File::open(&file_path)?; let file_reader = BufReader::new(file); diff --git a/crates/lib/files/mimetypes/src/mimetype_for_file.rs b/crates/lib/files/mimetypes/src/mimetype_for_file.rs index 552b950f84..83af7721d6 100644 --- a/crates/lib/files/mimetypes/src/mimetype_for_file.rs +++ b/crates/lib/files/mimetypes/src/mimetype_for_file.rs @@ -18,6 +18,7 @@ pub fn get_mimetype_for_file_or_default>(file: P) -> std::io::Res #[cfg(test)] mod tests { use std::path::PathBuf; + use crate::mimetype_for_file::get_mimetype_for_file; fn test_file(path_from_repo_root: &str) -> PathBuf { diff --git a/crates/lib/idempotency/src/uuid.rs b/crates/lib/idempotency/src/uuid.rs index 4fc184b815..ef7c731b54 100644 --- a/crates/lib/idempotency/src/uuid.rs +++ b/crates/lib/idempotency/src/uuid.rs @@ -15,6 +15,7 @@ mod tests { mod generate_random_uuid { use std::collections::HashSet; + use super::*; #[test] diff --git a/crates/lib/jobs_common/src/job_progress_reporter/noop_job_progress_reporter.rs b/crates/lib/jobs_common/src/job_progress_reporter/noop_job_progress_reporter.rs index 9788873628..68c29edfa1 100644 --- a/crates/lib/jobs_common/src/job_progress_reporter/noop_job_progress_reporter.rs +++ b/crates/lib/jobs_common/src/job_progress_reporter/noop_job_progress_reporter.rs @@ -1,4 +1,5 @@ use container_common::anyhow_result::AnyhowResult; + use crate::job_progress_reporter::job_progress_reporter::{JobProgressReporter, JobProgressReporterBuilder}; /// A job progress reporter that does no work and has zero database dependencies. diff --git a/crates/lib/jobs_common/src/job_progress_reporter/redis_job_progress_reporter.rs b/crates/lib/jobs_common/src/job_progress_reporter/redis_job_progress_reporter.rs index 242c0db4f0..7a64c55d28 100644 --- a/crates/lib/jobs_common/src/job_progress_reporter/redis_job_progress_reporter.rs +++ b/crates/lib/jobs_common/src/job_progress_reporter/redis_job_progress_reporter.rs @@ -1,10 +1,12 @@ -use container_common::anyhow_result::AnyhowResult; -use crate::job_progress_reporter::job_progress_reporter::{JobProgressReporter, JobProgressReporterBuilder}; +use r2d2_redis::{r2d2, RedisConnectionManager}; use r2d2_redis::r2d2::PooledConnection; use r2d2_redis::redis::Commands; -use r2d2_redis::{r2d2, RedisConnectionManager}; + +use container_common::anyhow_result::AnyhowResult; use redis_common::redis_keys::RedisKeys; +use crate::job_progress_reporter::job_progress_reporter::{JobProgressReporter, JobProgressReporterBuilder}; + /// A job progress reporter that reports to Redis pub struct RedisJobProgressReporterBuilder { redis_pool: r2d2::Pool, diff --git a/crates/lib/jobs_common/src/job_stats.rs b/crates/lib/jobs_common/src/job_stats.rs index 7701501d06..80554a133f 100644 --- a/crates/lib/jobs_common/src/job_stats.rs +++ b/crates/lib/jobs_common/src/job_stats.rs @@ -1,7 +1,9 @@ -use anyhow::anyhow; -use errors::AnyhowResult; use std::sync::{Arc, RwLock}; +use anyhow::anyhow; + +use errors::AnyhowResult; + /// Job stats uses interior mutability to be easy to copy around. #[derive(Clone)] pub struct JobStats { diff --git a/crates/lib/jobs_common/src/noop_logger.rs b/crates/lib/jobs_common/src/noop_logger.rs index bd789c7a46..f86da4321f 100644 --- a/crates/lib/jobs_common/src/noop_logger.rs +++ b/crates/lib/jobs_common/src/noop_logger.rs @@ -1,4 +1,4 @@ -use chrono::{DateTime, Utc, TimeZone, Duration}; +use chrono::{DateTime, Duration, TimeZone, Utc}; use log::info; /// Log after periods of no work, but prevent spamming stdout. diff --git a/crates/lib/jobs_common/src/redis_job_status_logger.rs b/crates/lib/jobs_common/src/redis_job_status_logger.rs index 6e58ea3385..40688dcbd9 100644 --- a/crates/lib/jobs_common/src/redis_job_status_logger.rs +++ b/crates/lib/jobs_common/src/redis_job_status_logger.rs @@ -1,7 +1,8 @@ -use container_common::anyhow_result::AnyhowResult; -use r2d2_redis::RedisConnectionManager; use r2d2_redis::r2d2::PooledConnection; use r2d2_redis::redis::Commands; +use r2d2_redis::RedisConnectionManager; + +use container_common::anyhow_result::AnyhowResult; use redis_common::redis_keys::RedisKeys; #[deprecated(note="Use JobProgressReporterBuilder")] diff --git a/crates/lib/jobs_common/src/semi_persistent_cache_dir.rs b/crates/lib/jobs_common/src/semi_persistent_cache_dir.rs index 29dc860ab8..176e4f1949 100644 --- a/crates/lib/jobs_common/src/semi_persistent_cache_dir.rs +++ b/crates/lib/jobs_common/src/semi_persistent_cache_dir.rs @@ -1,7 +1,7 @@ -use container_common::anyhow_result::AnyhowResult; use std::fs; -use std::path::{PathBuf, Path}; -use tempdir::TempDir; +use std::path::{Path, PathBuf}; + +use container_common::anyhow_result::AnyhowResult; /// These are for files on the worker filesystems pub struct SemiPersistentCacheDir { diff --git a/crates/lib/mysql_queries/src/column_types/job_status.rs b/crates/lib/mysql_queries/src/column_types/job_status.rs index 05c8db2de2..8db063d433 100644 --- a/crates/lib/mysql_queries/src/column_types/job_status.rs +++ b/crates/lib/mysql_queries/src/column_types/job_status.rs @@ -1,6 +1,7 @@ //! These are columns where users can control the visibility of their data. use anyhow::anyhow; + use errors::AnyhowResult; /// To use this in a query, the query must have type annotations. diff --git a/crates/lib/mysql_queries/src/column_types/twitch_event_category.rs b/crates/lib/mysql_queries/src/column_types/twitch_event_category.rs index 90fc8eb849..645076381d 100644 --- a/crates/lib/mysql_queries/src/column_types/twitch_event_category.rs +++ b/crates/lib/mysql_queries/src/column_types/twitch_event_category.rs @@ -1,6 +1,7 @@ //! These are columns where users can control the visibility of their data. use anyhow::anyhow; + use errors::AnyhowResult; /// To use this in a query, the query must have type annotations. diff --git a/crates/lib/mysql_queries/src/column_types/vocoder_type.rs b/crates/lib/mysql_queries/src/column_types/vocoder_type.rs index e0abaf795d..eaaff36419 100644 --- a/crates/lib/mysql_queries/src/column_types/vocoder_type.rs +++ b/crates/lib/mysql_queries/src/column_types/vocoder_type.rs @@ -1,6 +1,7 @@ //! These denote the pretrained vocoders use anyhow::anyhow; + use errors::AnyhowResult; #[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, sqlx::Type)] diff --git a/crates/lib/mysql_queries/src/complex_models/event_responses.rs b/crates/lib/mysql_queries/src/complex_models/event_responses.rs index f421732dd7..c525e001ac 100644 --- a/crates/lib/mysql_queries/src/complex_models/event_responses.rs +++ b/crates/lib/mysql_queries/src/complex_models/event_responses.rs @@ -1,4 +1,3 @@ -use errors::AnyhowResult; use std::collections::HashMap; /// How TTS commands should be prefixed: !voiceName, /voiceName, etc. diff --git a/crates/lib/mysql_queries/src/mediators/badge_granter.rs b/crates/lib/mysql_queries/src/mediators/badge_granter.rs index 47d4805523..299a67b71a 100644 --- a/crates/lib/mysql_queries/src/mediators/badge_granter.rs +++ b/crates/lib/mysql_queries/src/mediators/badge_granter.rs @@ -1,12 +1,13 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::mediators::firehose_publisher::FirehosePublisher; -use log::{warn,info}; -use reusable_types::achievements::user_badge::UserBadge; +use log::warn; +use sqlx::MySqlPool; use sqlx::error::Error::Database; use sqlx::mysql::MySqlQueryResult; -use sqlx::{MySqlPool}; -use std::sync::Arc; + +use errors::AnyhowResult; +use reusable_types::achievements::user_badge::UserBadge; + +use crate::mediators::firehose_publisher::FirehosePublisher; #[derive(Clone)] pub struct BadgeGranter { diff --git a/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs b/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs index f39d3b86bb..e7186b5ea1 100644 --- a/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs +++ b/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs @@ -1,16 +1,17 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::tokens::Tokens; -use log::{warn,info}; +use log::warn; +use sqlx::MySqlPool; use sqlx::error::Error::Database; use sqlx::mysql::MySqlQueryResult; -use sqlx::{MySqlPool}; -use std::sync::Arc; + +use errors::AnyhowResult; use tokens::files::media_upload::MediaUploadToken; use tokens::jobs::inference::InferenceJobToken; use tokens::tokens::comments::CommentToken; use tokens::users::user::UserToken; +use crate::tokens::Tokens; + // TODO(bt, 2022-12-19): Convert this to a database 'enum'. Also, create an 'enums' package similar to 'tokens'. #[derive(Debug, Clone, Copy)] enum FirehoseEvent { diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs index 55f7505624..5f6b4ab06d 100644 --- a/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs +++ b/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs @@ -1,7 +1,8 @@ -use crate::payloads::generic_inference_args::lipsync_payload::{LipsyncAnimationAudioSource, LipsyncAnimationImageSource, LipsyncArgs}; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use errors::AnyhowResult; +use crate::payloads::generic_inference_args::lipsync_payload::LipsyncArgs; + /// Used to encode extra state for the `generic_inference_jobs` table. /// This should act somewhat like a serialized protobuf stored inside a record. #[derive(Clone, Debug, Serialize, Deserialize)] diff --git a/crates/lib/mysql_queries/src/queries/api_tokens/create_api_token.rs b/crates/lib/mysql_queries/src/queries/api_tokens/create_api_token.rs index 746a0c2aad..c8138045bd 100644 --- a/crates/lib/mysql_queries/src/queries/api_tokens/create_api_token.rs +++ b/crates/lib/mysql_queries/src/queries/api_tokens/create_api_token.rs @@ -1,9 +1,11 @@ use anyhow::anyhow; +use sqlx; +use sqlx::MySqlPool; + use errors::AnyhowResult; + use crate::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; use crate::tokens::Tokens; -use sqlx::MySqlPool; -use sqlx; /// Create a new API token for the user. /// If the user has more than five tokens, delete the least recent. diff --git a/crates/lib/mysql_queries/src/queries/api_tokens/delete_api_token.rs b/crates/lib/mysql_queries/src/queries/api_tokens/delete_api_token.rs index 56c3c57b7d..7e2bf23e53 100644 --- a/crates/lib/mysql_queries/src/queries/api_tokens/delete_api_token.rs +++ b/crates/lib/mysql_queries/src/queries/api_tokens/delete_api_token.rs @@ -1,7 +1,8 @@ use anyhow::anyhow; -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub async fn delete_api_token( user_token: &str, api_token: &str, diff --git a/crates/lib/mysql_queries/src/queries/api_tokens/edit_api_token.rs b/crates/lib/mysql_queries/src/queries/api_tokens/edit_api_token.rs index a6241100ea..6d7301568f 100644 --- a/crates/lib/mysql_queries/src/queries/api_tokens/edit_api_token.rs +++ b/crates/lib/mysql_queries/src/queries/api_tokens/edit_api_token.rs @@ -1,8 +1,7 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use log::warn; use sqlx::MySqlPool; -use std::collections::{HashSet, HashMap}; + +use errors::AnyhowResult; pub async fn edit_api_token( user_token: &str, diff --git a/crates/lib/mysql_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs b/crates/lib/mysql_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs index 85c8220493..6dd5fedcfe 100644 --- a/crates/lib/mysql_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs +++ b/crates/lib/mysql_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs @@ -1,8 +1,8 @@ -use anyhow::anyhow; -use chrono::{Utc, DateTime}; -use errors::AnyhowResult; +use chrono::Utc; use sqlx::MySqlPool; +use errors::AnyhowResult; + /// table: api_tokens #[derive(Debug)] pub struct AvailableApiToken { diff --git a/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log.rs b/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log.rs index 3263a0e445..366e0347b2 100644 --- a/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log.rs +++ b/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log.rs @@ -1,19 +1,16 @@ //! Audit logs are for entities that can be *edited* where we might lose the IP / edit history. use anyhow::anyhow; -use chrono::Utc; -use errors::AnyhowResult; -use enums::common::visibility::Visibility; use sqlx::MySqlPool; -use std::path::Path; + use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; use enums::by_table::audit_logs::audit_log_entity_type::AuditLogEntityType; +use errors::AnyhowResult; use tokens::tokens::audit_logs::AuditLogToken; use tokens::tokens::comments::CommentToken; use tokens::tokens::tts_models::TtsModelToken; use tokens::tokens::w2l_templates::W2lTemplateToken; use tokens::users::user::UserToken; -use tokens::voice_conversion::model::VoiceConversionModelToken; pub enum AuditLogEntityToken { Comment(CommentToken), diff --git a/crates/lib/mysql_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs b/crates/lib/mysql_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs index efdad00fb7..4d9c765e80 100644 --- a/crates/lib/mysql_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs +++ b/crates/lib/mysql_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs @@ -1,11 +1,10 @@ use anyhow::anyhow; -use chrono::{DateTime, NaiveDateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::i8_to_bool; -use log::warn; -use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::i8_to_bool; + pub struct StripeWebhookEventLog { pub stripe_event_id: String, diff --git a/crates/lib/mysql_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs b/crates/lib/mysql_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs index bdd626f639..09c1aeb1c1 100644 --- a/crates/lib/mysql_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs +++ b/crates/lib/mysql_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs @@ -1,8 +1,9 @@ use anyhow::anyhow; use chrono::NaiveDateTime; -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + // TODO: Make a trait with default impls to handle common query concerns. pub struct InsertStripeWebhookEventLog { diff --git a/crates/lib/mysql_queries/src/queries/comments/delete_comment.rs b/crates/lib/mysql_queries/src/queries/comments/delete_comment.rs index 34f859a21d..13452ce0ac 100644 --- a/crates/lib/mysql_queries/src/queries/comments/delete_comment.rs +++ b/crates/lib/mysql_queries/src/queries/comments/delete_comment.rs @@ -1,4 +1,5 @@ -use sqlx::{Executor, MySql, MySqlPool}; +use sqlx::{Executor, MySql}; + use errors::AnyhowResult; use tokens::tokens::comments::CommentToken; diff --git a/crates/lib/mysql_queries/src/queries/comments/edit_comment.rs b/crates/lib/mysql_queries/src/queries/comments/edit_comment.rs index 2879682c66..33d1956995 100644 --- a/crates/lib/mysql_queries/src/queries/comments/edit_comment.rs +++ b/crates/lib/mysql_queries/src/queries/comments/edit_comment.rs @@ -1,17 +1,10 @@ -use anyhow::anyhow; -use chrono::Utc; -use crate::queries::comments::comment_entity_token::CommentEntityToken; -use enums::by_table::comments::comment_entity_type::CommentEntityType; -use enums::common::visibility::Visibility; -use errors::AnyhowResult; -use sqlx::{Executor, MySql, MySqlPool}; use std::marker::PhantomData; -use std::path::Path; + +use anyhow::anyhow; +use sqlx::{Executor, MySql}; + +use errors::AnyhowResult; use tokens::tokens::comments::CommentToken; -use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::w2l_templates::W2lTemplateToken; -use tokens::users::user::UserToken; -use tokens::voice_conversion::model::VoiceConversionModelToken; pub struct Args<'e, 'c, E> where E: 'e + Executor<'c, Database = MySql> diff --git a/crates/lib/mysql_queries/src/queries/comments/get_comment.rs b/crates/lib/mysql_queries/src/queries/comments/get_comment.rs index 0bdbc2acac..d7ee7a5f04 100644 --- a/crates/lib/mysql_queries/src/queries/comments/get_comment.rs +++ b/crates/lib/mysql_queries/src/queries/comments/get_comment.rs @@ -1,10 +1,9 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::queries::comments::comment_entity_token::CommentEntityToken; +use sqlx::{Executor, MySql}; + use enums::by_table::comments::comment_entity_type::CommentEntityType; use errors::AnyhowResult; -use log::warn; -use sqlx::{Executor, MySql, MySqlPool}; use tokens::tokens::comments::CommentToken; use tokens::users::user::UserToken; diff --git a/crates/lib/mysql_queries/src/queries/comments/insert_comment.rs b/crates/lib/mysql_queries/src/queries/comments/insert_comment.rs index 34c7b0a3ff..569571896a 100644 --- a/crates/lib/mysql_queries/src/queries/comments/insert_comment.rs +++ b/crates/lib/mysql_queries/src/queries/comments/insert_comment.rs @@ -1,17 +1,13 @@ -use anyhow::anyhow; -use chrono::Utc; -use crate::queries::comments::comment_entity_token::CommentEntityToken; -use enums::by_table::comments::comment_entity_type::CommentEntityType; -use enums::common::visibility::Visibility; -use errors::AnyhowResult; -use sqlx::{Executor, MySql, MySqlPool}; use std::marker::PhantomData; -use std::path::Path; + +use anyhow::anyhow; +use sqlx::{Executor, MySql}; + +use errors::AnyhowResult; use tokens::tokens::comments::CommentToken; -use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::w2l_templates::W2lTemplateToken; use tokens::users::user::UserToken; -use tokens::voice_conversion::model::VoiceConversionModelToken; + +use crate::queries::comments::comment_entity_token::CommentEntityToken; pub struct InsertCommentArgs<'e, 'c, E> where E: 'e + Executor<'c, Database = MySql> diff --git a/crates/lib/mysql_queries/src/queries/comments/list_comments_for_entity.rs b/crates/lib/mysql_queries/src/queries/comments/list_comments_for_entity.rs index df129e3ff6..6ab2d61968 100644 --- a/crates/lib/mysql_queries/src/queries/comments/list_comments_for_entity.rs +++ b/crates/lib/mysql_queries/src/queries/comments/list_comments_for_entity.rs @@ -1,13 +1,14 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::queries::comments::comment_entity_token::CommentEntityToken; -use enums::by_table::comments::comment_entity_type::CommentEntityType; -use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; + +use errors::AnyhowResult; use tokens::tokens::comments::CommentToken; use tokens::users::user::UserToken; +use crate::queries::comments::comment_entity_token::CommentEntityToken; + pub struct CommentForList { pub token: CommentToken, diff --git a/crates/lib/mysql_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs b/crates/lib/mysql_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs index 53cd95e50f..7095864279 100644 --- a/crates/lib/mysql_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs +++ b/crates/lib/mysql_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs @@ -1,13 +1,16 @@ +use std::collections::BTreeSet; + use chrono::Utc; -use crate::column_types::job_status::JobStatus; -use crate::queries::generic_download::job::_keys::GenericDownloadJobId; +use sqlx::MySqlPool; + use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use sqlx::MySqlPool; -use std::collections::BTreeSet; use tokens::jobs::download::DownloadJobToken; +use crate::column_types::job_status::JobStatus; +use crate::queries::generic_download::job::_keys::GenericDownloadJobId; + /// table: generic_download_jobs #[derive(Debug)] pub struct AvailableDownloadJob { @@ -161,7 +164,9 @@ struct AvailableDownloadJobRawInternal { #[cfg(test)] mod tests { use std::collections::BTreeSet; + use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; + use crate::queries::generic_download::job::list_available_generic_download_jobs::download_type_clause; #[test] diff --git a/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs b/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs index c23504bc29..9c564328f8 100644 --- a/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs +++ b/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs @@ -1,9 +1,12 @@ -use anyhow::anyhow; -use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; -use errors::AnyhowResult; -use sqlx::MySqlPool; use std::time::Duration; +use anyhow::anyhow; +use sqlx::MySqlPool; + +use errors::AnyhowResult; + +use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; + pub async fn mark_generic_download_job_done( pool: &MySqlPool, job: &AvailableDownloadJob, diff --git a/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs b/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs index c21c3d0fd1..9101772cc5 100644 --- a/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs +++ b/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs @@ -1,8 +1,10 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; -use sqlx::MySqlPool; use sqlx; +use sqlx::MySqlPool; + +use errors::AnyhowResult; + +use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; /// Mark a single download job failure. The job may be re-run. pub async fn mark_generic_download_job_failure( diff --git a/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs b/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs index 21aaa22809..2e9e945aaf 100644 --- a/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs +++ b/crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs @@ -1,9 +1,11 @@ use anyhow::anyhow; +use sqlx; +use sqlx::MySqlPool; + +use errors::AnyhowResult; + use crate::common_inputs::container_environment_arg::ContainerEnvironmentArg; use crate::queries::generic_download::job::_keys::GenericDownloadJobId; -use errors::AnyhowResult; -use sqlx::MySqlPool; -use sqlx; // TODO(2022-02-09): It's unclear how stuck "pending" jobs don't become perma-dead // I think this logic is flawed and the job system needs to pick up stuck "pending" jobs. diff --git a/crates/lib/mysql_queries/src/queries/generic_download/web/get_generic_download_job_status.rs b/crates/lib/mysql_queries/src/queries/generic_download/web/get_generic_download_job_status.rs index a2466c359b..9f6df2e41a 100644 --- a/crates/lib/mysql_queries/src/queries/generic_download/web/get_generic_download_job_status.rs +++ b/crates/lib/mysql_queries/src/queries/generic_download/web/get_generic_download_job_status.rs @@ -1,8 +1,9 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; + +use errors::AnyhowResult; use tokens::jobs::download::DownloadJobToken; pub struct GenericDownloadJobStatus { diff --git a/crates/lib/mysql_queries/src/queries/generic_download/web/insert_generic_download_job.rs b/crates/lib/mysql_queries/src/queries/generic_download/web/insert_generic_download_job.rs index 90979f1b79..e065ad28e0 100644 --- a/crates/lib/mysql_queries/src/queries/generic_download/web/insert_generic_download_job.rs +++ b/crates/lib/mysql_queries/src/queries/generic_download/web/insert_generic_download_job.rs @@ -1,8 +1,9 @@ use anyhow::anyhow; +use sqlx::MySqlPool; + use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use sqlx::MySqlPool; use tokens::jobs::download::DownloadJobToken; pub struct InsertGenericDownloadJobArgs<'a> { diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs b/crates/lib/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs index 4d616476ed..29d3428c68 100644 --- a/crates/lib/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs +++ b/crates/lib/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs @@ -1,19 +1,19 @@ +use std::collections::BTreeSet; + use anyhow::anyhow; use chrono::Utc; -use crate::column_types::job_status::JobStatus; -use crate::helpers::boolean_converters::i8_to_bool; -use crate::queries::generic_inference::job::_keys::GenericInferenceJobId; +use sqlx::MySqlPool; + use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use sqlx::mysql::MySqlArguments; -use sqlx::{MySql, MySqlPool}; -use std::collections::BTreeSet; -use std::future::Future; -use std::path::Path; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use tokens::jobs::inference::InferenceJobToken; + +use crate::column_types::job_status::JobStatus; +use crate::helpers::boolean_converters::i8_to_bool; use crate::payloads::generic_inference_args::generic_inference_args::GenericInferenceArgs; +use crate::queries::generic_inference::job::_keys::GenericInferenceJobId; /// table: generic_inference_jobs #[derive(Debug)] @@ -416,10 +416,12 @@ fn inference_category_predicate(categories: &BTreeSet) -> Str #[cfg(test)] mod tests { - use crate::queries::generic_inference::job::list_available_generic_inference_jobs::{inference_category_predicate, model_type_predicate}; + use std::collections::BTreeSet; + use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; - use std::collections::BTreeSet; + + use crate::queries::generic_inference::job::list_available_generic_inference_jobs::{inference_category_predicate, model_type_predicate}; #[test] fn test_model_type_predicate() { diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs b/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs index 7bd1e80aa5..c4445ddbca 100644 --- a/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs +++ b/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs @@ -1,8 +1,10 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; + pub async fn mark_generic_inference_job_completely_failed( pool: &MySqlPool, job: &AvailableInferenceJob, diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs b/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs index 587521cc60..ae0b012878 100644 --- a/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs +++ b/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs @@ -1,8 +1,10 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; -use sqlx::MySqlPool; use sqlx; +use sqlx::MySqlPool; + +use errors::AnyhowResult; + +use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; /// Mark a single inference job failure. The job may be re-run. pub async fn mark_generic_inference_job_failure( diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs b/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs index cfe92a7517..b5553d79ac 100644 --- a/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs +++ b/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs @@ -1,9 +1,11 @@ use anyhow::anyhow; +use sqlx; +use sqlx::MySqlPool; + +use errors::AnyhowResult; + use crate::common_inputs::container_environment_arg::ContainerEnvironmentArg; use crate::queries::generic_inference::job::_keys::GenericInferenceJobId; -use errors::AnyhowResult; -use sqlx::MySqlPool; -use sqlx; // TODO(2022-02-09): It's unclear how stuck "pending" jobs don't become perma-dead // I think this logic is flawed and the job system needs to pick up stuck "pending" jobs. diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs b/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs index 54d7d1f7da..31f2c634b2 100644 --- a/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs +++ b/crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs @@ -1,9 +1,12 @@ +use std::time::Duration; + use anyhow::anyhow; -use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; +use sqlx::MySqlPool; + use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use errors::AnyhowResult; -use sqlx::MySqlPool; -use std::time::Duration; + +use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; pub async fn mark_generic_inference_job_successfully_done( pool: &MySqlPool, diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs b/crates/lib/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs index ae5f202674..08ac06f6b9 100644 --- a/crates/lib/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs +++ b/crates/lib/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs @@ -1,10 +1,12 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; + +use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use errors::AnyhowResult; use tokens::jobs::inference::InferenceJobToken; + use crate::helpers::boolean_converters::i8_to_bool; pub struct GenericInferenceJobStatus { diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/web/get_pending_inference_job_count.rs b/crates/lib/mysql_queries/src/queries/generic_inference/web/get_pending_inference_job_count.rs index 6da30b487c..2af6cedac5 100644 --- a/crates/lib/mysql_queries/src/queries/generic_inference/web/get_pending_inference_job_count.rs +++ b/crates/lib/mysql_queries/src/queries/generic_inference/web/get_pending_inference_job_count.rs @@ -1,8 +1,10 @@ use chrono::NaiveDateTime; -use crate::helpers::numeric_converters::try_i64_to_u64_or_min; -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::helpers::numeric_converters::try_i64_to_u64_or_min; + #[derive(Clone)] pub struct InferenceQueueLengthResult { pub record_count: u64, diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs b/crates/lib/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs index a57994fb54..b670beb954 100644 --- a/crates/lib/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs +++ b/crates/lib/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs @@ -1,14 +1,16 @@ use anyhow::anyhow; -use crate::payloads::generic_inference_args::generic_inference_args::GenericInferenceArgs; +use sqlx::MySqlPool; + use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use sqlx::MySqlPool; use tokens::jobs::inference::InferenceJobToken; use tokens::users::user::UserToken; +use crate::payloads::generic_inference_args::generic_inference_args::GenericInferenceArgs; + pub struct InsertGenericInferenceArgs<'a> { pub uuid_idempotency_token: &'a str, diff --git a/crates/lib/mysql_queries/src/queries/generic_synthetic_ids/transactional_increment_generic_synthetic_id.rs b/crates/lib/mysql_queries/src/queries/generic_synthetic_ids/transactional_increment_generic_synthetic_id.rs index 7421ccaca7..33bcdbac96 100644 --- a/crates/lib/mysql_queries/src/queries/generic_synthetic_ids/transactional_increment_generic_synthetic_id.rs +++ b/crates/lib/mysql_queries/src/queries/generic_synthetic_ids/transactional_increment_generic_synthetic_id.rs @@ -1,8 +1,9 @@ use anyhow::anyhow; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use errors::AnyhowResult; use log::warn; use sqlx::{MySql, Transaction}; + +use enums::by_table::generic_synthetic_ids::id_category::IdCategory; +use errors::AnyhowResult; use tokens::users::user::UserToken; pub async fn transactional_increment_generic_synthetic_id( diff --git a/crates/lib/mysql_queries/src/queries/health_check/health_check_query.rs b/crates/lib/mysql_queries/src/queries/health_check/health_check_query.rs index e831cfbe46..5899da917e 100644 --- a/crates/lib/mysql_queries/src/queries/health_check/health_check_query.rs +++ b/crates/lib/mysql_queries/src/queries/health_check/health_check_query.rs @@ -1,8 +1,9 @@ use anyhow::anyhow; -use chrono::{Utc, DateTime, NaiveDateTime}; -use errors::AnyhowResult; +use chrono::NaiveDateTime; use sqlx::MySqlPool; +use errors::AnyhowResult; + /// This just queries for current time. If it fails, we know the connection pool is dead. pub struct HealthCheckResult { pub present_time: NaiveDateTime, diff --git a/crates/lib/mysql_queries/src/queries/ip_bans/get_ip_ban.rs b/crates/lib/mysql_queries/src/queries/ip_bans/get_ip_ban.rs index ed068258ff..96c15bee12 100644 --- a/crates/lib/mysql_queries/src/queries/ip_bans/get_ip_ban.rs +++ b/crates/lib/mysql_queries/src/queries/ip_bans/get_ip_ban.rs @@ -1,8 +1,9 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + #[derive(Serialize)] pub struct IpBanRecord { pub ip_address: String, diff --git a/crates/lib/mysql_queries/src/queries/ip_bans/list_ip_bans.rs b/crates/lib/mysql_queries/src/queries/ip_bans/list_ip_bans.rs index 25b99fae0e..cf5618a407 100644 --- a/crates/lib/mysql_queries/src/queries/ip_bans/list_ip_bans.rs +++ b/crates/lib/mysql_queries/src/queries/ip_bans/list_ip_bans.rs @@ -1,9 +1,10 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; +use errors::AnyhowResult; + #[derive(Serialize)] pub struct IpBanRecordForList { pub ip_address: String, diff --git a/crates/lib/mysql_queries/src/queries/ip_bans/toggle_ip_ban.rs b/crates/lib/mysql_queries/src/queries/ip_bans/toggle_ip_ban.rs index 1b3a245380..eb25f3bbf6 100644 --- a/crates/lib/mysql_queries/src/queries/ip_bans/toggle_ip_ban.rs +++ b/crates/lib/mysql_queries/src/queries/ip_bans/toggle_ip_ban.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; -use sqlx::mysql::MySqlQueryResult; -use sqlx::{Error, MySqlPool}; +use sqlx::MySqlPool; + use errors::AnyhowResult; // NB: This is "toggle" instead of discrete functions for create/delete because this is diff --git a/crates/lib/mysql_queries/src/queries/ip_bans/upsert_ip_ban.rs b/crates/lib/mysql_queries/src/queries/ip_bans/upsert_ip_ban.rs index 16f20ca3cb..6681987e3e 100644 --- a/crates/lib/mysql_queries/src/queries/ip_bans/upsert_ip_ban.rs +++ b/crates/lib/mysql_queries/src/queries/ip_bans/upsert_ip_ban.rs @@ -1,7 +1,8 @@ use anyhow::anyhow; -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub struct UpsertIpBanArgs<'a> { pub ip_address: &'a str, pub maybe_target_user_token: Option<&'a str>, diff --git a/crates/lib/mysql_queries/src/queries/media_files/insert_media_file_from_face_animation.rs b/crates/lib/mysql_queries/src/queries/media_files/insert_media_file_from_face_animation.rs index e12aaebb6a..cad9f10f36 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/insert_media_file_from_face_animation.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/insert_media_file_from_face_animation.rs @@ -1,16 +1,18 @@ use anyhow::anyhow; -use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; -use crate::queries::generic_synthetic_ids::transactional_increment_generic_synthetic_id::transactional_increment_generic_synthetic_id; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use errors::AnyhowResult; -use sqlx::MySqlPool; use sqlx; +use sqlx::MySqlPool; + +use enums::by_table::generic_synthetic_ids::id_category::IdCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; use enums::by_table::media_files::media_file_type::MediaFileType; +use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::users::user::UserToken; +use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; +use crate::queries::generic_synthetic_ids::transactional_increment_generic_synthetic_id::transactional_increment_generic_synthetic_id; + pub struct InsertArgs<'a> { pub pool: &'a MySqlPool, pub job: &'a AvailableInferenceJob, diff --git a/crates/lib/mysql_queries/src/queries/media_uploads/get_media_upload_by_uuid.rs b/crates/lib/mysql_queries/src/queries/media_uploads/get_media_upload_by_uuid.rs index 0e2c036f50..c1f56b43f1 100644 --- a/crates/lib/mysql_queries/src/queries/media_uploads/get_media_upload_by_uuid.rs +++ b/crates/lib/mysql_queries/src/queries/media_uploads/get_media_upload_by_uuid.rs @@ -1,11 +1,12 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; +use log::error; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; + use enums::by_table::media_uploads::media_upload_type::MediaUploadType; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use log::error; -use sqlx::pool::PoolConnection; -use sqlx::{MySql, MySqlPool}; use tokens::files::media_upload::MediaUploadToken; pub struct MediaUploadRecord { diff --git a/crates/lib/mysql_queries/src/queries/media_uploads/get_media_upload_for_inference.rs b/crates/lib/mysql_queries/src/queries/media_uploads/get_media_upload_for_inference.rs index a98d4669d7..04c65f6f22 100644 --- a/crates/lib/mysql_queries/src/queries/media_uploads/get_media_upload_for_inference.rs +++ b/crates/lib/mysql_queries/src/queries/media_uploads/get_media_upload_for_inference.rs @@ -1,14 +1,16 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::payloads::media_upload_modification_details::MediaUploadModificationDetails; +use log::error; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; + use enums::by_table::media_uploads::media_upload_type::MediaUploadType; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use log::error; -use sqlx::pool::PoolConnection; -use sqlx::{MySql, MySqlPool}; use tokens::files::media_upload::MediaUploadToken; +use crate::payloads::media_upload_modification_details::MediaUploadModificationDetails; + pub struct MediaUploadRecordForInference { pub token: MediaUploadToken, pub media_type: MediaUploadType, diff --git a/crates/lib/mysql_queries/src/queries/media_uploads/insert_media_upload.rs b/crates/lib/mysql_queries/src/queries/media_uploads/insert_media_upload.rs index 86cf420956..8d04985f5f 100644 --- a/crates/lib/mysql_queries/src/queries/media_uploads/insert_media_upload.rs +++ b/crates/lib/mysql_queries/src/queries/media_uploads/insert_media_upload.rs @@ -1,15 +1,17 @@ use anyhow::anyhow; use log::warn; +use sqlx::MySqlPool; + use buckets::public::media_uploads::original_file::MediaUploadOriginalFilePath; -use errors::AnyhowResult; -use crate::payloads::media_upload_modification_details::MediaUploadModificationDetails; +use enums::by_table::media_uploads::media_upload_source::MediaUploadSource; use enums::by_table::media_uploads::media_upload_type::MediaUploadType; use enums::common::visibility::Visibility; -use sqlx::MySqlPool; -use enums::by_table::media_uploads::media_upload_source::MediaUploadSource; +use errors::AnyhowResult; use tokens::files::media_upload::MediaUploadToken; use tokens::users::user::UserToken; +use crate::payloads::media_upload_modification_details::MediaUploadModificationDetails; + /// Used to give user-facing order to logged in user inference requests pub struct SyntheticIdRecord { pub next_id: i64, diff --git a/crates/lib/mysql_queries/src/queries/media_uploads/reverse_list_user_media_uploads_of_type.rs b/crates/lib/mysql_queries/src/queries/media_uploads/reverse_list_user_media_uploads_of_type.rs index a851f7272b..1da3c9428c 100644 --- a/crates/lib/mysql_queries/src/queries/media_uploads/reverse_list_user_media_uploads_of_type.rs +++ b/crates/lib/mysql_queries/src/queries/media_uploads/reverse_list_user_media_uploads_of_type.rs @@ -1,11 +1,12 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; +use log::error; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; + use enums::by_table::media_uploads::media_upload_type::MediaUploadType; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use log::error; -use sqlx::pool::PoolConnection; -use sqlx::{MySql, MySqlPool}; use tokens::files::media_upload::MediaUploadToken; use tokens::users::user::UserToken; diff --git a/crates/lib/mysql_queries/src/queries/model_categories/assign_tts_category.rs b/crates/lib/mysql_queries/src/queries/model_categories/assign_tts_category.rs index da22d01805..5f191d7453 100644 --- a/crates/lib/mysql_queries/src/queries/model_categories/assign_tts_category.rs +++ b/crates/lib/mysql_queries/src/queries/model_categories/assign_tts_category.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use errors::AnyhowResult; #[derive(Copy, Clone)] diff --git a/crates/lib/mysql_queries/src/queries/model_categories/create_category.rs b/crates/lib/mysql_queries/src/queries/model_categories/create_category.rs index 47b2ee093a..c75c6e01c7 100644 --- a/crates/lib/mysql_queries/src/queries/model_categories/create_category.rs +++ b/crates/lib/mysql_queries/src/queries/model_categories/create_category.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use errors::AnyhowResult; pub struct CreateCategoryArgs<'a> { diff --git a/crates/lib/mysql_queries/src/queries/model_categories/get_category_by_token.rs b/crates/lib/mysql_queries/src/queries/model_categories/get_category_by_token.rs index f08a1121df..c264811e0f 100644 --- a/crates/lib/mysql_queries/src/queries/model_categories/get_category_by_token.rs +++ b/crates/lib/mysql_queries/src/queries/model_categories/get_category_by_token.rs @@ -1,10 +1,12 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool}; -use log::{info, warn, log}; +use log::warn; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; + #[derive(Serialize)] pub struct ModelCategory { // Non-included fields: diff --git a/crates/lib/mysql_queries/src/queries/model_categories/list_categories_query_builder.rs b/crates/lib/mysql_queries/src/queries/model_categories/list_categories_query_builder.rs index 7bc6097129..b93196eee0 100644 --- a/crates/lib/mysql_queries/src/queries/model_categories/list_categories_query_builder.rs +++ b/crates/lib/mysql_queries/src/queries/model_categories/list_categories_query_builder.rs @@ -1,11 +1,11 @@ -use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; -use log::{warn, info}; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; + /// List of categories /// This is *NOT* paginated, as that defeats the purpose of having a category system. #[derive(Serialize, Clone)] diff --git a/crates/lib/mysql_queries/src/queries/model_categories/toggle_model_category_soft_delete.rs b/crates/lib/mysql_queries/src/queries/model_categories/toggle_model_category_soft_delete.rs index 06f0118a27..0f0e2308a8 100644 --- a/crates/lib/mysql_queries/src/queries/model_categories/toggle_model_category_soft_delete.rs +++ b/crates/lib/mysql_queries/src/queries/model_categories/toggle_model_category_soft_delete.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use errors::AnyhowResult; // NB: This is "toggle" instead of discrete functions for create/delete because this is diff --git a/crates/lib/mysql_queries/src/queries/model_categories/update_model_category.rs b/crates/lib/mysql_queries/src/queries/model_categories/update_model_category.rs index ee65b5b985..7d64d52bf0 100644 --- a/crates/lib/mysql_queries/src/queries/model_categories/update_model_category.rs +++ b/crates/lib/mysql_queries/src/queries/model_categories/update_model_category.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use errors::AnyhowResult; pub struct UpdateModelCategoryArgs<'a> { diff --git a/crates/lib/mysql_queries/src/queries/public_event_feed/list_public_event_feed_items.rs b/crates/lib/mysql_queries/src/queries/public_event_feed/list_public_event_feed_items.rs index 00232c4a08..eea202ad5c 100644 --- a/crates/lib/mysql_queries/src/queries/public_event_feed/list_public_event_feed_items.rs +++ b/crates/lib/mysql_queries/src/queries/public_event_feed/list_public_event_feed_items.rs @@ -1,6 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::MySqlPool; + use errors::AnyhowResult; #[derive(Serialize)] diff --git a/crates/lib/mysql_queries/src/queries/stats/get_on_prem_worker_stats.rs b/crates/lib/mysql_queries/src/queries/stats/get_on_prem_worker_stats.rs index 275d405160..957a36073c 100644 --- a/crates/lib/mysql_queries/src/queries/stats/get_on_prem_worker_stats.rs +++ b/crates/lib/mysql_queries/src/queries/stats/get_on_prem_worker_stats.rs @@ -1,8 +1,9 @@ use anyhow::anyhow; -use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; +use errors::AnyhowResult; + #[derive(Serialize, Clone)] pub struct OnPremWorkerStats { pub total_records_sampled: i64, diff --git a/crates/lib/mysql_queries/src/queries/stats/get_unified_queue_stats.rs b/crates/lib/mysql_queries/src/queries/stats/get_unified_queue_stats.rs index 014f7d6ae4..3c82d97105 100644 --- a/crates/lib/mysql_queries/src/queries/stats/get_unified_queue_stats.rs +++ b/crates/lib/mysql_queries/src/queries/stats/get_unified_queue_stats.rs @@ -1,8 +1,10 @@ use chrono::NaiveDateTime; -use crate::helpers::numeric_converters::try_i64_to_u64_or_min; -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::helpers::numeric_converters::try_i64_to_u64_or_min; + #[derive(Serialize, Deserialize, Clone)] pub struct QueueStatsRow { pub queue_type: String, diff --git a/crates/lib/mysql_queries/src/queries/stats/get_voice_count_stats.rs b/crates/lib/mysql_queries/src/queries/stats/get_voice_count_stats.rs index 9156da5448..9a5a311c65 100644 --- a/crates/lib/mysql_queries/src/queries/stats/get_voice_count_stats.rs +++ b/crates/lib/mysql_queries/src/queries/stats/get_voice_count_stats.rs @@ -1,8 +1,9 @@ use anyhow::anyhow; -use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; +use errors::AnyhowResult; + #[derive(Serialize, Clone)] pub struct VoiceStats { pub public_count: i64, diff --git a/crates/lib/mysql_queries/src/queries/trending_model_analytics/list_trending_tts_models.rs b/crates/lib/mysql_queries/src/queries/trending_model_analytics/list_trending_tts_models.rs index a8f96d37a9..867e3f74b2 100644 --- a/crates/lib/mysql_queries/src/queries/trending_model_analytics/list_trending_tts_models.rs +++ b/crates/lib/mysql_queries/src/queries/trending_model_analytics/list_trending_tts_models.rs @@ -1,5 +1,6 @@ use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; + use enums::by_table::trending_model_analytics::model_type::ModelType; use enums::by_table::trending_model_analytics::window_name::WindowName; use errors::AnyhowResult; diff --git a/crates/lib/mysql_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs b/crates/lib/mysql_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs index 8ba4e686d5..78b7f6c71f 100644 --- a/crates/lib/mysql_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs +++ b/crates/lib/mysql_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs @@ -1,8 +1,9 @@ -use errors::AnyhowResult; -use enums::by_table::trending_model_analytics::model_type::ModelType; -use enums::by_table::trending_model_analytics::window_name::WindowName; use sqlx::MySql; use sqlx::pool::PoolConnection; + +use enums::by_table::trending_model_analytics::model_type::ModelType; +use enums::by_table::trending_model_analytics::window_name::WindowName; +use errors::AnyhowResult; use tokens::tokens::tts_models::TtsModelToken; // NB: Only TTS for now. New enum variants for other token types. diff --git a/crates/lib/mysql_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs b/crates/lib/mysql_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs index a6927b436a..6960ef8d00 100644 --- a/crates/lib/mysql_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs +++ b/crates/lib/mysql_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs @@ -1,9 +1,10 @@ use anyhow::anyhow; -use errors::AnyhowResult; use log::warn; -use sqlx::{MySql, MySqlPool}; +use sqlx::MySql; use sqlx::pool::PoolConnection; +use errors::AnyhowResult; + #[derive(Serialize, Clone)] pub struct TtsLeaderboardRecordForList { pub username: String, diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs b/crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs index 90bbc30d0e..1a3ea014f7 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs @@ -3,12 +3,14 @@ #![forbid(unused_mut)] #![forbid(unused_variables)] +use std::collections::{HashMap, HashSet}; + use anyhow::anyhow; -use errors::AnyhowResult; use log::warn; -use sqlx::pool::PoolConnection; use sqlx::{MySql, MySqlPool}; -use std::collections::{HashSet, HashMap}; +use sqlx::pool::PoolConnection; + +use errors::AnyhowResult; /// Map of model_token => vec #[derive(Serialize, Default)] diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs b/crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs index b2baae342b..0d20129c0b 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs @@ -1,11 +1,11 @@ -use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; -use log::{warn, info}; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; + /// List of assigned categories for a TTS model /// This is *NOT* paginated, as that defeats the purpose of having a category system. #[derive(Serialize)] diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs b/crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs index 8de86f9808..73915be036 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs @@ -1,9 +1,12 @@ +use std::path::Path; + use anyhow::anyhow; use chrono::Utc; -use errors::AnyhowResult; -use crate::tokens::Tokens; use sqlx::MySqlPool; -use std::path::Path; + +use errors::AnyhowResult; + +use crate::tokens::Tokens; /// table: tts_model_upload_jobs #[derive(Debug)] diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs index 5c33ab5098..64bb429338 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs @@ -1,8 +1,10 @@ use chrono::NaiveDateTime; -use errors::AnyhowResult; -use crate::helpers::numeric_converters::try_i64_to_u64_or_min; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::helpers::numeric_converters::try_i64_to_u64_or_min; + #[derive(Clone)] pub struct TtsQueueLengthResult { pub record_count: u64, diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_detailed_stats.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_detailed_stats.rs index 837d2b38e1..549c822178 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_detailed_stats.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_detailed_stats.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use errors::AnyhowResult; #[derive(Debug)] diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_tts_inference_job_status.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_tts_inference_job_status.rs index 3c0dce6cc1..204d9dcbea 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_tts_inference_job_status.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_tts_inference_job_status.rs @@ -1,8 +1,9 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + #[derive(Serialize)] pub struct TtsInferenceJobStatusRecord { pub job_token: String, diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs index a1a78282ab..676f1aac6a 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs @@ -1,9 +1,11 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use container_common::token::random_uuid::generate_random_uuid; -use crate::builders::RequiredOption; use sqlx::MySqlPool; +use container_common::token::random_uuid::generate_random_uuid; +use errors::AnyhowResult; + +use crate::builders::RequiredOption; + pub struct TtsInferenceJobInsertBuilder { // ========== Required ========== // TODO: The builder should generate this diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs index 56aa62ec2b..fb109ce91b 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs @@ -1,8 +1,9 @@ use anyhow::anyhow; -use errors::AnyhowResult; +use sqlx::{MySql, MySqlPool}; use sqlx::mysql::MySqlArguments; use sqlx::query::Query; -use sqlx::{MySqlPool, MySql}; + +use errors::AnyhowResult; #[derive(Copy, Clone)] pub enum JobStatus { diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs index fee3421bcd..b098d2b59f 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs @@ -3,13 +3,15 @@ #![forbid(unused_mut)] #![forbid(unused_variables)] -use chrono::{Utc, DateTime}; +use chrono::{DateTime, Utc}; +use sqlx::MySqlPool; + +use enums::common::visibility::Visibility; use errors::AnyhowResult; + use crate::column_types::job_status::JobStatus; use crate::helpers::boolean_converters::i8_to_bool; use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; -use enums::common::visibility::Visibility; -use sqlx::MySqlPool; /// table: tts_inference_jobs #[derive(Debug)] diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs index 82d2df4818..60e0a35adf 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs @@ -1,9 +1,10 @@ use anyhow::anyhow; -use crate::queries::generic_inference::job::_keys::GenericInferenceJobId; -use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; -use errors::AnyhowResult; -use sqlx::MySqlPool; use sqlx; +use sqlx::MySqlPool; + +use errors::AnyhowResult; + +use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; pub async fn mark_tts_inference_job_done( pool: &MySqlPool, diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs index 960aa5b030..2a517a38a8 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs @@ -1,8 +1,10 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; -use sqlx::MySqlPool; use sqlx; +use sqlx::MySqlPool; + +use errors::AnyhowResult; + +use crate::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; // TODO: Rerun time shouldn't be 1-minute! diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs index 97a52479f8..5232419e08 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs @@ -1,8 +1,10 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; -use sqlx::MySqlPool; use sqlx; +use sqlx::MySqlPool; + +use errors::AnyhowResult; + +use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; // TODO(2022-02-09): It's unclear how stuck "pending" jobs don't become perma-dead // I think this logic is flawed and the job system needs to pick up stuck "pending" jobs. diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs index b30904656e..c6632af1bc 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs @@ -1,8 +1,10 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; -use sqlx::MySqlPool; use sqlx; +use sqlx::MySqlPool; + +use errors::AnyhowResult; + +use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; /// Mark a TTS job as dead ("do not ever retry"). pub async fn mark_tts_inference_job_permanently_dead( diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/get_tts_model_upload_job_status.rs b/crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/get_tts_model_upload_job_status.rs index 24e393a397..52a65353c9 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/get_tts_model_upload_job_status.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/get_tts_model_upload_job_status.rs @@ -1,6 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::MySqlPool; + use errors::AnyhowResult; pub struct TtsUploadModelJobStatusRecord { diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/insert_tts_model_upload_job.rs b/crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/insert_tts_model_upload_job.rs index 37dc1b6a3f..80ceb67827 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/insert_tts_model_upload_job.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/insert_tts_model_upload_job.rs @@ -2,7 +2,9 @@ use anyhow::anyhow; use log::warn; use sqlx::error::Error::Database; use sqlx::MySqlPool; + use errors::AnyhowResult; + use crate::tokens::Tokens; pub struct InsertTtsModelUploadJobArgs<'a> { diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/count_tts_model_uses.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/count_tts_model_uses.rs index eb58cbfd0c..9e8afd8df8 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/count_tts_model_uses.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/count_tts_model_uses.rs @@ -1,9 +1,10 @@ //! NB: This query is potentially long-lived and not suitable for low-latency HTTP endpoints. -use errors::AnyhowResult; use log::info; use sqlx::MySql; use sqlx::pool::PoolConnection; + +use errors::AnyhowResult; use tokens::tokens::tts_models::TtsModelToken; pub struct TtsModelUseCountInfo { diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/count_tts_model_uses_total.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/count_tts_model_uses_total.rs index 44b92e2611..31bda9062a 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/count_tts_model_uses_total.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/count_tts_model_uses_total.rs @@ -1,9 +1,10 @@ //! NB: This query is potentially long-lived and not suitable for low-latency HTTP endpoints. -use errors::AnyhowResult; use log::info; use sqlx::MySql; use sqlx::pool::PoolConnection; + +use errors::AnyhowResult; use tokens::tokens::tts_models::TtsModelToken; pub struct TtsModelTotalUseCountInfo { diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs index 7fce6a24de..5f30dc8de7 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs @@ -1,6 +1,7 @@ -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub async fn delete_tts_model_as_user( tts_model_token: &str, creator_ip_address: &str, diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/edit_tts_model_details.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/edit_tts_model_details.rs index a48629a40c..2f9efe4425 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/edit_tts_model_details.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/edit_tts_model_details.rs @@ -1,8 +1,10 @@ -use crate::column_types::vocoder_type::VocoderType; -use enums::common::visibility::Visibility; -use sqlx::MySqlPool; -use sqlx::mysql::MySqlQueryResult; use sqlx; +use sqlx::mysql::MySqlQueryResult; +use sqlx::MySqlPool; + +use enums::common::visibility::Visibility; + +use crate::column_types::vocoder_type::VocoderType; pub async fn edit_tts_model_details_as_author( mysql_pool: &MySqlPool, diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/edit_tts_model_moderator_details.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/edit_tts_model_moderator_details.rs index 15f7d08058..325cc9d4d8 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/edit_tts_model_moderator_details.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/edit_tts_model_moderator_details.rs @@ -3,9 +3,9 @@ #![forbid(unused_mut)] #![forbid(unused_variables)] -use sqlx::MySqlPool; use sqlx; use sqlx::mysql::MySqlQueryResult; +use sqlx::MySqlPool; pub async fn edit_tts_model_moderator_details( mysql_pool: &MySqlPool, diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model.rs index ac97833d23..5caeba3645 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model.rs @@ -5,14 +5,16 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::column_types::vocoder_type::VocoderType; -use crate::helpers::boolean_converters::i8_to_bool; +use log::warn; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; + use enums::by_table::tts_models::tts_model_type::TtsModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use log::warn; -use sqlx::pool::PoolConnection; -use sqlx::{MySql, MySqlPool}; + +use crate::column_types::vocoder_type::VocoderType; +use crate::helpers::boolean_converters::i8_to_bool; // FIXME: This is the old style of query scoping and shouldn't be copied. // The moderator-only fields are good practice, though. diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs index 4d94dc12fc..496078c866 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs @@ -3,11 +3,13 @@ #![forbid(unused_mut)] #![forbid(unused_variables)] -use chrono::{Utc, DateTime}; -use enums::common::vocoder_type::VocoderType; +use chrono::{DateTime, Utc}; use log::warn; -use sqlx::MySqlPool; use sqlx; +use sqlx::MySqlPool; + +use enums::common::vocoder_type::VocoderType; + use crate::helpers::boolean_converters::i8_to_bool; // TODO: Can probably just reuse another query. diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference_improved.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference_improved.rs index bf32acafa9..e413c5342c 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference_improved.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference_improved.rs @@ -3,16 +3,18 @@ #![forbid(unused_mut)] #![forbid(unused_variables)] -use chrono::{Utc, DateTime}; -use crate::helpers::boolean_converters::i8_to_bool; +use chrono::{DateTime, Utc}; +use log::warn; +use sqlx; +use sqlx::MySqlPool; + use enums::by_table::tts_models::tts_model_type::TtsModelType; use enums::common::vocoder_type::VocoderType; -use log::warn; -use sqlx::MySqlPool; -use sqlx; use tokens::tokens::tts_models::TtsModelToken; use tokens::users::user::UserToken; +use crate::helpers::boolean_converters::i8_to_bool; + // TODO: Can probably just reuse another query. // TODO(bt, 2023-03-20): There are now three copies of this query. Kill with fire. diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs index 009414a898..9ed20637c8 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs @@ -1,12 +1,13 @@ +use std::path::Path; + use anyhow::anyhow; -use chrono::Utc; -use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; -use crate::tokens::Tokens; +use sqlx::MySqlPool; + use enums::by_table::tts_models::tts_model_type::TtsModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use sqlx::MySqlPool; -use std::path::Path; + +use crate::tokens::Tokens; pub struct InsertTtsModelFromDownloadJobArgs<'a, P: AsRef> { pub tts_model_type: TtsModelType, diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/list_all_tts_model_tokens.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/list_all_tts_model_tokens.rs index c3d7812bf0..359aafff62 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/list_all_tts_model_tokens.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/list_all_tts_model_tokens.rs @@ -1,7 +1,8 @@ use log::info; -use errors::AnyhowResult; use sqlx::MySql; use sqlx::pool::PoolConnection; + +use errors::AnyhowResult; use tokens::tokens::tts_models::TtsModelToken; /// List of all TTS model tokens. diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs index 4533d0e2bd..2f00541d46 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs @@ -1,11 +1,13 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::helpers::boolean_converters::i8_to_bool; +use log::{info, warn}; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; + use enums::common::visibility::Visibility; use errors::AnyhowResult; -use log::{warn, info}; -use sqlx::pool::PoolConnection; -use sqlx::{MySql, MySqlPool}; + +use crate::helpers::boolean_converters::i8_to_bool; // FIXME: This is the old style of query scoping and shouldn't be copied. diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs b/crates/lib/mysql_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs index e2815ea50f..f9d899ae84 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs @@ -1,6 +1,7 @@ -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub async fn delete_tts_inference_result_as_user( inference_result_token: &str, mysql_pool: &MySqlPool diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_results/edit_tts_result.rs b/crates/lib/mysql_queries/src/queries/tts/tts_results/edit_tts_result.rs index 92d49e76a9..b0d466b3e8 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_results/edit_tts_result.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_results/edit_tts_result.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use enums::common::visibility::Visibility; use errors::AnyhowResult; diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_results/insert_tts_result.rs b/crates/lib/mysql_queries/src/queries/tts/tts_results/insert_tts_result.rs index 1a43939831..dfd93ba762 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_results/insert_tts_result.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_results/insert_tts_result.rs @@ -1,13 +1,16 @@ +use std::path::Path; + use anyhow::anyhow; +use log::warn; +use sqlx; +use sqlx::MySqlPool; + use errors::AnyhowResult; + use crate::column_types::vocoder_type::VocoderType; +use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use crate::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; use crate::tokens::Tokens; -use log::warn; -use sqlx::MySqlPool; -use sqlx; -use std::path::Path; -use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; /// Used to give user-facing order to logged in user inference requests pub struct SyntheticIdRecord { diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs b/crates/lib/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs index ae61291acf..d11c2b921c 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs @@ -4,11 +4,12 @@ //#![forbid(unused_variables)] use chrono::{DateTime, Utc}; -use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; -use errors::AnyhowResult; -use enums::common::visibility::Visibility; use sqlx::MySqlPool; +use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; +use enums::common::visibility::Visibility; +use errors::AnyhowResult; + #[derive(Serialize)] pub struct TtsInferenceListPage { pub inference_records: Vec, diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_results/query_tts_result.rs b/crates/lib/mysql_queries/src/queries/tts/tts_results/query_tts_result.rs index 80a5dd7cca..a2e368cc91 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_results/query_tts_result.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_results/query_tts_result.rs @@ -5,13 +5,15 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::column_types::vocoder_type::VocoderType; -use crate::helpers::boolean_converters::{nullable_i8_to_bool, i8_to_bool}; -use enums::common::visibility::Visibility; use log::warn; use sqlx::MySqlPool; +use enums::common::visibility::Visibility; +use errors::AnyhowResult; + +use crate::column_types::vocoder_type::VocoderType; +use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_bool}; + #[derive(Serialize)] pub struct TtsResultRecordForResponse { pub tts_result_token: String, diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs index fbf19aa6bd..ecdcba2f45 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs @@ -1,7 +1,8 @@ use anyhow::anyhow; -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub async fn delete_twitch_event_rule( event_rule_token: &str, ip_address_delete: &str, diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs index 5a4ee4c595..c23bcd5f2a 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs @@ -1,9 +1,11 @@ use anyhow::anyhow; -use chrono::{Utc, DateTime}; +use chrono::Utc; +use sqlx::MySqlPool; + use errors::AnyhowResult; + use crate::column_types::twitch_event_category::TwitchEventCategory; use crate::helpers::boolean_converters::i8_to_bool; -use sqlx::MySqlPool; #[derive(Debug)] pub struct TwitchEventRule { diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs index 0bb6b51a2e..ccd9f9c643 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs @@ -1,8 +1,10 @@ use anyhow::anyhow; +use sqlx::MySqlPool; + use errors::AnyhowResult; + use crate::column_types::twitch_event_category::TwitchEventCategory; use crate::tokens::Tokens; -use sqlx::MySqlPool; pub struct InsertTwitchEventRuleBuilder { pub uuid_idempotency_token: String, diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs index 283a7f1eaa..e87f8c7fa0 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs @@ -1,9 +1,10 @@ -use anyhow::anyhow; -use chrono::{Utc, DateTime}; +use chrono::Utc; +use sqlx::MySqlPool; + use errors::AnyhowResult; + use crate::column_types::twitch_event_category::TwitchEventCategory; use crate::helpers::boolean_converters::i8_to_bool; -use sqlx::MySqlPool; #[derive(Debug, Serialize)] pub struct TwitchEventRule { diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs index 28d915e0cc..1842de1a2a 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs @@ -1,9 +1,11 @@ +use std::collections::HashMap; + use anyhow::anyhow; -use errors::AnyhowResult; use once_cell::sync::Lazy; use regex::Regex; use sqlx::MySqlPool; -use std::collections::HashMap; + +use errors::AnyhowResult; /// Check that tokens are alphanumeric or can have colons. static SAFE_TOKENS_REGEX : Lazy = Lazy::new(|| { diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs index f6bdec521b..e59a67393a 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::tokens::Tokens; use sqlx::MySqlPool; +use errors::AnyhowResult; + // TODO: This doesn't handle sparse updates. pub struct UpdateTwitchEventRuleBuilder { diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/find.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/find.rs index c918229dca..55d93b4246 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/find.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/find.rs @@ -2,12 +2,13 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::i8_to_bool; use log::error; -use log::warn; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::i8_to_bool; + #[derive(Serialize, Clone)] pub struct TwitchOauthTokenRecord { /// Our internal token metadata / bookkeeping diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/insert.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/insert.rs index f3ba5a5af6..4b198c0fdc 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/insert.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/insert.rs @@ -1,9 +1,8 @@ use anyhow::anyhow; -use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use log::info; -use log::warn; use sqlx::MySqlPool; + +use errors::AnyhowResult; + use crate::tokens::Tokens; pub struct TwitchOauthTokenInsertBuilder { diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs index 7bd33d573b..ccdef6c1ce 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs @@ -1,10 +1,8 @@ use anyhow::anyhow; -use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use log::info; -use log::warn; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub struct TwitchPubsubBitsInsertBuilder { // ===== Required Fields ===== diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs index 9104f8c5f8..8535c4a789 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs @@ -1,10 +1,8 @@ use anyhow::anyhow; -use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use log::info; -use log::warn; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub struct TwitchPubsubChannelPointsInsertBuilder { // ===== Required Fields ===== diff --git a/crates/lib/mysql_queries/src/queries/users/user/create_account.rs b/crates/lib/mysql_queries/src/queries/users/user/create_account.rs index 2e40964de5..7f310f5df5 100644 --- a/crates/lib/mysql_queries/src/queries/users/user/create_account.rs +++ b/crates/lib/mysql_queries/src/queries/users/user/create_account.rs @@ -3,10 +3,11 @@ #![forbid(unused_mut)] #![forbid(unused_variables)] -use crate::tokens::Tokens; use log::warn; -use sqlx::MySqlPool; use sqlx::error::Error::Database; +use sqlx::MySqlPool; + +use crate::tokens::Tokens; pub struct CreateAccountArgs<'a> { pub username: &'a str, diff --git a/crates/lib/mysql_queries/src/queries/users/user/list_users_query_builder.rs b/crates/lib/mysql_queries/src/queries/users/user/list_users_query_builder.rs index 7b9d2dbe3a..e00ed36aa6 100644 --- a/crates/lib/mysql_queries/src/queries/users/user/list_users_query_builder.rs +++ b/crates/lib/mysql_queries/src/queries/users/user/list_users_query_builder.rs @@ -1,8 +1,10 @@ use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::i8_to_bool; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::i8_to_bool; + /// NB: This is not to be shared externally. /// Only for trusted mods and staff. #[derive(Serialize)] diff --git a/crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_by_email.rs b/crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_by_email.rs index 7da34b89c4..7d1edbede6 100644 --- a/crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_by_email.rs +++ b/crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_by_email.rs @@ -1,7 +1,9 @@ -use errors::AnyhowResult; -use crate::queries::users::user::lookup_user_for_login_result::UserRecordForLogin; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::queries::users::user::lookup_user_for_login_result::UserRecordForLogin; + pub async fn lookup_user_for_login_by_email(email: &str, pool: &MySqlPool) -> AnyhowResult { // NB: Lookup failure is Err(RowNotFound). let record = sqlx::query_as!( diff --git a/crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_by_username.rs b/crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_by_username.rs index 15cacbfff3..df738db95a 100644 --- a/crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_by_username.rs +++ b/crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_by_username.rs @@ -1,7 +1,9 @@ -use errors::AnyhowResult; -use crate::queries::users::user::lookup_user_for_login_result::UserRecordForLogin; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::queries::users::user::lookup_user_for_login_result::UserRecordForLogin; + pub async fn lookup_user_for_login_by_username(username: &str, pool: &MySqlPool) -> AnyhowResult { // NB: Lookup failure is Err(RowNotFound). diff --git a/crates/lib/mysql_queries/src/queries/users/user/set_user_ban_status.rs b/crates/lib/mysql_queries/src/queries/users/user/set_user_ban_status.rs index 9740ae8057..65343ba278 100644 --- a/crates/lib/mysql_queries/src/queries/users/user/set_user_ban_status.rs +++ b/crates/lib/mysql_queries/src/queries/users/user/set_user_ban_status.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use errors::AnyhowResult; use tokens::users::user::UserToken; diff --git a/crates/lib/mysql_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs b/crates/lib/mysql_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs index 69bc00f34e..659ca7f274 100644 --- a/crates/lib/mysql_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs +++ b/crates/lib/mysql_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs @@ -1,7 +1,8 @@ use anyhow::anyhow; -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub async fn update_user_record_with_new_stripe_customer_id( mysql_pool: &MySqlPool, user_token: &str, diff --git a/crates/lib/mysql_queries/src/queries/users/user_badges/list_user_badges.rs b/crates/lib/mysql_queries/src/queries/users/user_badges/list_user_badges.rs index 0be9496d3d..edc74c5485 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_badges/list_user_badges.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_badges/list_user_badges.rs @@ -1,10 +1,11 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use log::{warn, info}; -use sqlx::{MySql, MySqlPool}; +use log::{info, warn}; +use sqlx::MySql; use sqlx::pool::PoolConnection; +use errors::AnyhowResult; + #[derive(Serialize, Deserialize, Clone)] pub struct UserBadgeForList { pub slug: String, diff --git a/crates/lib/mysql_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs b/crates/lib/mysql_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs index d7f1963f62..f53a272889 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs @@ -4,6 +4,7 @@ #![forbid(unused_variables)] use sqlx::MySqlPool; + use errors::AnyhowResult; pub struct Args<'a> { diff --git a/crates/lib/mysql_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs b/crates/lib/mysql_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs index ba03a252c2..5af006a0d3 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs @@ -4,6 +4,7 @@ #![forbid(unused_variables)] use sqlx::MySqlPool; + use errors::AnyhowResult; pub struct Args<'a> { diff --git a/crates/lib/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs b/crates/lib/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs index 27805ff31e..9b152c5795 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs @@ -1,13 +1,15 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::helpers::boolean_converters::i8_to_bool; +use log::warn; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; + use enums::common::visibility::Visibility; use errors::AnyhowResult; -use log::{warn, log}; -use sqlx::pool::PoolConnection; -use sqlx::{MySqlPool, MySql}; use tokens::users::user::UserToken; +use crate::helpers::boolean_converters::i8_to_bool; + // TODO: Make non-`Serialize` and make the HTTP endpoints do the work #[derive(Serialize, Deserialize, Clone)] pub struct UserProfileResult { diff --git a/crates/lib/mysql_queries/src/queries/users/user_ratings/get_user_rating.rs b/crates/lib/mysql_queries/src/queries/users/user_ratings/get_user_rating.rs index d91cd3598a..f3842d1df7 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_ratings/get_user_rating.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_ratings/get_user_rating.rs @@ -1,13 +1,15 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; -use enums::by_table::user_ratings::rating_value::UserRatingValue; -use errors::AnyhowResult; use log::error; use sqlx::MySql; use sqlx::pool::PoolConnection; + +use enums::by_table::user_ratings::rating_value::UserRatingValue; +use errors::AnyhowResult; use tokens::users::user::UserToken; +use crate::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; + pub struct UserRating { pub rating_value: UserRatingValue, pub created_at: DateTime, diff --git a/crates/lib/mysql_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs b/crates/lib/mysql_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs index 7768e1dbb7..749ace6a05 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs @@ -1,6 +1,7 @@ -use errors::AnyhowResult; use sqlx::MySql; use sqlx::pool::PoolConnection; + +use errors::AnyhowResult; use tokens::tokens::tts_models::TtsModelToken; pub async fn update_tts_model_ratings( diff --git a/crates/lib/mysql_queries/src/queries/users/user_ratings/upsert_user_rating.rs b/crates/lib/mysql_queries/src/queries/users/user_ratings/upsert_user_rating.rs index c590bbd459..d6be59ef2a 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_ratings/upsert_user_rating.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_ratings/upsert_user_rating.rs @@ -1,13 +1,12 @@ -use errors::AnyhowResult; -use crate::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; -use enums::by_table::user_ratings::entity_type::UserRatingEntityType; -use enums::by_table::user_ratings::rating_value::UserRatingValue; use sqlx::MySql; use sqlx::pool::PoolConnection; -use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::w2l_templates::W2lTemplateToken; + +use enums::by_table::user_ratings::rating_value::UserRatingValue; +use errors::AnyhowResult; use tokens::users::user::UserToken; +use crate::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; + pub struct Args<'a> { pub user_token: &'a UserToken, pub user_rating_entity: &'a UserRatingEntity, diff --git a/crates/lib/mysql_queries/src/queries/users/user_roles/list_staff.rs b/crates/lib/mysql_queries/src/queries/users/user_roles/list_staff.rs index 614a7f0fdd..65b3490ac6 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_roles/list_staff.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_roles/list_staff.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use errors::AnyhowResult; #[derive(Serialize)] diff --git a/crates/lib/mysql_queries/src/queries/users/user_roles/list_user_roles.rs b/crates/lib/mysql_queries/src/queries/users/user_roles/list_user_roles.rs index 2be6d268bd..9f5ed1640b 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_roles/list_user_roles.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_roles/list_user_roles.rs @@ -1,10 +1,12 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::i8_to_bool; -use log::{warn, info}; +use log::{info, warn}; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::i8_to_bool; + #[derive(Serialize)] pub struct UserRoleForList { pub slug: String, diff --git a/crates/lib/mysql_queries/src/queries/users/user_roles/set_user_role.rs b/crates/lib/mysql_queries/src/queries/users/user_roles/set_user_role.rs index ab09ff9d77..b2e7d6d9d1 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_roles/set_user_role.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_roles/set_user_role.rs @@ -1,6 +1,7 @@ use anyhow::anyhow; -use errors::AnyhowResult; use sqlx::MySqlPool; + +use errors::AnyhowResult; use tokens::users::user::UserToken; pub async fn set_user_role( diff --git a/crates/lib/mysql_queries/src/queries/users/user_sessions/create_user_session.rs b/crates/lib/mysql_queries/src/queries/users/user_sessions/create_user_session.rs index 36207b86df..8c306c7efa 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_sessions/create_user_session.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_sessions/create_user_session.rs @@ -1,9 +1,11 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::tokens::Tokens; -use log::{info, warn}; +use log::info; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::tokens::Tokens; + pub async fn create_user_session(user_token: &str, ip_address: &str, mysql_pool: &MySqlPool) -> AnyhowResult { diff --git a/crates/lib/mysql_queries/src/queries/users/user_sessions/delete_user_session.rs b/crates/lib/mysql_queries/src/queries/users/user_sessions/delete_user_session.rs index 17bbabce39..dcb303b17d 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_sessions/delete_user_session.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_sessions/delete_user_session.rs @@ -1,6 +1,7 @@ -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub async fn delete_user_session(session_token: &str, mysql_pool: &MySqlPool) -> AnyhowResult<()> { let query_result = sqlx::query!( r#" diff --git a/crates/lib/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token.rs b/crates/lib/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token.rs index e88adf1211..d63b30a85b 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token.rs @@ -3,14 +3,16 @@ #![forbid(unused_mut)] use anyhow::anyhow; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool, nullable_i8_to_bool_default_false}; -use enums::common::visibility::Visibility; use log::warn; use sqlx::{Executor, MySql}; use sqlx::pool::PoolConnection; + +use enums::common::visibility::Visibility; +use errors::AnyhowResult; use tokens::users::user::UserToken; +use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_bool_default_false, nullable_i8_to_optional_bool}; + #[derive(Clone, Serialize, Deserialize)] pub struct SessionUserRecord { pub user_token: String, // TODO(bt, 2022-12-20): Convert to strongly-typed `UserToken` diff --git a/crates/lib/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs b/crates/lib/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs index 43bfdd237e..de8929a4eb 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs @@ -3,10 +3,11 @@ #![forbid(unused_mut)] use anyhow::anyhow; -use errors::AnyhowResult; use log::warn; use sqlx::{Executor, MySql}; +use errors::AnyhowResult; + #[derive(Clone, Serialize, Deserialize)] pub struct SessionRecord { pub session_token: String, diff --git a/crates/lib/mysql_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs b/crates/lib/mysql_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs index f33639d123..399b4a3e26 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs @@ -1,11 +1,12 @@ use anyhow::anyhow; -use chrono::{DateTime, NaiveDateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::nullable_i8_to_optional_bool; -use log::warn; -use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; +use chrono::{DateTime, Utc}; use sqlx::MySqlPool; +use errors::AnyhowResult; +use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; + +use crate::helpers::boolean_converters::nullable_i8_to_optional_bool; + pub struct UserSubscription { pub token: String, pub user_token: String, diff --git a/crates/lib/mysql_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs b/crates/lib/mysql_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs index 0592540237..6df649694e 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs @@ -1,10 +1,9 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use log::info; -use log::warn; use sqlx::MySql; use sqlx::pool::PoolConnection; +use errors::AnyhowResult; + pub struct UnsubscribeReasonInsertBuilder<'a> { unsubscribe_reason: &'a str, user_token: &'a str, diff --git a/crates/lib/mysql_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs b/crates/lib/mysql_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs index c8a2d1ce26..68acc079fd 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs @@ -1,6 +1,7 @@ use chrono::{DateTime, Utc}; -use sqlx::{MySql, MySqlPool}; +use sqlx::MySql; use sqlx::pool::PoolConnection; + use errors::AnyhowResult; pub struct ActiveUserSubscription { diff --git a/crates/lib/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs b/crates/lib/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs index cdcd7cf282..6b47bc33c5 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs @@ -1,10 +1,12 @@ use anyhow::anyhow; use chrono::NaiveDateTime; +use sqlx::MySqlPool; + use errors::AnyhowResult; -use crate::tokens::Tokens; use reusable_types::stripe::stripe_recurring_interval::StripeRecurringInterval; use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; -use sqlx::MySqlPool; + +use crate::tokens::Tokens; // TODO: Make a trait with default impls to handle common query concerns. diff --git a/crates/lib/mysql_queries/src/queries/vocoder/get_vocoder_model.rs b/crates/lib/mysql_queries/src/queries/vocoder/get_vocoder_model.rs index 16e1f501c3..772fd7dd8d 100644 --- a/crates/lib/mysql_queries/src/queries/vocoder/get_vocoder_model.rs +++ b/crates/lib/mysql_queries/src/queries/vocoder/get_vocoder_model.rs @@ -5,13 +5,15 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::i8_to_bool; -use enums::common::visibility::Visibility; -use enums::common::vocoder_type::VocoderType; use log::warn; use sqlx::MySqlPool; +use enums::common::visibility::Visibility; +use enums::common::vocoder_type::VocoderType; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::i8_to_bool; + // FIXME: This is the old style of query scoping and shouldn't be copied. // The moderator-only fields are good practice, though. diff --git a/crates/lib/mysql_queries/src/queries/vocoder/insert_vocoder_model.rs b/crates/lib/mysql_queries/src/queries/vocoder/insert_vocoder_model.rs index 0814da4667..f320828dbd 100644 --- a/crates/lib/mysql_queries/src/queries/vocoder/insert_vocoder_model.rs +++ b/crates/lib/mysql_queries/src/queries/vocoder/insert_vocoder_model.rs @@ -3,13 +3,16 @@ #![forbid(unused_mut)] #![forbid(unused_variables)] +use std::path::Path; + use anyhow::anyhow; -use errors::AnyhowResult; -use crate::tokens::Tokens; +use sqlx::MySqlPool; + use enums::common::visibility::Visibility; use enums::common::vocoder_type::VocoderType; -use sqlx::MySqlPool; -use std::path::Path; +use errors::AnyhowResult; + +use crate::tokens::Tokens; pub struct Args<'a, P: AsRef> { pub vocoder_type: VocoderType, diff --git a/crates/lib/mysql_queries/src/queries/vocoder/list_vocoder_models.rs b/crates/lib/mysql_queries/src/queries/vocoder/list_vocoder_models.rs index ddca22ab2b..4640638537 100644 --- a/crates/lib/mysql_queries/src/queries/vocoder/list_vocoder_models.rs +++ b/crates/lib/mysql_queries/src/queries/vocoder/list_vocoder_models.rs @@ -5,12 +5,14 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::i8_to_bool; -use enums::common::vocoder_type::VocoderType; -use log::{warn, info}; +use log::{info, warn}; use sqlx::MySqlPool; +use enums::common::vocoder_type::VocoderType; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::i8_to_bool; + // FIXME: This is the old style of query scoping and shouldn't be copied. // But I'm in a hurry... diff --git a/crates/lib/mysql_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs b/crates/lib/mysql_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs index 0c2d803e64..f0c134e4bf 100644 --- a/crates/lib/mysql_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs +++ b/crates/lib/mysql_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs @@ -1,10 +1,11 @@ use anyhow::anyhow; -use chrono::{Utc, DateTime}; -use errors::AnyhowResult; -use crate::column_types::twitch_event_category::TwitchEventCategory; -use crate::helpers::boolean_converters::i8_to_bool; +use chrono::Utc; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::i8_to_bool; + /// Lookup by voice clone request token pub async fn get_voice_clone_request_by_token( voice_clone_request_token: &str, diff --git a/crates/lib/mysql_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs b/crates/lib/mysql_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs index ae8ac325a5..ec18e3df58 100644 --- a/crates/lib/mysql_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs +++ b/crates/lib/mysql_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs @@ -1,9 +1,10 @@ use anyhow::anyhow; -use errors::AnyhowResult; -use crate::column_types::twitch_event_category::TwitchEventCategory; -use crate::tokens::Tokens; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::tokens::Tokens; + pub struct InsertVoiceCloneRequestBuilder { pub uuid_idempotency_token: String, diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/inference/get_voice_conversion_model_for_inference.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/inference/get_voice_conversion_model_for_inference.rs index db1384150a..afb19222a2 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/inference/get_voice_conversion_model_for_inference.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/inference/get_voice_conversion_model_for_inference.rs @@ -3,14 +3,16 @@ //#![forbid(unused_mut)] //#![forbid(unused_variables)] -use chrono::{Utc, DateTime}; -use crate::helpers::boolean_converters::i8_to_bool; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use chrono::{DateTime, Utc}; use log::warn; -use sqlx::MySqlPool; use sqlx; +use sqlx::MySqlPool; + +use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use tokens::voice_conversion::model::VoiceConversionModelToken; +use crate::helpers::boolean_converters::i8_to_bool; + #[derive(Clone)] pub struct VoiceConversionModelForInference { pub token: VoiceConversionModelToken, diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/model_info_lite/get_voice_conversion_model_info_lite.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/model_info_lite/get_voice_conversion_model_info_lite.rs index e7b7d4b6ac..f5dd12fc97 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/model_info_lite/get_voice_conversion_model_info_lite.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/model_info_lite/get_voice_conversion_model_info_lite.rs @@ -1,12 +1,14 @@ use anyhow::anyhow; -use crate::queries::voice_conversion::model_info_lite::model_info_lite::VoiceConversionModelInfoLite; +use log::warn; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; + use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use errors::AnyhowResult; -use log::warn; -use sqlx::pool::PoolConnection; -use sqlx::{MySql, MySqlPool}; use tokens::voice_conversion::model::VoiceConversionModelToken; +use crate::queries::voice_conversion::model_info_lite::model_info_lite::VoiceConversionModelInfoLite; + pub async fn get_voice_conversion_model_info_lite( token: &str, mysql_pool: &MySqlPool, diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/model_info_lite/list_voice_conversion_model_info_lite.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/model_info_lite/list_voice_conversion_model_info_lite.rs index d4f263002a..98f8dad0b2 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/model_info_lite/list_voice_conversion_model_info_lite.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/model_info_lite/list_voice_conversion_model_info_lite.rs @@ -1,10 +1,12 @@ -use crate::queries::voice_conversion::model_info_lite::model_info_lite::VoiceConversionModelInfoLite; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; + use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use errors::AnyhowResult; -use sqlx::pool::PoolConnection; -use sqlx::{MySql, MySqlPool}; use tokens::voice_conversion::model::VoiceConversionModelToken; +use crate::queries::voice_conversion::model_info_lite::model_info_lite::VoiceConversionModelInfoLite; + pub async fn list_voice_conversion_model_info_lite( mysql_pool: &MySqlPool, ) -> AnyhowResult> { diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs index 2f6d06757c..fc8125b4ae 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs @@ -1,9 +1,11 @@ -use anyhow::anyhow; -use errors::AnyhowResult; -use enums::common::visibility::Visibility; -use sqlx::MySqlPool; use std::path::Path; + +use anyhow::anyhow; +use sqlx::MySqlPool; + use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums::common::visibility::Visibility; +use errors::AnyhowResult; use tokens::voice_conversion::model::VoiceConversionModelToken; pub struct InsertVoiceConversionModelArgs<'a, P: AsRef> { diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs index 75a36f32db..2e695ac429 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs @@ -1,15 +1,17 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::helpers::boolean_converters::i8_to_bool; +use log::warn; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; + use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use log::warn; -use sqlx::pool::PoolConnection; -use sqlx::{MySql, MySqlPool}; use tokens::users::user::UserToken; use tokens::voice_conversion::model::VoiceConversionModelToken; +use crate::helpers::boolean_converters::i8_to_bool; + #[derive(Serialize)] pub struct VoiceConversionModelRecordForList { pub token: VoiceConversionModelToken, diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result.rs index e30f00146d..09938f6182 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result.rs @@ -5,15 +5,17 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::helpers::boolean_converters::{nullable_i8_to_bool, i8_to_bool}; -use enums::common::visibility::Visibility; -use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; + +use enums::common::visibility::Visibility; +use errors::AnyhowResult; use tokens::tokens::voice_conversion_results::VoiceConversionResultToken; use tokens::users::user::UserToken; use tokens::voice_conversion::model::VoiceConversionModelToken; +use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_bool}; + // TODO(bt, 2023-09-07): I lazily copied this code from `get_tts_result` and didn't validate the query or the fields. // Once this is used in production flows, this should be spot checked. diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result_for_inference.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result_for_inference.rs index 133d368026..7dce605e15 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result_for_inference.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result_for_inference.rs @@ -5,14 +5,16 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::helpers::boolean_converters::{nullable_i8_to_bool}; -use enums::common::visibility::Visibility; -use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; + +use enums::common::visibility::Visibility; +use errors::AnyhowResult; use tokens::tokens::voice_conversion_results::VoiceConversionResultToken; use tokens::users::user::UserToken; +use crate::helpers::boolean_converters::nullable_i8_to_bool; + // TODO(bt, 2023-09-07): I lazily copied this code from `get_tts_result` and didn't validate the query or the fields. // Once this is used in production flows, this should be spot checked. diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs index cf413e28fa..3c010ff841 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs @@ -1,12 +1,14 @@ use anyhow::anyhow; -use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; -use errors::AnyhowResult; use log::warn; -use sqlx::MySqlPool; use sqlx; +use sqlx::MySqlPool; + use enums::by_table::voice_conversion_results::voice_conversion_media_token_type::VoiceConversionMediaTokenType; +use errors::AnyhowResult; use tokens::tokens::voice_conversion_results::VoiceConversionResultToken; +use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; + /// Used to give user-facing order to logged in user inference requests pub struct SyntheticIdRecord { pub next_id: i64, diff --git a/crates/lib/mysql_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs b/crates/lib/mysql_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs index 97aa84ada3..c8da79ad43 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs @@ -1,9 +1,10 @@ use anyhow::anyhow; -use errors::AnyhowResult; use log::warn; -use sqlx::{MySql, MySqlPool}; +use sqlx::MySql; use sqlx::pool::PoolConnection; +use errors::AnyhowResult; + #[derive(Serialize, Clone)] pub struct W2lLeaderboardRecordForList { pub username: String, diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs index 3cd58357c4..b7f4e265e3 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs @@ -4,10 +4,12 @@ use anyhow::anyhow; use chrono::Utc; -use errors::AnyhowResult; -use crate::tokens::Tokens; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::tokens::Tokens; + // TODO(2022-08-04): These were moved into the 'mysql_queries' crate, but they need // to be split up into several modules for better maintainability. cf the already moved // `tts_inference_job` queries. diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/get_pending_w2l_inference_job_detailed_stats.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/get_pending_w2l_inference_job_detailed_stats.rs index 84a424552f..f11e4654ca 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/get_pending_w2l_inference_job_detailed_stats.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/get_pending_w2l_inference_job_detailed_stats.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use errors::AnyhowResult; #[derive(Debug)] diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/get_w2l_inference_job_status.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/get_w2l_inference_job_status.rs index c7d539cda0..f063d68fd3 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/get_w2l_inference_job_status.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/get_w2l_inference_job_status.rs @@ -1,6 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::MySqlPool; + use errors::AnyhowResult; pub struct W2lInferenceJobStatusRecord { diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs index d915fc9195..1c2c9d094a 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs @@ -1,9 +1,9 @@ use anyhow::anyhow; -use sqlx::error::Error::Database; use log::error; +use sqlx::error::Error::Database; use sqlx::MySqlPool; + use errors::AnyhowResult; -use enums::common::visibility::Visibility; // FIXME: NB: This is an old query that was somewhat modernized when moved. // All the same, do not copy this example! diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job_extended.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job_extended.rs index 864ed5010e..eea8033433 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job_extended.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job_extended.rs @@ -1,7 +1,9 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use enums::common::visibility::Visibility; use errors::AnyhowResult; + use crate::tokens::Tokens; pub struct InsertW2lInferenceJobExtendedArgs<'a> { diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs index a92747feb8..314a308668 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs @@ -2,15 +2,18 @@ //! Sqlx's prepare needs a *single* binary to work against, so we need to //! include these in the main binary to generate all the queries. -use anyhow::anyhow; -use chrono::{Utc, DateTime}; -use errors::AnyhowResult; -use crate::tokens::Tokens; -use enums::common::visibility::Visibility; -use log::{warn, info}; -use sqlx::MySqlPool; use std::path::Path; +use anyhow::anyhow; +use chrono::{DateTime, Utc}; +use log::warn; +use sqlx::MySqlPool; + +use enums::common::visibility::Visibility; +use errors::AnyhowResult; + +use crate::tokens::Tokens; + // TODO(2022-08-04): These were moved into the 'mysql_queries' crate, but they need // to be split up into several modules for better maintainability. cf the already moved // `tts_inference_job` queries. diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs index be4964b005..04d5f2331b 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs @@ -1,6 +1,7 @@ -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub async fn delete_w2l_inference_result_as_user( inference_result_token: &str, mysql_pool: &MySqlPool diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs index 2f60223a0e..18daf27506 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use enums::common::visibility::Visibility; use errors::AnyhowResult; diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs index d526c6492d..ef871f4cd3 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs @@ -4,11 +4,12 @@ #![forbid(unused_variables)] use chrono::{DateTime, Utc}; -use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; -use errors::AnyhowResult; -use enums::common::visibility::Visibility; use sqlx::MySqlPool; +use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; +use enums::common::visibility::Visibility; +use errors::AnyhowResult; + #[derive(Serialize)] pub struct W2lInferenceListPage { pub inference_records: Vec, diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_results/query_w2l_result.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/query_w2l_result.rs index 5f383e4dda..e8bc6e8839 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_results/query_w2l_result.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/query_w2l_result.rs @@ -5,12 +5,14 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::nullable_i8_to_bool; -use enums::common::visibility::Visibility; use log::warn; use sqlx::MySqlPool; +use enums::common::visibility::Visibility; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::nullable_i8_to_bool; + #[derive(Serialize)] pub struct W2lResultRecordForResponse { pub w2l_result_token: String, diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs index 43186ac3dd..ebc154aac8 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs @@ -1,6 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::MySqlPool; + use errors::AnyhowResult; pub struct W2lUploadTemplateJobStatusRecord { diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs index a65aaaa972..9ab77f0af0 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs @@ -1,7 +1,8 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use errors::AnyhowResult; -use sqlx::error::Error::Database; + use crate::tokens::Tokens; pub struct InsertW2lTemplateUploadJobArgs<'a> { diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/check_w2l_template_exists.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/check_w2l_template_exists.rs index c88be3da43..0dc51757a9 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/check_w2l_template_exists.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/check_w2l_template_exists.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use errors::AnyhowResult; /// Just to query for existence diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs index 712392f573..def678a874 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs @@ -1,6 +1,7 @@ -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub async fn delete_w2l_template_as_user( template_token: &str, creator_ip_address: &str, diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs index 4ce9994bfe..20d1053183 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; -use sqlx::mysql::MySqlQueryResult; use sqlx::MySqlPool; + use enums::common::visibility::Visibility; use errors::AnyhowResult; diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs index 433a77f8ef..4d24b83b92 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs @@ -5,12 +5,14 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool}; -use enums::common::visibility::Visibility; use log::warn; use sqlx::MySqlPool; +use enums::common::visibility::Visibility; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; + // FIXME: This is the old style of query scoping and shouldn't be copied. // The moderator-only fields are good practice, though. diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_pending_w2l_templates.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_pending_w2l_templates.rs index 86c829bd4c..9ad46ef994 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_pending_w2l_templates.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_pending_w2l_templates.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use log::warn; use sqlx::MySqlPool; + use errors::AnyhowResult; pub struct PendingW2lTemplateRow { diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs index 12df06c5d4..d1424c8350 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs @@ -1,10 +1,12 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use errors::AnyhowResult; -use crate::helpers::boolean_converters::nullable_i8_to_optional_bool; -use log::{warn, info}; +use log::{info, warn}; use sqlx::MySqlPool; +use errors::AnyhowResult; + +use crate::helpers::boolean_converters::nullable_i8_to_optional_bool; + // FIXME: This is the old style of query scoping and shouldn't be copied. #[derive(Serialize, Clone)] diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/set_w2l_template_mod_approval.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/set_w2l_template_mod_approval.rs index b4903ce5f0..9aeb82e95d 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/set_w2l_template_mod_approval.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/set_w2l_template_mod_approval.rs @@ -1,7 +1,8 @@ use anyhow::anyhow; -use errors::AnyhowResult; use sqlx::MySqlPool; +use errors::AnyhowResult; + pub async fn set_w2l_template_mod_approval( w2l_template_token: &str, mod_user_token: &str, diff --git a/crates/lib/mysql_queries/src/tokens.rs b/crates/lib/mysql_queries/src/tokens.rs index 5d47522f88..776588b4e1 100644 --- a/crates/lib/mysql_queries/src/tokens.rs +++ b/crates/lib/mysql_queries/src/tokens.rs @@ -1,5 +1,5 @@ -use errors::AnyhowResult; use container_common::token::random_prefix_crockford_token::random_prefix_crockford_token; +use errors::AnyhowResult; /// Central place to define all the token types. // TODO: Make tokens strongly typed. diff --git a/crates/lib/redis_common/src/payloads/lease_payload.rs b/crates/lib/redis_common/src/payloads/lease_payload.rs index 1a60d3e4c5..228722d65f 100644 --- a/crates/lib/redis_common/src/payloads/lease_payload.rs +++ b/crates/lib/redis_common/src/payloads/lease_payload.rs @@ -1,4 +1,5 @@ use anyhow::anyhow; + use container_common::anyhow_result::AnyhowResult; use container_common::thread::thread_id::ThreadId; use container_common::token::random_crockford_token::random_crockford_token; @@ -53,6 +54,7 @@ impl LeasePayload { #[cfg(test)] mod tests { use container_common::thread::thread_id::ThreadId; + use crate::payloads::lease_payload::LeasePayload; #[test] diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_stories/get_news_story_by_token.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_stories/get_news_story_by_token.rs index 3f025875c9..36a35cc334 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_stories/get_news_story_by_token.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_stories/get_news_story_by_token.rs @@ -1,5 +1,5 @@ -use log::{error, warn}; use errors::{anyhow, AnyhowResult}; +use log::{error, warn}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_all.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_all.rs index d1c1860555..49e224b57d 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_all.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_all.rs @@ -1,10 +1,11 @@ -use crate::queries::by_table::news_stories::list::news_story_list_item::NewsStoryListItem; -use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; +use crate::queries::by_table::news_stories::list::news_story_list_item::NewsStoryListItem; +use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; + pub async fn list_news_stories_all( sqlite_pool: &SqlitePool, ) -> AnyhowResult> { diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_replayable.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_replayable.rs index 151c84b006..c2c801e0d1 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_replayable.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_replayable.rs @@ -1,10 +1,11 @@ -use crate::queries::by_table::news_stories::list::news_story_list_item::NewsStoryListItem; -use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; +use crate::queries::by_table::news_stories::list::news_story_list_item::NewsStoryListItem; +use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; + pub async fn list_news_stories_replayable( sqlite_pool: &SqlitePool, ) -> AnyhowResult> { diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_final_verification.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_final_verification.rs index 40e795e5fb..8840679dfa 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_final_verification.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_final_verification.rs @@ -1,9 +1,10 @@ -use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; +use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; + pub async fn list_news_story_productions_awaiting_audio_final_verification( last_id: i64, limit: i64, diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_generation.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_generation.rs index 874990bd2f..d66ba74eda 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_generation.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_generation.rs @@ -1,9 +1,10 @@ -use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; +use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; + pub async fn list_news_story_productions_awaiting_audio_generation( last_id: i64, limit: i64, diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_greenlight.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_greenlight.rs index 3a50bf8518..5ef0bf89cb 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_greenlight.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_greenlight.rs @@ -1,9 +1,10 @@ -use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; +use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; + pub async fn list_news_story_productions_awaiting_greenlight( last_id: i64, limit: i64, diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_image_generation.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_image_generation.rs index a4f7b23de9..83b34c80ce 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_image_generation.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_image_generation.rs @@ -1,9 +1,10 @@ -use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; +use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; + pub async fn list_news_story_productions_awaiting_image_generation( image_generation_status: AwaitableJobStatus, last_id: i64, diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_categorization.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_categorization.rs index 7155f46223..ba8aa6f2d9 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_categorization.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_categorization.rs @@ -1,9 +1,10 @@ -use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; +use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; + pub async fn list_news_story_productions_awaiting_llm_categorization( llm_rendition_status: AwaitableJobStatus, last_id: i64, diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_rendition.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_rendition.rs index df1f579bfa..ff227bb7e2 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_rendition.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_rendition.rs @@ -1,9 +1,10 @@ -use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; +use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; + pub async fn list_news_story_productions_awaiting_llm_rendition( llm_rendition_status: AwaitableJobStatus, last_id: i64, diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_title_summary.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_title_summary.rs index 29c2b1234a..78f4c50683 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_title_summary.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_title_summary.rs @@ -1,9 +1,10 @@ -use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; +use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; + pub async fn list_news_story_productions_awaiting_llm_title_summary( llm_rendition_status: AwaitableJobStatus, last_id: i64, diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_ready_for_debut.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_ready_for_debut.rs index ddb813679c..c5b5d592f1 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_ready_for_debut.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_ready_for_debut.rs @@ -1,9 +1,10 @@ -use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; +use crate::queries::by_table::news_story_productions::list::news_story_production_item::NewsStoryProductionItem; + pub async fn list_news_story_productions_ready_for_debut( last_id: i64, limit: i64, diff --git a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_production_greenlit_status.rs b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_production_greenlit_status.rs index 554a7ba171..ac6ead61a5 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_production_greenlit_status.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_production_greenlit_status.rs @@ -1,7 +1,7 @@ use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums::common::sqlite::skip_reason::SkipReason; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; -use enums::common::sqlite::skip_reason::SkipReason; use tokens::tokens::news_stories::NewsStoryToken; pub struct Args <'a> { diff --git a/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_download.rs b/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_download.rs index 8783b02eed..5a6921f475 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_download.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_download.rs @@ -1,8 +1,9 @@ -use crate::queries::by_table::tts_render_tasks::list::tts_render_task::TtsRenderTask; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::tts_models::TtsModelToken; +use crate::queries::by_table::tts_render_tasks::list::tts_render_task::TtsRenderTask; + // TODO: need to move download status to a different column as it's a different job pub async fn list_tts_render_tasks_awaiting_download( diff --git a/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_render.rs b/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_render.rs index 13edd41116..c643c75bf2 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_render.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_render.rs @@ -1,10 +1,11 @@ -use crate::queries::by_table::tts_render_tasks::list::tts_render_task::TtsRenderTask; use enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::tts_models::TtsModelToken; use tokens::tokens::tts_render_tasks::TtsRenderTaskToken; +use crate::queries::by_table::tts_render_tasks::list::tts_render_task::TtsRenderTask; + pub async fn list_tts_render_tasks_awaiting_render( tts_render_status: TtsRenderStatus, last_id: i64, diff --git a/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_for_story_token.rs b/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_for_story_token.rs index d08401c3bd..1ecfda79e2 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_for_story_token.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_for_story_token.rs @@ -1,10 +1,11 @@ -use crate::queries::by_table::tts_render_tasks::list::tts_render_task::TtsRenderTask; use enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::tts_models::TtsModelToken; use tokens::tokens::tts_render_tasks::TtsRenderTaskToken; +use crate::queries::by_table::tts_render_tasks::list::tts_render_task::TtsRenderTask; + // TODO: need to move download status to a different column as it's a different job pub async fn list_tts_render_tasks_for_story_token( diff --git a/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_unsuccessfully_submitted.rs b/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_unsuccessfully_submitted.rs index e170471233..c3fe1e43c2 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_unsuccessfully_submitted.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_unsuccessfully_submitted.rs @@ -1,7 +1,7 @@ +use enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; -use enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; use tokens::tokens::news_stories::NewsStoryToken; use tokens::tokens::tts_render_tasks::TtsRenderTaskToken; diff --git a/crates/lib/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_all_web_scraping_targets.rs b/crates/lib/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_all_web_scraping_targets.rs index 8f113689fe..eb577fa188 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_all_web_scraping_targets.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_all_web_scraping_targets.rs @@ -1,9 +1,10 @@ -use crate::queries::by_table::web_scraping_targets::list::web_scraping_target::{RawInternalWebScrapingTarget, WebScrapingTarget}; use enums::by_table::web_scraping_targets::scraping_status::ScrapingStatus; use enums::common::sqlite::web_content_type::WebContentType; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; +use crate::queries::by_table::web_scraping_targets::list::web_scraping_target::{RawInternalWebScrapingTarget, WebScrapingTarget}; + // NB: I wanted to do "RANDOM()", but Sqlx turns non-NULL fields to null. (WTF?!) pub async fn list_all_web_scraping_targets( diff --git a/crates/lib/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_web_scraping_targets.rs b/crates/lib/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_web_scraping_targets.rs index bd6af7a58c..ae21b95be3 100644 --- a/crates/lib/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_web_scraping_targets.rs +++ b/crates/lib/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_web_scraping_targets.rs @@ -1,9 +1,10 @@ -use crate::queries::by_table::web_scraping_targets::list::web_scraping_target::{RawInternalWebScrapingTarget, WebScrapingTarget}; use enums::by_table::web_scraping_targets::scraping_status::ScrapingStatus; use enums::common::sqlite::web_content_type::WebContentType; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; +use crate::queries::by_table::web_scraping_targets::list::web_scraping_target::{RawInternalWebScrapingTarget, WebScrapingTarget}; + pub async fn list_web_scraping_targets( scraping_status: ScrapingStatus, last_id: i64, diff --git a/crates/lib/sqlx_mysql_helpers/src/any_connection.rs b/crates/lib/sqlx_mysql_helpers/src/any_connection.rs index b5994bc403..d690ef7a2f 100644 --- a/crates/lib/sqlx_mysql_helpers/src/any_connection.rs +++ b/crates/lib/sqlx_mysql_helpers/src/any_connection.rs @@ -1,5 +1,6 @@ use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; + use errors::AnyhowResult; // TODO: I don't think I finished this work. diff --git a/crates/lib/tts_common/src/clean_symbols.rs b/crates/lib/tts_common/src/clean_symbols.rs index a3dfa1849e..a07eef0637 100644 --- a/crates/lib/tts_common/src/clean_symbols.rs +++ b/crates/lib/tts_common/src/clean_symbols.rs @@ -1,6 +1,8 @@ -use once_cell::sync::Lazy; use std::collections::HashMap; + +use once_cell::sync::Lazy; use unicode_segmentation::UnicodeSegmentation; + use user_input_common::latin_alphabet::LATIN_TO_ASCII_CHARACTER_MAP; // Used to insert tables into hashmap @@ -167,10 +169,10 @@ pub fn clean_symbols(input_text: &str) -> String { #[cfg(test)] mod tests { - use std::time::Instant; use chrono::{DateTime, Utc}; use log::warn; use once_cell::sync::Lazy; + use crate::clean_symbols::clean_symbols; const TIME_BOMB_EPOCH_STR : &str = "2023-11-01T00:00:00.00Z"; diff --git a/crates/lib/tts_common/src/text_pipelines/guess_pipeline.rs b/crates/lib/tts_common/src/text_pipelines/guess_pipeline.rs index e94f075f69..0b7071b1f8 100644 --- a/crates/lib/tts_common/src/text_pipelines/guess_pipeline.rs +++ b/crates/lib/tts_common/src/text_pipelines/guess_pipeline.rs @@ -1,6 +1,6 @@ -use std::ops::Deref; use chrono::{DateTime, Utc}; use once_cell::sync::Lazy; + use crate::text_pipelines::text_pipeline_type::TextPipelineType; // TODO: This is not yet popularized @@ -37,6 +37,7 @@ pub fn guess_text_pipeline_heuristic(maybe_model_created_at: Option HttpRequest { + use reusable_types::server_environment::ServerEnvironment; + + use crate::third_party_url_redirector::ThirdPartyUrlRedirector; + + fn request_with_host(hostname: &str) -> HttpRequest { TestRequest::default() .insert_header((HOST, hostname)) .to_http_request() diff --git a/crates/lib/user_input_common/src/check_for_slurs.rs b/crates/lib/user_input_common/src/check_for_slurs.rs index 36f0e87455..080565637b 100644 --- a/crates/lib/user_input_common/src/check_for_slurs.rs +++ b/crates/lib/user_input_common/src/check_for_slurs.rs @@ -1,6 +1,8 @@ -use crate::BANNED_SLURS; -use once_cell::sync::Lazy; use std::collections::HashSet; + +use once_cell::sync::Lazy; + +use crate::BANNED_SLURS; use crate::latin_alphabet::latin_to_ascii; static BANNED_SLURS_SET : Lazy> = Lazy::new(|| { diff --git a/crates/lib/user_input_common/src/latin_alphabet.rs b/crates/lib/user_input_common/src/latin_alphabet.rs index efcd7d3172..6fcb6409e3 100644 --- a/crates/lib/user_input_common/src/latin_alphabet.rs +++ b/crates/lib/user_input_common/src/latin_alphabet.rs @@ -1,5 +1,6 @@ -use once_cell::sync::Lazy; use std::collections::HashMap; + +use once_cell::sync::Lazy; use unicode_segmentation::UnicodeSegmentation; fn to_owned(item: &(&str, &str)) -> (String, String) { diff --git a/crates/lib/user_input_common/src/markdown_to_html.rs b/crates/lib/user_input_common/src/markdown_to_html.rs index dbc4aca789..98269d55c2 100644 --- a/crates/lib/user_input_common/src/markdown_to_html.rs +++ b/crates/lib/user_input_common/src/markdown_to_html.rs @@ -1,4 +1,4 @@ -use pulldown_cmark::{Options, Parser, html}; +use pulldown_cmark::{html, Options, Parser}; pub fn markdown_to_html(markdown_input: &str) -> String { // NB: CommonMark allows for HTML, including