From 25df92c9ff45d116aee3566ac9f14ce907b76bc2 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Fri, 28 Jun 2024 22:48:16 -0400 Subject: [PATCH] remove config crate dep in mysql_queries --- Cargo.lock | 1 - crates/lib/mysql_queries/Cargo.toml | 1 - crates/lib/mysql_queries/src/config/mod.rs | 1 + .../src/config/shared_constants.rs | 7 +++ crates/lib/mysql_queries/src/lib.rs | 1 + .../insert_batch_generation_records.rs | 2 +- .../beta_keys/insert_batch_beta_keys.rs | 2 +- .../model_weights/edit/update_weight.rs | 13 +++-- .../list/list_weights_query_builder.rs | 19 +++--- .../src/queries/model_weights/tests.rs | 58 +++++++++---------- .../list_tts_results_query_builder.rs | 3 +- .../voices/list_voices_query_builder.rs | 7 ++- ...ist_w2l_inference_results_query_builder.rs | 3 +- 13 files changed, 65 insertions(+), 53 deletions(-) create mode 100644 crates/lib/mysql_queries/src/config/mod.rs create mode 100644 crates/lib/mysql_queries/src/config/shared_constants.rs diff --git a/Cargo.lock b/Cargo.lock index e61b032d1e..0e6c55a370 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4375,7 +4375,6 @@ dependencies = [ "buckets", "chrono", "composite_identifiers", - "config", "dotenv", "enums", "errors", diff --git a/crates/lib/mysql_queries/Cargo.toml b/crates/lib/mysql_queries/Cargo.toml index 553243000a..1d525b1b68 100644 --- a/crates/lib/mysql_queries/Cargo.toml +++ b/crates/lib/mysql_queries/Cargo.toml @@ -20,7 +20,6 @@ normal = ["my-workspace-hack"] # Internal buckets = { path = "../../_types/buckets" } composite_identifiers = { path = "../../_types/composite_identifiers" } -config = { path = "../deprecated/config" } enums = { path = "../../_types/enums" } errors = { path = "../errors" } idempotency = { path = "../idempotency" } diff --git a/crates/lib/mysql_queries/src/config/mod.rs b/crates/lib/mysql_queries/src/config/mod.rs new file mode 100644 index 0000000000..268ad6e6a3 --- /dev/null +++ b/crates/lib/mysql_queries/src/config/mod.rs @@ -0,0 +1 @@ +pub mod shared_constants; \ No newline at end of file diff --git a/crates/lib/mysql_queries/src/config/shared_constants.rs b/crates/lib/mysql_queries/src/config/shared_constants.rs new file mode 100644 index 0000000000..39a6b9d278 --- /dev/null +++ b/crates/lib/mysql_queries/src/config/shared_constants.rs @@ -0,0 +1,7 @@ +// TODO(bt,2024-06-28): Phase these out + +/// The default MySql connection string for use in development +pub const DEFAULT_MYSQL_CONNECTION_STRING: &str = "mysql://storyteller:password@localhost/storyteller"; + +/// The number of results we return by default for paginated queries. +pub const DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE: u16 = 25; diff --git a/crates/lib/mysql_queries/src/lib.rs b/crates/lib/mysql_queries/src/lib.rs index 2356dee94a..ca82d4a683 100644 --- a/crates/lib/mysql_queries/src/lib.rs +++ b/crates/lib/mysql_queries/src/lib.rs @@ -6,6 +6,7 @@ pub mod column_types; pub mod common_inputs; pub mod complex_models; pub mod composite_keys; +pub mod config; pub mod helpers; pub mod mediators; pub mod payloads; diff --git a/crates/lib/mysql_queries/src/queries/batch_generations/insert_batch_generation_records.rs b/crates/lib/mysql_queries/src/queries/batch_generations/insert_batch_generation_records.rs index 70627d0838..de2ce18405 100644 --- a/crates/lib/mysql_queries/src/queries/batch_generations/insert_batch_generation_records.rs +++ b/crates/lib/mysql_queries/src/queries/batch_generations/insert_batch_generation_records.rs @@ -69,9 +69,9 @@ mod tests { use sqlx::mysql::MySqlPoolOptions; use composite_identifiers::by_table::batch_generations::batch_generation_entity::BatchGenerationEntity; - use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use tokens::tokens::media_files::MediaFileToken; + use crate::config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use crate::queries::batch_generations::insert_batch_generation_records::{insert_batch_generation_records, InsertBatchArgs}; async fn setup() -> sqlx::Pool { diff --git a/crates/lib/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs b/crates/lib/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs index 04cf3c9466..6d3197d6aa 100644 --- a/crates/lib/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs +++ b/crates/lib/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs @@ -84,7 +84,7 @@ pub async fn insert_batch_beta_keys<'a, 'b>(args: InsertBatchArgs<'a>) -> Anyhow // use sqlx::mysql::MySqlPoolOptions; // // use composite_identifiers::by_table::batch_generations::batch_generation_entity::BatchGenerationEntity; -// use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; +// use crate::config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; // use tokens::tokens::media_files::MediaFileToken; // // use crate::queries::batch_generations::insert_batch_generation_records::{insert_batch_generation_records, InsertBatchArgs}; 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 3f2fe1d5df..2733752bda 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,14 +88,15 @@ 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 errors::AnyhowResult; - #[ignore] + use crate::config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; + + #[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/list/list_weights_query_builder.rs b/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs index 3f24644c43..4e0817de6a 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 @@ -5,16 +5,17 @@ use chrono::{DateTime, Utc}; 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; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; +use crate::config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; + #[derive(Serialize)] pub struct WeightsPage { pub weights: Vec, @@ -463,14 +464,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 9103f276f4..c07340b50a 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; - // 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 errors::AnyhowResult; - use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; + // 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 errors::AnyhowResult; + 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::config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; + 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/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 ffb4c4c92f..45660b9df6 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 @@ -6,10 +6,11 @@ use chrono::{DateTime, Utc}; use sqlx::MySqlPool; -use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; use enums::common::visibility::Visibility; use errors::AnyhowResult; +use crate::config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; + #[derive(Serialize)] pub struct TtsInferenceListPage { pub inference_records: Vec, 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 cd60b8d61d..18d65c0b33 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 @@ -5,12 +5,13 @@ use chrono::{DateTime, Utc}; use sqlx::MySqlPool; -use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; use enums::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::zs_voices::ZsVoiceToken; +use crate::config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; + #[derive(Serialize)] pub struct ZsVoiceListPage { pub voices: Vec, @@ -301,9 +302,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/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 7c4e36d573..fb5eb5ed46 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 @@ -6,10 +6,11 @@ use chrono::{DateTime, Utc}; use sqlx::MySqlPool; -use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; use enums::common::visibility::Visibility; use errors::AnyhowResult; +use crate::config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; + #[derive(Serialize)] pub struct W2lInferenceListPage { pub inference_records: Vec,