From 97a3310b59813eff60ca7e0512b87550dfd8a9d3 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 16 May 2024 07:04:48 -0700 Subject: [PATCH] cleanup imports --- .../entity_stats/stats_entity_type.rs | 15 ++--- .../featured_item_entity_type.rs | 19 +++--- .../generic_synthetic_ids/id_category.rs | 2 +- .../media_file_origin_model_type.rs | 2 +- .../model_weights/weights_category.rs | 4 +- .../model_weights/weights_file_type.rs | 5 +- .../by_table/model_weights/weights_types.rs | 4 +- .../user_bookmark_entity_type.rs | 14 ++--- .../src/by_table/users/user_feature_flag.rs | 2 +- .../src/by_table/zs_voices/model_category.rs | 2 +- .../src/by_table/zs_voices/model_type.rs | 2 +- .../enums/src/common/job_status_plus.rs | 2 +- crates/_types/enums/src/common/view_as.rs | 25 ++++---- crates/_types/enums/src/common/visibility.rs | 2 +- .../src/tokens/generic_inference_jobs.rs | 2 +- .../_types/tokens/src/tokens/model_weights.rs | 2 +- .../tokens/src/tokens/user_bookmarks.rs | 2 +- crates/_types/tokens/src/tokens/users.rs | 3 +- .../src/seeding/media_files.rs | 6 +- .../src/seeding/model_weights.rs | 4 +- .../src/seeding/seed_model_weights.rs | 8 +-- crates/cli/production/db-backup/src/main.rs | 2 +- .../delete_user_files/delete_user_files.rs | 3 +- .../query_pair.rs | 1 + .../cli/production/migration-tool/src/deps.rs | 1 + .../src/configs/development_only.rs | 1 + .../src/configs/gottagofast.rs | 1 + .../cloud_storage/src/bucket_client.rs | 8 ++- .../bucket_orchestration.rs | 2 +- .../src/remote_file_manager/file_directory.rs | 5 +- .../remote_cloud_bucket_details.rs | 1 + .../remote_cloud_file_manager.rs | 14 ++--- crates/lib/easyenv/src/logging.rs | 1 - crates/lib/email_sender/src/lib.rs | 6 +- crates/lib/files/images/src/lib.rs | 5 +- .../get_tts_model_info_migration.rs | 2 +- .../list_vc_models_for_migration.rs | 2 +- .../workflow_payload.rs | 5 +- .../queries/audit_logs/insert_audit_log.rs | 1 + .../insert_audit_log_transactional.rs | 1 - .../beta_keys/get_beta_key_by_value.rs | 4 +- .../queries/comments/comment_entity_token.rs | 2 +- .../web/get_inference_job_status.rs | 2 +- .../insert_media_file_from_file_upload.rs | 1 - .../insert_media_file_from_zero_shot_tts.rs | 3 +- .../media_files/get/batch_get_media_files.rs | 2 +- .../get/batch_get_media_files_by_tokens.rs | 2 +- .../queries/media_files/get/get_media_file.rs | 2 +- .../list/list_featured_media_files.rs | 4 +- .../media_files/list/list_media_files.rs | 4 +- .../list/list_media_files_by_batch_token.rs | 3 +- .../list/list_media_files_for_user.rs | 2 +- .../model_weights/create/create_weight.rs | 15 ++--- .../queries/model_weights/delete_weights.rs | 3 +- .../model_weights/edit/update_weight.rs | 13 ++--- .../get/get_weight_for_legacy_tts_info.rs | 1 + .../list/list_weights_query_builder.rs | 16 ++--- .../src/queries/model_weights/tests.rs | 58 +++++++++---------- .../users/user/set_user_feature_flags.rs | 3 +- .../set_user_feature_flags_transactional.rs | 6 +- .../user_ratings/batch_get_user_rating.rs | 1 + .../get_total_user_rating_count_for_entity.rs | 2 +- .../results/get_voice_conversion_result.rs | 2 +- ...t_voice_conversion_result_for_inference.rs | 2 +- .../voice_designer/datasets/create_dataset.rs | 7 ++- .../voice_designer/datasets/get_dataset.rs | 1 - .../voice_designer/datasets/update_dataset.rs | 7 ++- .../voices/list_voices_query_builder.rs | 5 +- .../tests/racist_prompt_tests.rs | 2 +- crates/lib/storyteller_root/src/lib.rs | 7 ++- .../src/paths/seed_tool_data_root.rs | 2 +- .../src/paths/storyteller_frontend_root.rs | 2 +- crates/lib/testing/src/test_file_path.rs | 1 + 73 files changed, 198 insertions(+), 178 deletions(-) diff --git a/crates/_types/enums/src/by_table/entity_stats/stats_entity_type.rs b/crates/_types/enums/src/by_table/entity_stats/stats_entity_type.rs index c75c2c653..f07214e9a 100644 --- a/crates/_types/enums/src/by_table/entity_stats/stats_entity_type.rs +++ b/crates/_types/enums/src/by_table/entity_stats/stats_entity_type.rs @@ -1,4 +1,5 @@ use std::collections::BTreeSet; + use serde::Deserialize; use serde::Serialize; #[cfg(test)] @@ -61,13 +62,13 @@ impl StatsEntityType { #[cfg(test)] mod tests { - use crate::by_table::entity_stats::stats_entity_type::StatsEntityType; - use crate::test_helpers::assert_serialization; + use crate::by_table::entity_stats::stats_entity_type::StatsEntityType; + use crate::test_helpers::assert_serialization; - mod explicit_checks { - use super::*; + mod explicit_checks { + use super::*; - #[test] + #[test] fn test_serialization() { assert_serialization(StatsEntityType::Comment, "comment"); assert_serialization(StatsEntityType::MediaFile, "media_file"); @@ -101,9 +102,9 @@ mod tests { } mod mechanical_checks { - use super::*; + use super::*; - #[test] + #[test] fn variant_length() { use strum::IntoEnumIterator; assert_eq!(StatsEntityType::all_variants().len(), StatsEntityType::iter().len()); diff --git a/crates/_types/enums/src/by_table/featured_items/featured_item_entity_type.rs b/crates/_types/enums/src/by_table/featured_items/featured_item_entity_type.rs index 3fe7dfb00..012fa4deb 100644 --- a/crates/_types/enums/src/by_table/featured_items/featured_item_entity_type.rs +++ b/crates/_types/enums/src/by_table/featured_items/featured_item_entity_type.rs @@ -1,4 +1,5 @@ use std::collections::BTreeSet; + use serde::Deserialize; use serde::Serialize; #[cfg(test)] @@ -61,13 +62,13 @@ impl FeaturedItemEntityType { #[cfg(test)] mod tests { - use crate::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; - use crate::test_helpers::assert_serialization; + use crate::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; + use crate::test_helpers::assert_serialization; - mod serde { - use super::*; + mod serde { + use super::*; - #[test] + #[test] fn test_serialization() { assert_serialization(FeaturedItemEntityType::MediaFile, "media_file"); assert_serialization(FeaturedItemEntityType::ModelWeight, "model_weight"); @@ -76,9 +77,9 @@ mod tests { } mod impl_methods { - use super::*; + use super::*; - #[test] + #[test] fn test_to_str() { assert_eq!(FeaturedItemEntityType::MediaFile.to_str(), "media_file"); assert_eq!(FeaturedItemEntityType::ModelWeight.to_str(), "model_weight"); @@ -95,9 +96,9 @@ mod tests { } mod mechanical_checks { - use super::*; + use super::*; - #[test] + #[test] fn variant_length() { use strum::IntoEnumIterator; assert_eq!(FeaturedItemEntityType::all_variants().len(), FeaturedItemEntityType::iter().len()); 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 b9e7d2277..a10afc5b2 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 @@ -132,7 +132,7 @@ mod tests { mod explicit_checks { use super::*; - #[test] + #[test] fn test_serialization() { assert_serialization(IdCategory::MediaFile, "media_file"); assert_serialization(IdCategory::LipsyncAnimationResult, "lipsync_animation"); 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 dd0cf88c2..eb193ca55 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 @@ -113,7 +113,7 @@ mod tests { mod explicit_checks { use super::*; - #[test] + #[test] fn test_serialization() { assert_serialization(MediaFileOriginModelType::SadTalker, "sad_talker"); } diff --git a/crates/_types/enums/src/by_table/model_weights/weights_category.rs b/crates/_types/enums/src/by_table/model_weights/weights_category.rs index d281b9dfb..73b279f36 100644 --- a/crates/_types/enums/src/by_table/model_weights/weights_category.rs +++ b/crates/_types/enums/src/by_table/model_weights/weights_category.rs @@ -59,9 +59,9 @@ impl_mysql_from_row!(WeightsCategory); #[cfg(test)] mod tests { - use super::*; + use super::*; - #[test] + #[test] fn test_to_str() { assert_eq!(WeightsCategory::ImageGeneration.to_str(), "image_generation"); assert_eq!(WeightsCategory::TextToSpeech.to_str(), "text_to_speech"); diff --git a/crates/_types/enums/src/by_table/model_weights/weights_file_type.rs b/crates/_types/enums/src/by_table/model_weights/weights_file_type.rs index a7adeb72c..caba87c7f 100644 --- a/crates/_types/enums/src/by_table/model_weights/weights_file_type.rs +++ b/crates/_types/enums/src/by_table/model_weights/weights_file_type.rs @@ -4,6 +4,7 @@ use std::collections::BTreeSet; use strum::EnumCount; #[cfg(test)] use strum::EnumIter; + // TODO we will need to scan the checkpoints for malicious code. We can't just trust the file extension. #[cfg_attr(test, derive(EnumIter, EnumCount))] #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)] @@ -43,9 +44,9 @@ impl_mysql_enum_coders!(WeightsFileType); #[cfg(test)] mod tests { - use super::*; + use super::*; - #[test] + #[test] fn test_to_str() { assert_eq!(WeightsFileType::Checkpoint.to_str(), "checkpoint"); assert_eq!(WeightsFileType::SafeTensors.to_str(), "safetensors"); diff --git a/crates/_types/enums/src/by_table/model_weights/weights_types.rs b/crates/_types/enums/src/by_table/model_weights/weights_types.rs index c0ecb6fce..878bb72fe 100644 --- a/crates/_types/enums/src/by_table/model_weights/weights_types.rs +++ b/crates/_types/enums/src/by_table/model_weights/weights_types.rs @@ -81,9 +81,9 @@ impl_mysql_from_row!(WeightsType); #[cfg(test)] mod tests { - use super::*; + use super::*; - #[test] + #[test] fn test_to_str() { assert_eq!(WeightsType::HifiganTacotron2.to_str(), "hifigan_tt2"); assert_eq!(WeightsType::RvcV2.to_str(), "rvc_v2"); diff --git a/crates/_types/enums/src/by_table/user_bookmarks/user_bookmark_entity_type.rs b/crates/_types/enums/src/by_table/user_bookmarks/user_bookmark_entity_type.rs index b10a5c47a..da317e730 100644 --- a/crates/_types/enums/src/by_table/user_bookmarks/user_bookmark_entity_type.rs +++ b/crates/_types/enums/src/by_table/user_bookmarks/user_bookmark_entity_type.rs @@ -86,13 +86,13 @@ impl UserBookmarkEntityType { #[cfg(test)] mod tests { - use crate::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; - use crate::test_helpers::assert_serialization; + use crate::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; + use crate::test_helpers::assert_serialization; - mod serde { - use super::*; + mod serde { + use super::*; - #[test] + #[test] fn test_serialization() { assert_serialization(UserBookmarkEntityType::User, "user"); assert_serialization(UserBookmarkEntityType::TtsModel, "tts_model"); @@ -107,9 +107,9 @@ mod tests { } mod impl_methods { - use super::*; + use super::*; - #[test] + #[test] fn test_to_str() { assert_eq!(UserBookmarkEntityType::User.to_str(), "user"); assert_eq!(UserBookmarkEntityType::TtsModel.to_str(), "tts_model"); diff --git a/crates/_types/enums/src/by_table/users/user_feature_flag.rs b/crates/_types/enums/src/by_table/users/user_feature_flag.rs index 5520b303b..b1552cd9e 100644 --- a/crates/_types/enums/src/by_table/users/user_feature_flag.rs +++ b/crates/_types/enums/src/by_table/users/user_feature_flag.rs @@ -63,8 +63,8 @@ impl UserFeatureFlag { #[cfg(test)] mod tests { - use crate::test_helpers::assert_serialization; use crate::by_table::users::user_feature_flag::UserFeatureFlag; + use crate::test_helpers::assert_serialization; mod explicit_checks { use super::*; diff --git a/crates/_types/enums/src/by_table/zs_voices/model_category.rs b/crates/_types/enums/src/by_table/zs_voices/model_category.rs index 02d85d2e5..89b561a1f 100644 --- a/crates/_types/enums/src/by_table/zs_voices/model_category.rs +++ b/crates/_types/enums/src/by_table/zs_voices/model_category.rs @@ -48,8 +48,8 @@ impl ZsVoiceModelCategory { #[cfg(test)] mod tests { - use crate::test_helpers::assert_serialization; use crate::by_table::zs_voices::model_category::ZsVoiceModelCategory; + use crate::test_helpers::assert_serialization; mod serde { use super::*; diff --git a/crates/_types/enums/src/by_table/zs_voices/model_type.rs b/crates/_types/enums/src/by_table/zs_voices/model_type.rs index a5e4dca81..4af95aa9c 100644 --- a/crates/_types/enums/src/by_table/zs_voices/model_type.rs +++ b/crates/_types/enums/src/by_table/zs_voices/model_type.rs @@ -53,8 +53,8 @@ impl ZsVoiceModelType { #[cfg(test)] mod tests { - use crate::test_helpers::assert_serialization; use crate::by_table::zs_voices::model_type::ZsVoiceModelType; + use crate::test_helpers::assert_serialization; mod serde { use super::*; diff --git a/crates/_types/enums/src/common/job_status_plus.rs b/crates/_types/enums/src/common/job_status_plus.rs index 6807350da..9d2c37453 100644 --- a/crates/_types/enums/src/common/job_status_plus.rs +++ b/crates/_types/enums/src/common/job_status_plus.rs @@ -1,10 +1,10 @@ use std::collections::BTreeSet; -use utoipa::ToSchema; #[cfg(test)] use strum::EnumCount; #[cfg(test)] use strum::EnumIter; +use utoipa::ToSchema; /// This is used in newer jobs (that add additional enum states) /// diff --git a/crates/_types/enums/src/common/view_as.rs b/crates/_types/enums/src/common/view_as.rs index 178435c40..f9919530f 100644 --- a/crates/_types/enums/src/common/view_as.rs +++ b/crates/_types/enums/src/common/view_as.rs @@ -2,9 +2,8 @@ use strum::EnumCount; #[cfg(test)] use strum::EnumIter; - - use utoipa::ToSchema; + #[cfg_attr(test, derive(EnumIter, EnumCount))] #[derive(Clone, Copy, Eq, PartialEq, Deserialize, Serialize, sqlx::Type,ToSchema)] #[serde(rename_all = "snake_case")] @@ -51,10 +50,10 @@ impl ViewAs { #[cfg(test)] mod tests { - use crate::common::view_as::ViewAs; - use crate::test_helpers::assert_serialization; + use crate::common::view_as::ViewAs; + use crate::test_helpers::assert_serialization; - #[test] + #[test] fn test_default() { assert_eq!(ViewAs::default(), ViewAs::AnotherUser); @@ -83,9 +82,9 @@ mod tests { } mod traits { - use crate::common::view_as::ViewAs; + use crate::common::view_as::ViewAs; - #[test] + #[test] fn display() { let view_as = ViewAs::Moderator; assert_eq!(format!("{}", view_as), "moderator".to_string()); @@ -105,11 +104,11 @@ mod tests { } mod serde_serialization { - use crate::common::view_as::ViewAs; + use crate::common::view_as::ViewAs; - use super::CompositeType; + use super::CompositeType; - #[test] + #[test] fn serialize() { let expected = "\"author\"".to_string(); // NB: Quoted @@ -128,11 +127,11 @@ mod tests { } mod serde_deserialization { - use crate::common::view_as::ViewAs; + use crate::common::view_as::ViewAs; - use super::CompositeType; + use super::CompositeType; - #[test] + #[test] fn deserialize() { let payload = "\"another_user\""; // NB: Quoted let value: ViewAs = serde_json::from_str(payload).unwrap(); diff --git a/crates/_types/enums/src/common/visibility.rs b/crates/_types/enums/src/common/visibility.rs index 7e9c0341f..e67616f81 100644 --- a/crates/_types/enums/src/common/visibility.rs +++ b/crates/_types/enums/src/common/visibility.rs @@ -2,7 +2,6 @@ use strum::EnumCount; #[cfg(test)] use strum::EnumIter; - /// Visibility /// /// Used in various database tables (as enums! careful!) and the HTTP API to convey @@ -17,6 +16,7 @@ use strum::EnumIter; /// *DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY!* use utoipa::ToSchema; + #[cfg_attr(test, derive(EnumIter, EnumCount))] #[derive(Clone, Copy, Eq, PartialEq, Deserialize, Serialize, sqlx::Type,ToSchema)] #[serde(rename_all = "lowercase")] diff --git a/crates/_types/tokens/src/tokens/generic_inference_jobs.rs b/crates/_types/tokens/src/tokens/generic_inference_jobs.rs index 4a625124d..e27e41268 100644 --- a/crates/_types/tokens/src/tokens/generic_inference_jobs.rs +++ b/crates/_types/tokens/src/tokens/generic_inference_jobs.rs @@ -2,9 +2,9 @@ use std::fmt::Debug; use serde::Deserialize; use serde::Serialize; +use utoipa::ToSchema; use crate::prefixes::TokenPrefix; -use utoipa::ToSchema; /// The primary key for "generic" inference jobs. #[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize, Default, ToSchema)] diff --git a/crates/_types/tokens/src/tokens/model_weights.rs b/crates/_types/tokens/src/tokens/model_weights.rs index a32abff02..427ac7d83 100644 --- a/crates/_types/tokens/src/tokens/model_weights.rs +++ b/crates/_types/tokens/src/tokens/model_weights.rs @@ -2,10 +2,10 @@ use std::fmt::Debug; use serde::Deserialize; use serde::Serialize; +use utoipa::ToSchema; use crate::prefixes::TokenPrefix; -use utoipa::ToSchema; /// The primary key for the "model_weights" table. #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize,ToSchema)] #[sqlx(transparent)] diff --git a/crates/_types/tokens/src/tokens/user_bookmarks.rs b/crates/_types/tokens/src/tokens/user_bookmarks.rs index 94ec6f99e..97c498f96 100644 --- a/crates/_types/tokens/src/tokens/user_bookmarks.rs +++ b/crates/_types/tokens/src/tokens/user_bookmarks.rs @@ -3,8 +3,8 @@ use std::fmt::Debug; use serde::Deserialize; use serde::Serialize; use utoipa::ToSchema; -use crate::prefixes::TokenPrefix; +use crate::prefixes::TokenPrefix; /// The primary key for Audit Logs. #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize, ToSchema)] diff --git a/crates/_types/tokens/src/tokens/users.rs b/crates/_types/tokens/src/tokens/users.rs index 47bc34d45..678de7853 100644 --- a/crates/_types/tokens/src/tokens/users.rs +++ b/crates/_types/tokens/src/tokens/users.rs @@ -2,9 +2,10 @@ use std::fmt::Debug; use serde::Deserialize; use serde::Serialize; +use utoipa::ToSchema; use crate::prefixes::TokenPrefix; -use utoipa::ToSchema; + /// The primary key for users. #[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize, Default,ToSchema)] #[sqlx(transparent)] diff --git a/crates/cli/devenv/dev-database-seed/src/seeding/media_files.rs b/crates/cli/devenv/dev-database-seed/src/seeding/media_files.rs index 9d0caad28..17e4b96f2 100644 --- a/crates/cli/devenv/dev-database-seed/src/seeding/media_files.rs +++ b/crates/cli/devenv/dev-database-seed/src/seeding/media_files.rs @@ -1,19 +1,19 @@ use log::info; use sqlx::{MySql, Pool}; + use cloud_storage::remote_file_manager::media_descriptor::MediaVideoMp4Descriptor; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; -use mysql_queries::queries::media_files::create::insert_media_file_from_cli_tool::{insert_media_file_from_cli_tool, InsertArgs}; use errors::{anyhow, AnyhowResult}; +use mysql_queries::queries::media_files::create::insert_media_file_from_cli_tool::{insert_media_file_from_cli_tool, InsertArgs}; use mysql_queries::queries::users::user::get_user_token_by_username::get_user_token_by_username; use storyteller_root::get_seed_tool_data_root; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; + use crate::seeding::users::HANASHI_USERNAME; - - pub async fn seed_test_videos(mysql_pool: &Pool, user_token: UserToken) -> AnyhowResult<()> { let model_weight_token1 = MediaFileToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously(); let seed_tool_data_root = get_seed_tool_data_root(); diff --git a/crates/cli/devenv/dev-database-seed/src/seeding/model_weights.rs b/crates/cli/devenv/dev-database-seed/src/seeding/model_weights.rs index ffc6de80b..0fce04770 100644 --- a/crates/cli/devenv/dev-database-seed/src/seeding/model_weights.rs +++ b/crates/cli/devenv/dev-database-seed/src/seeding/model_weights.rs @@ -8,8 +8,8 @@ use cloud_storage::remote_file_manager::remote_cloud_bucket_details::RemoteCloud use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; use cloud_storage::remote_file_manager::weights_descriptor::{WeightsLoRADescriptor, WeightsSD15Descriptor, WeightsWorkflowDescriptor}; use enums::by_table::model_weights::{ - weights_category::WeightsCategory, - weights_types::WeightsType, + weights_category::WeightsCategory, + weights_types::WeightsType, }; use enums::common::visibility::Visibility; use errors::{anyhow, AnyhowResult}; diff --git a/crates/cli/devenv/dev-database-seed/src/seeding/seed_model_weights.rs b/crates/cli/devenv/dev-database-seed/src/seeding/seed_model_weights.rs index c0fb9d3af..786defc84 100644 --- a/crates/cli/devenv/dev-database-seed/src/seeding/seed_model_weights.rs +++ b/crates/cli/devenv/dev-database-seed/src/seeding/seed_model_weights.rs @@ -7,8 +7,8 @@ use sqlx::{MySql, Pool}; use buckets::public::weight_files::bucket_file_path::WeightFileBucketPath; use enums::{ - by_table::model_weights::{weights_category::WeightsCategory, weights_types::WeightsType}, - common::visibility::Visibility, + by_table::model_weights::{weights_category::WeightsCategory, weights_types::WeightsType}, + common::visibility::Visibility, }; use errors::{anyhow, AnyhowResult}; use filesys::file_read_bytes::file_read_bytes; @@ -17,8 +17,8 @@ use filesys::path_to_string::path_to_string; use hashing::sha256::sha256_hash_file::sha256_hash_file; use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; use mysql_queries::queries::model_weights::create::create_weight::{ - create_weight, - CreateModelWeightsArgs, + create_weight, + CreateModelWeightsArgs, }; use storyteller_root::get_seed_tool_data_root; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/cli/production/db-backup/src/main.rs b/crates/cli/production/db-backup/src/main.rs index cbe54167d..6dbab946f 100644 --- a/crates/cli/production/db-backup/src/main.rs +++ b/crates/cli/production/db-backup/src/main.rs @@ -1,7 +1,7 @@ -use easyenv::init_all_with_default_logging; use log::info; use container_common::anyhow_result::AnyhowResult; +use easyenv::init_all_with_default_logging; fn main() -> AnyhowResult<()> { init_all_with_default_logging(None); diff --git a/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs b/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs index ba93d68ab..a83f16390 100644 --- a/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs +++ b/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs @@ -1,9 +1,10 @@ use std::thread; use std::time::Duration; + use log::info; use sqlx::{MySql, Pool}; -use enums::common::view_as::ViewAs; +use enums::common::view_as::ViewAs; use errors::{anyhow, AnyhowResult}; use mysql_queries::queries::media_files::delete_media_file::delete_media_file_as_mod; use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs}; diff --git a/crates/cli/production/db-cleanup/src/operations/migrate_media_files_enum_values/query_pair.rs b/crates/cli/production/db-cleanup/src/operations/migrate_media_files_enum_values/query_pair.rs index 646ba99d1..3b72ba1f9 100644 --- a/crates/cli/production/db-cleanup/src/operations/migrate_media_files_enum_values/query_pair.rs +++ b/crates/cli/production/db-cleanup/src/operations/migrate_media_files_enum_values/query_pair.rs @@ -1,5 +1,6 @@ use std::thread; use std::time::Duration; + use itertools::Itertools; use log::info; use sqlx::{FromRow, MySql, MySqlPool, Pool, QueryBuilder, Row}; diff --git a/crates/cli/production/migration-tool/src/deps.rs b/crates/cli/production/migration-tool/src/deps.rs index 8e361fd4f..0f71d9ab3 100644 --- a/crates/cli/production/migration-tool/src/deps.rs +++ b/crates/cli/production/migration-tool/src/deps.rs @@ -1,4 +1,5 @@ use sqlx::{MySql, Pool}; + use cloud_storage::bucket_client::BucketClient; pub struct Deps { diff --git a/crates/lib/actix_cors_configs/src/configs/development_only.rs b/crates/lib/actix_cors_configs/src/configs/development_only.rs index 2bfe61c70..0e6f8a1a5 100644 --- a/crates/lib/actix_cors_configs/src/configs/development_only.rs +++ b/crates/lib/actix_cors_configs/src/configs/development_only.rs @@ -1,4 +1,5 @@ use std::net::Ipv4Addr; + use actix_cors::Cors; use log::warn; use url::{Host, Url}; diff --git a/crates/lib/actix_cors_configs/src/configs/gottagofast.rs b/crates/lib/actix_cors_configs/src/configs/gottagofast.rs index 19ca1a07f..d26a7b988 100644 --- a/crates/lib/actix_cors_configs/src/configs/gottagofast.rs +++ b/crates/lib/actix_cors_configs/src/configs/gottagofast.rs @@ -1,4 +1,5 @@ use actix_cors::Cors; + use crate::util::netlify_branch_domain_matches::netlify_branch_domain_matches; pub fn add_gotta_go_fast_test_branches(cors: Cors, _is_production: bool) -> Cors { 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 002350033..9d6ce9387 100644 --- a/crates/lib/api_clients/cloud_storage/src/bucket_client.rs +++ b/crates/lib/api_clients/cloud_storage/src/bucket_client.rs @@ -1,6 +1,7 @@ +use std::error::Error; use std::path::Path; use std::time::Duration; -use errors::AnyhowResult; + use anyhow::anyhow; use anyhow::bail; use log::info; @@ -10,8 +11,9 @@ use s3::creds::Credentials; use s3::region::Region; use tokio::fs::File; use tokio::io::AsyncReadExt; - use std::error::Error; - + +use errors::AnyhowResult; + #[derive(Clone)] pub struct BucketClient { bucket: Bucket, diff --git a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/bucket_orchestration.rs b/crates/lib/api_clients/cloud_storage/src/remote_file_manager/bucket_orchestration.rs index bfa0124e1..d769164c6 100644 --- a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/bucket_orchestration.rs +++ b/crates/lib/api_clients/cloud_storage/src/remote_file_manager/bucket_orchestration.rs @@ -1,7 +1,7 @@ +use async_trait::async_trait; use log::info; use tokio::time::Duration; -use async_trait::async_trait; use errors::AnyhowResult; use crate::bucket_client::BucketClient; diff --git a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/file_directory.rs b/crates/lib/api_clients/cloud_storage/src/remote_file_manager/file_directory.rs index e3f6af359..6f04e8a82 100644 --- a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/file_directory.rs +++ b/crates/lib/api_clients/cloud_storage/src/remote_file_manager/file_directory.rs @@ -1,7 +1,8 @@ - use std::path::PathBuf; -use crockford::crockford_entropy_lower; + use buckets::util::hashed_directory_path_long_string; +use crockford::crockford_entropy_lower; + use crate::remote_file_manager::file_descriptor::FileDescriptor; use crate::remote_file_manager::remote_cloud_bucket_details::RemoteCloudBucketDetails; diff --git a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_bucket_details.rs b/crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_bucket_details.rs index 21b1d8345..c5a5a1f63 100644 --- a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_bucket_details.rs +++ b/crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_bucket_details.rs @@ -1,5 +1,6 @@ use crate::remote_file_manager::media_descriptor; use crate::remote_file_manager::weights_descriptor::{self}; + use super::file_descriptor::FileDescriptor; #[derive(Debug, Clone)] diff --git a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_file_manager.rs b/crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_file_manager.rs index 63c2c9710..e96664ed2 100644 --- a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_file_manager.rs +++ b/crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_file_manager.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; -use buckets::public::media_files::bucket_file_path::MediaFileBucketPath; +use buckets::public::media_files::bucket_file_path::MediaFileBucketPath; use errors::AnyhowResult; use filesys::file_read_bytes::file_read_bytes; use filesys::file_size::file_size; @@ -112,15 +112,15 @@ impl RemoteCloudFileClient { #[cfg(test)] mod tests { - use async_trait::async_trait; - use env_logger; + use async_trait::async_trait; + use env_logger; - use errors::AnyhowResult; + use errors::AnyhowResult; - use crate::remote_file_manager::bucket_orchestration::BucketOrchestrationCore; - use crate::remote_file_manager::weights_descriptor::WeightsLoRADescriptor; + use crate::remote_file_manager::bucket_orchestration::BucketOrchestrationCore; + use crate::remote_file_manager::weights_descriptor::WeightsLoRADescriptor; - struct BucketOrchestrationMock {} + struct BucketOrchestrationMock {} #[async_trait] impl BucketOrchestrationCore for BucketOrchestrationMock { diff --git a/crates/lib/easyenv/src/logging.rs b/crates/lib/easyenv/src/logging.rs index 770823d65..ae4ce8c07 100644 --- a/crates/lib/easyenv/src/logging.rs +++ b/crates/lib/easyenv/src/logging.rs @@ -1,6 +1,5 @@ use std::env; - /// Name of the environment variable Rust's env logger uses pub const ENV_RUST_LOG : &str = "RUST_LOG"; diff --git a/crates/lib/email_sender/src/lib.rs b/crates/lib/email_sender/src/lib.rs index a9894c3ce..b65821da5 100644 --- a/crates/lib/email_sender/src/lib.rs +++ b/crates/lib/email_sender/src/lib.rs @@ -5,9 +5,9 @@ /// Public re-exports pub mod letter_exports { - pub use lettre::Message; - pub use lettre::message::header::ContentType; - pub use lettre::message::Mailbox; + pub use lettre::Message; + pub use lettre::message::header::ContentType; + pub use lettre::message::Mailbox; } pub mod smtp_email_sender; diff --git a/crates/lib/files/images/src/lib.rs b/crates/lib/files/images/src/lib.rs index 211bdc711..1d3296667 100644 --- a/crates/lib/files/images/src/lib.rs +++ b/crates/lib/files/images/src/lib.rs @@ -20,8 +20,9 @@ #![allow(dead_code)] #![allow(non_snake_case)] +// Re-export image to everyone importing this library +pub use image; + pub mod resize_image_file_preserving_aspect; pub mod resize_preserving_aspect; -// Re-export image to everyone importing this library -pub use image; diff --git a/crates/lib/migration/src/text_to_speech/get_tts_model_info_migration.rs b/crates/lib/migration/src/text_to_speech/get_tts_model_info_migration.rs index eba69e195..91600e884 100644 --- a/crates/lib/migration/src/text_to_speech/get_tts_model_info_migration.rs +++ b/crates/lib/migration/src/text_to_speech/get_tts_model_info_migration.rs @@ -2,8 +2,8 @@ use chrono::{DateTime, Utc}; use serde_derive::{Deserialize, Serialize}; use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::by_table::tts_models::tts_model_type::TtsModelType; +use enums::by_table::tts_models::tts_model_type::TtsModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; use mysql_queries::column_types::vocoder_type::VocoderType; diff --git a/crates/lib/migration/src/voice_conversion/list_vc_models_for_migration.rs b/crates/lib/migration/src/voice_conversion/list_vc_models_for_migration.rs index 613d82355..b70c5991f 100644 --- a/crates/lib/migration/src/voice_conversion/list_vc_models_for_migration.rs +++ b/crates/lib/migration/src/voice_conversion/list_vc_models_for_migration.rs @@ -1,9 +1,9 @@ use chrono::{DateTime, Utc}; use sqlx::MySql; use sqlx::pool::PoolConnection; + use enums::by_table::model_weights::weights_types::WeightsType; use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; - use enums::common::visibility::Visibility; use errors::AnyhowResult; use mysql_queries::queries::model_weights::list::list_model_weights_for_voice_conversion::{list_model_weights_for_voice_conversion, ModelWeightForVoiceConversion}; diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/workflow_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/workflow_payload.rs index 1e4ccdcd3..27e991260 100644 --- a/crates/lib/mysql_queries/src/payloads/generic_inference_args/workflow_payload.rs +++ b/crates/lib/mysql_queries/src/payloads/generic_inference_args/workflow_payload.rs @@ -1,8 +1,9 @@ use std::collections::HashMap; -use tokens::tokens::media_files::MediaFileToken; -use tokens::tokens::model_weights::ModelWeightToken; + use enums::common::visibility::Visibility; use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use tokens::tokens::media_files::MediaFileToken; +use tokens::tokens::model_weights::ModelWeightToken; #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] #[serde(untagged)] 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 530f8ac24..33e497ed0 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,6 +1,7 @@ //! Audit logs are for entities that can be *edited* where we might lose the IP / edit history. use std::marker::PhantomData; + use anyhow::anyhow; use sqlx::{Executor, MySql}; diff --git a/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs b/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs index a260786a5..0d4918457 100644 --- a/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs +++ b/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs @@ -1,6 +1,5 @@ //! Audit logs are for entities that can be *edited* where we might lose the IP / edit history. -use std::marker::PhantomData; use anyhow::anyhow; use sqlx::{Executor, MySql, Transaction}; diff --git a/crates/lib/mysql_queries/src/queries/beta_keys/get_beta_key_by_value.rs b/crates/lib/mysql_queries/src/queries/beta_keys/get_beta_key_by_value.rs index edefea1b8..67c391190 100644 --- a/crates/lib/mysql_queries/src/queries/beta_keys/get_beta_key_by_value.rs +++ b/crates/lib/mysql_queries/src/queries/beta_keys/get_beta_key_by_value.rs @@ -1,12 +1,10 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::{Executor, MySql}; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use enums::by_table::comments::comment_entity_type::CommentEntityType; +use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; use errors::AnyhowResult; use tokens::tokens::beta_keys::BetaKeyToken; -use tokens::tokens::comments::CommentToken; use tokens::tokens::users::UserToken; pub struct BetaKey { diff --git a/crates/lib/mysql_queries/src/queries/comments/comment_entity_token.rs b/crates/lib/mysql_queries/src/queries/comments/comment_entity_token.rs index 885ceac73..9535131ed 100644 --- a/crates/lib/mysql_queries/src/queries/comments/comment_entity_token.rs +++ b/crates/lib/mysql_queries/src/queries/comments/comment_entity_token.rs @@ -2,8 +2,8 @@ use enums::by_table::comments::comment_entity_type::CommentEntityType; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::tts_models::TtsModelToken; -use tokens::tokens::w2l_templates::W2lTemplateToken; use tokens::tokens::users::UserToken; +use tokens::tokens::w2l_templates::W2lTemplateToken; pub enum CommentEntityToken { User(UserToken), 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 d18b411fa..d0a355c5b 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,5 +1,4 @@ use anyhow::anyhow; - use chrono::{DateTime, Utc}; use log::warn; use sqlx::{MySql, MySqlPool}; @@ -345,6 +344,7 @@ struct RawGenericInferenceJobStatus { #[cfg(test)] mod tests { use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; + use crate::queries::generic_inference::web::get_inference_job_status::{raw_record_to_public_result, RawGenericInferenceJobStatus}; #[test] diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_file_upload.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_file_upload.rs index 1fbf8a043..348152e8a 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_file_upload.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_file_upload.rs @@ -8,7 +8,6 @@ use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_subtype::MediaFileSubtype; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use errors::AnyhowResult; diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_zero_shot_tts.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_zero_shot_tts.rs index ae8db049d..5df5d5ebb 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_zero_shot_tts.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_zero_shot_tts.rs @@ -13,7 +13,8 @@ use tokens::tokens::users::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; -// thought about this it seems like this can be a bit more geneneric instead of having this we can ... + +// thought about this it seems like this can be a bit more geneneric instead of having this we can ... pub struct InsertArgs<'a> { pub pool: &'a MySqlPool, pub job: &'a AvailableInferenceJob, diff --git a/crates/lib/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs b/crates/lib/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs index 36f6e09e5..90b0c77a0 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs @@ -7,8 +7,8 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_subtype::MediaFileSubtype; diff --git a/crates/lib/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs b/crates/lib/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs index 140c42580..2e00f9276 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs @@ -1,10 +1,10 @@ use chrono::{DateTime, Utc}; use sqlx::{Acquire, FromRow, MySql, MySqlConnection, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; + use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; - use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; diff --git a/crates/lib/mysql_queries/src/queries/media_files/get/get_media_file.rs b/crates/lib/mysql_queries/src/queries/media_files/get/get_media_file.rs index 55ee0d5d2..93810212e 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/get/get_media_file.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/get/get_media_file.rs @@ -22,8 +22,8 @@ use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::prompts::PromptToken; use tokens::tokens::users::UserToken; -use crate::helpers::boolean_converters::i64_to_bool; +use crate::helpers::boolean_converters::i64_to_bool; use crate::payloads::prompt_args::prompt_inner_payload::PromptInnerPayload; #[derive(Serialize, Debug)] diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_featured_media_files.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_featured_media_files.rs index 26d618972..dba139630 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_featured_media_files.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_featured_media_files.rs @@ -1,9 +1,10 @@ use std::collections::HashSet; + use chrono::{DateTime, Utc}; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; @@ -16,6 +17,7 @@ use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; + use crate::payloads::prompt_args::prompt_inner_payload::PromptInnerPayload; pub struct FeaturedMediaFileListPage { diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs index 96cf1dae3..4ffab1bee 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs @@ -1,9 +1,10 @@ use std::collections::HashSet; + use chrono::{DateTime, Utc}; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; @@ -16,6 +17,7 @@ use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; + use crate::payloads::prompt_args::prompt_inner_payload::PromptInnerPayload; pub struct MediaFileListPage { diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs index 372e26007..729ffa8d8 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs @@ -1,10 +1,10 @@ use chrono::{DateTime, Utc}; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; + use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; - use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; @@ -15,6 +15,7 @@ use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; + use crate::payloads::prompt_args::prompt_inner_payload::PromptInnerPayload; pub struct MediaFileListPage { diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs index 1e17f100d..dbac26c99 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs @@ -3,8 +3,8 @@ use std::collections::HashSet; use chrono::{DateTime, Utc}; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; diff --git a/crates/lib/mysql_queries/src/queries/model_weights/create/create_weight.rs b/crates/lib/mysql_queries/src/queries/model_weights/create/create_weight.rs index 81d8453e7..6a891c0f0 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/create/create_weight.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/create/create_weight.rs @@ -1,12 +1,13 @@ -use container_common::anyhow_result::AnyhowResult; -use sqlx::MySqlPool; -use enums::by_table::model_weights::{ - weights_types::WeightsType, - weights_category::WeightsCategory, -}; use log::warn; +use sqlx::MySqlPool; + +use container_common::anyhow_result::AnyhowResult; +use enums::by_table::model_weights::{ + weights_category::WeightsCategory, + weights_types::WeightsType, +}; use enums::common::visibility::Visibility; -use tokens::tokens::{ users::UserToken, model_weights::ModelWeightToken }; +use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; use tokens::tokens::media_files::MediaFileToken; pub struct CreateModelWeightsArgs<'a> { diff --git a/crates/lib/mysql_queries/src/queries/model_weights/delete_weights.rs b/crates/lib/mysql_queries/src/queries/model_weights/delete_weights.rs index b798774a5..6716826e1 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/delete_weights.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/delete_weights.rs @@ -1,9 +1,8 @@ - use sqlx::MySqlPool; + use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; - pub async fn delete_weights_as_user( weight_token: &ModelWeightToken, mysql_pool: &MySqlPool diff --git a/crates/lib/mysql_queries/src/queries/model_weights/edit/update_weight.rs b/crates/lib/mysql_queries/src/queries/model_weights/edit/update_weight.rs index 3291c2169..3f2fe1d5d 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/edit/update_weight.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/edit/update_weight.rs @@ -88,15 +88,14 @@ SET #[cfg(test)] mod tests { + // Template + use sqlx::mysql::MySqlPoolOptions; + use tokio; - // Template - use sqlx::mysql::MySqlPoolOptions; - use tokio; + use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; + use errors::AnyhowResult; - use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; - use errors::AnyhowResult; - - #[ignore] + #[ignore] #[tokio::test] async fn test_update_weights() -> AnyhowResult<()> { let db_connection_string = DEFAULT_MYSQL_CONNECTION_STRING; diff --git a/crates/lib/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info.rs b/crates/lib/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info.rs index acb89c623..9f996a120 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info.rs @@ -9,6 +9,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::by_table::model_weights::weights_types::WeightsType; use enums::common::visibility::Visibility; use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; + use crate::column_types::vocoder_type::VocoderType; #[derive(Serialize, Deserialize, Clone)] diff --git a/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs b/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs index 25a269590..3f24644c4 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs @@ -7,8 +7,8 @@ use sqlx::MySqlPool; use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; use enums::by_table::model_weights::{ - weights_category::WeightsCategory, - weights_types::WeightsType, + weights_category::WeightsCategory, + weights_types::WeightsType, }; use enums::common::visibility::Visibility; use errors::AnyhowResult; @@ -463,14 +463,14 @@ struct RawWeightJoinUser { #[cfg(test)] mod tests { - use enums::by_table::model_weights::{ - weights_category::WeightsCategory, - weights_types::WeightsType, - }; + use enums::by_table::model_weights::{ + weights_category::WeightsCategory, + weights_types::WeightsType, + }; - use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder; + use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder; - #[test] + #[test] fn predicates_without_scoping() { let query_builder = ListWeightsQueryBuilder::new(); diff --git a/crates/lib/mysql_queries/src/queries/model_weights/tests.rs b/crates/lib/mysql_queries/src/queries/model_weights/tests.rs index dfa5d1a14..b50e21b0c 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/tests.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/tests.rs @@ -1,38 +1,38 @@ #[ignore] #[cfg(test)] mod tests { - use anyhow::Ok; - use rand::Rng; - use serial_test::serial; - use sqlx::mysql::MySqlPoolOptions; - use sqlx::MySqlPool; - use tokio; + use anyhow::Ok; + use rand::Rng; + use serial_test::serial; + use sqlx::mysql::MySqlPoolOptions; + use sqlx::MySqlPool; + use tokio; - use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; - use container_common::anyhow_result::AnyhowResult; - // common tests - use enums::by_table::model_weights::{ - weights_category::WeightsCategory, - weights_types::WeightsType, - }; - use enums::common::view_as::ViewAs; - use enums::common::visibility::Visibility; - use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; + use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; + use container_common::anyhow_result::AnyhowResult; + // common tests + use enums::by_table::model_weights::{ + weights_category::WeightsCategory, + weights_types::WeightsType, + }; + use enums::common::view_as::ViewAs; + use enums::common::visibility::Visibility; + use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; - use crate::queries::model_weights::create::create_weight::create_weight; - use crate::queries::model_weights::create::create_weight::CreateModelWeightsArgs; - use crate::queries::model_weights::delete_weights::{ - delete_weights_as_mod, - delete_weights_as_user, - undelete_weights_as_mod, - undelete_weights_as_user, - }; - use crate::queries::model_weights::get::get_weight::get_weight_by_token; - use crate::queries::model_weights::list::list_weights_by_user::{list_weights_by_creator_username, ListWeightsForUserArgs}; - use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder; - use crate::queries::users::user::get_user_token_by_username::get_user_token_by_username; + use crate::queries::model_weights::create::create_weight::create_weight; + use crate::queries::model_weights::create::create_weight::CreateModelWeightsArgs; + use crate::queries::model_weights::delete_weights::{ + delete_weights_as_mod, + delete_weights_as_user, + undelete_weights_as_mod, + undelete_weights_as_user, + }; + use crate::queries::model_weights::get::get_weight::get_weight_by_token; + use crate::queries::model_weights::list::list_weights_by_user::{list_weights_by_creator_username, ListWeightsForUserArgs}; + use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder; + use crate::queries::users::user::get_user_token_by_username::get_user_token_by_username; - async fn setup() -> sqlx::Pool { + async fn setup() -> sqlx::Pool { println!("Dropping database model_weights"); let db_connection_string = DEFAULT_MYSQL_CONNECTION_STRING; diff --git a/crates/lib/mysql_queries/src/queries/users/user/set_user_feature_flags.rs b/crates/lib/mysql_queries/src/queries/users/user/set_user_feature_flags.rs index 4e8c86425..6a9699d9f 100644 --- a/crates/lib/mysql_queries/src/queries/users/user/set_user_feature_flags.rs +++ b/crates/lib/mysql_queries/src/queries/users/user/set_user_feature_flags.rs @@ -1,10 +1,11 @@ use anyhow::anyhow; use sqlx::MySqlPool; + use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity; use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; - use errors::AnyhowResult; use tokens::tokens::users::UserToken; + use crate::queries::audit_logs::insert_audit_log::{insert_audit_log, InsertAuditLogArgs}; pub struct SetUserFeatureFlagArgs<'a> { diff --git a/crates/lib/mysql_queries/src/queries/users/user/set_user_feature_flags_transactional.rs b/crates/lib/mysql_queries/src/queries/users/user/set_user_feature_flags_transactional.rs index 2e6024f34..f038283e9 100644 --- a/crates/lib/mysql_queries/src/queries/users/user/set_user_feature_flags_transactional.rs +++ b/crates/lib/mysql_queries/src/queries/users/user/set_user_feature_flags_transactional.rs @@ -1,11 +1,11 @@ use anyhow::anyhow; -use sqlx::{MySql, MySqlPool, Transaction}; +use sqlx::{MySql, Transaction}; + use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity; use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; - use errors::AnyhowResult; use tokens::tokens::users::UserToken; -use crate::queries::audit_logs::insert_audit_log::{insert_audit_log, InsertAuditLogArgs}; + use crate::queries::audit_logs::insert_audit_log_transactional::{insert_audit_log_transactional, InsertAuditLogTransactionalArgs}; pub struct SetUserFeatureFlagTransactionalArgs<'a, 'b> { diff --git a/crates/lib/mysql_queries/src/queries/users/user_ratings/batch_get_user_rating.rs b/crates/lib/mysql_queries/src/queries/users/user_ratings/batch_get_user_rating.rs index 22039c42f..387830220 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_ratings/batch_get_user_rating.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_ratings/batch_get_user_rating.rs @@ -1,4 +1,5 @@ use std::collections::HashSet; + use anyhow::anyhow; use log::error; use sqlx::{MySql, QueryBuilder}; diff --git a/crates/lib/mysql_queries/src/queries/users/user_ratings/get_total_user_rating_count_for_entity.rs b/crates/lib/mysql_queries/src/queries/users/user_ratings/get_total_user_rating_count_for_entity.rs index 39a496160..509f34790 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_ratings/get_total_user_rating_count_for_entity.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_ratings/get_total_user_rating_count_for_entity.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use log::warn; -use sqlx::{MySql}; +use sqlx::MySql; use sqlx::pool::PoolConnection; use errors::AnyhowResult; 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 f2ec2df36..52ec355d3 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 @@ -10,9 +10,9 @@ use sqlx::MySqlPool; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use tokens::tokens::voice_conversion_results::VoiceConversionResultToken; use tokens::tokens::users::UserToken; use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; +use tokens::tokens::voice_conversion_results::VoiceConversionResultToken; use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_bool}; 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 24f954749..8d91daedb 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 @@ -10,8 +10,8 @@ use sqlx::MySqlPool; use enums::common::visibility::Visibility; use errors::AnyhowResult; -use tokens::tokens::voice_conversion_results::VoiceConversionResultToken; use tokens::tokens::users::UserToken; +use tokens::tokens::voice_conversion_results::VoiceConversionResultToken; use crate::helpers::boolean_converters::nullable_i8_to_bool; diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/datasets/create_dataset.rs b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/create_dataset.rs index 7f953de76..ec5b961c4 100644 --- a/crates/lib/mysql_queries/src/queries/voice_designer/datasets/create_dataset.rs +++ b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/create_dataset.rs @@ -1,11 +1,12 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums::common::visibility::Visibility; use errors::AnyhowResult; -use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; use tokens::tokens::users::UserToken; +use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; + use crate::queries::generic_synthetic_ids::transactional_increment_generic_synthetic_id::transactional_increment_generic_synthetic_id; pub struct CreateDatasetArgs<'a> { diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/datasets/get_dataset.rs b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/get_dataset.rs index 7dc11c4bf..e8be94d20 100644 --- a/crates/lib/mysql_queries/src/queries/voice_designer/datasets/get_dataset.rs +++ b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/get_dataset.rs @@ -8,7 +8,6 @@ use enums::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; - pub struct ZsDataset { pub token: ZsVoiceDatasetToken, pub title: String, diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/datasets/update_dataset.rs b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/update_dataset.rs index b8414770d..39386242f 100644 --- a/crates/lib/mysql_queries/src/queries/voice_designer/datasets/update_dataset.rs +++ b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/update_dataset.rs @@ -1,11 +1,12 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums::common::visibility::Visibility; use errors::AnyhowResult; -use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; use tokens::tokens::users::UserToken; +use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; + use crate::queries::generic_synthetic_ids::transactional_increment_generic_synthetic_id::transactional_increment_generic_synthetic_id; pub struct UpdateDatasetArgs<'a> { diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs b/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs index b6457a868..cd60b8d61 100644 --- a/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs +++ b/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs @@ -11,7 +11,6 @@ use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::zs_voices::ZsVoiceToken; - #[derive(Serialize)] pub struct ZsVoiceListPage { pub voices: Vec, @@ -302,9 +301,9 @@ struct RawInternalVoiceRecordForList { #[cfg(test)] mod tests { - use crate::queries::voice_designer::voices::list_voices_query_builder::ListVoicesQueryBuilder; + use crate::queries::voice_designer::voices::list_voices_query_builder::ListVoicesQueryBuilder; - #[test] + #[test] fn predicates_without_scoping() { let query_builder = ListVoicesQueryBuilder::new(); diff --git a/crates/lib/prompt_engineering/tests/racist_prompt_tests.rs b/crates/lib/prompt_engineering/tests/racist_prompt_tests.rs index 38288ccd6..d9344e103 100644 --- a/crates/lib/prompt_engineering/tests/racist_prompt_tests.rs +++ b/crates/lib/prompt_engineering/tests/racist_prompt_tests.rs @@ -1,5 +1,5 @@ - use speculoos::asserting; + use prompt_engineering::classify_prompt::classify_prompt; #[test] diff --git a/crates/lib/storyteller_root/src/lib.rs b/crates/lib/storyteller_root/src/lib.rs index 61a00af55..796f5df40 100644 --- a/crates/lib/storyteller_root/src/lib.rs +++ b/crates/lib/storyteller_root/src/lib.rs @@ -29,12 +29,13 @@ #![allow(dead_code)] #![allow(non_snake_case)] -mod paths; -mod substituted_path; - pub use paths::seed_tool_data_root::get_seed_tool_data_root; pub use paths::storyteller_frontend_root::get_storyteller_frontend_root; pub use paths::storyteller_ml_root::get_storyteller_ml_root; pub use paths::storyteller_root::get_storyteller_root; pub use paths::storyteller_rust_root::get_storyteller_rust_root; pub use substituted_path::get_substituted_path; + +mod paths; +mod substituted_path; + diff --git a/crates/lib/storyteller_root/src/paths/seed_tool_data_root.rs b/crates/lib/storyteller_root/src/paths/seed_tool_data_root.rs index 434182e77..8d8b79e6a 100644 --- a/crates/lib/storyteller_root/src/paths/seed_tool_data_root.rs +++ b/crates/lib/storyteller_root/src/paths/seed_tool_data_root.rs @@ -32,8 +32,8 @@ mod tests { use serial_test::serial; - use crate::paths::storyteller_root::TEST_HOME; use crate::paths::seed_tool_data_root::{get_seed_tool_data_root, TEST_SEED_TOOL_DATA_ROOT}; + use crate::paths::storyteller_root::TEST_HOME; #[test] #[serial] diff --git a/crates/lib/storyteller_root/src/paths/storyteller_frontend_root.rs b/crates/lib/storyteller_root/src/paths/storyteller_frontend_root.rs index 8c0caa3a2..80974999e 100644 --- a/crates/lib/storyteller_root/src/paths/storyteller_frontend_root.rs +++ b/crates/lib/storyteller_root/src/paths/storyteller_frontend_root.rs @@ -32,8 +32,8 @@ mod tests { use serial_test::serial; - use crate::paths::storyteller_root::TEST_HOME; use crate::paths::storyteller_frontend_root::{get_storyteller_frontend_root, TEST_STORYTELLER_FRONTEND_ROOT}; + use crate::paths::storyteller_root::TEST_HOME; #[test] #[serial] diff --git a/crates/lib/testing/src/test_file_path.rs b/crates/lib/testing/src/test_file_path.rs index 76c4c4ce9..bc1e86aa1 100644 --- a/crates/lib/testing/src/test_file_path.rs +++ b/crates/lib/testing/src/test_file_path.rs @@ -1,4 +1,5 @@ use std::path::{Path, PathBuf}; + use errors::{anyhow, AnyhowResult}; /// Refer to test files using the path from repo root and return a canonical path.