diff --git a/Cargo.lock b/Cargo.lock index 50145adb42..a3ffd879cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -804,7 +804,6 @@ dependencies = [ "clap", "config", "container_common", - "database_queries", "dotenv", "easyenv", "enums", @@ -812,6 +811,7 @@ dependencies = [ "hostname", "jobs_common", "log", + "mysql_queries", "rand 0.8.5", "reusable_types", "serde", @@ -1144,11 +1144,11 @@ dependencies = [ "base64 0.13.0", "chrono", "container_common", - "database_queries", "dotenv", "http_server_common", "log", "mockall", + "mysql_queries", "once_cell", "regex", "reusable_types", @@ -2080,32 +2080,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "database_queries" -version = "0.0.1" -dependencies = [ - "anyhow", - "base64 0.13.0", - "buckets", - "chrono", - "config", - "container_common", - "dotenv", - "enums", - "errors", - "log", - "once_cell", - "regex", - "reusable_types", - "serde", - "serde_derive", - "serde_json", - "sqlx", - "sqlx_mysql_helpers", - "tokens", - "toml", -] - [[package]] name = "datetimes" version = "0.0.1" @@ -2335,7 +2309,6 @@ dependencies = [ "cloud_storage", "config", "container_common", - "database_queries", "dotenv", "easyenv", "enums", @@ -2346,6 +2319,7 @@ dependencies = [ "jobs_common", "lfu", "log", + "mysql_queries", "newrelic-telemetry", "r2d2_redis", "reusable_types", @@ -3509,7 +3483,6 @@ dependencies = [ "config", "container_common", "data-encoding", - "database_queries", "derive_more", "diesel", "dotenv", @@ -3537,6 +3510,7 @@ dependencies = [ "magic-crypt", "md-5", "memory_caching", + "mysql_queries", "native-tls", "once_cell", "pulldown-cmark", @@ -3608,7 +3582,6 @@ dependencies = [ "cloud_storage", "config", "container_common", - "database_queries", "dotenv", "easyenv", "enums", @@ -3619,6 +3592,7 @@ dependencies = [ "lfu", "log", "memory_caching", + "mysql_queries", "newrelic-telemetry", "r2d2_redis", "serde", @@ -4233,6 +4207,32 @@ dependencies = [ "syn", ] +[[package]] +name = "mysql_queries" +version = "0.0.1" +dependencies = [ + "anyhow", + "base64 0.13.0", + "buckets", + "chrono", + "config", + "container_common", + "dotenv", + "enums", + "errors", + "log", + "once_cell", + "regex", + "reusable_types", + "serde", + "serde_derive", + "serde_json", + "sqlx", + "sqlx_mysql_helpers", + "tokens", + "toml", +] + [[package]] name = "mysqlclient-sys" version = "0.2.4" @@ -6427,7 +6427,6 @@ dependencies = [ "config", "container_common", "data-encoding", - "database_queries", "datetimes", "derive_more", "diesel", @@ -6459,6 +6458,7 @@ dependencies = [ "md-5", "media", "memory_caching", + "mysql_queries", "native-tls", "newrelic-telemetry", "once_cell", @@ -7377,7 +7377,6 @@ dependencies = [ "cloud_storage", "config", "container_common", - "database_queries", "dotenv", "easyenv", "google_drive_common", @@ -7387,6 +7386,7 @@ dependencies = [ "jobs_common", "lfu", "log", + "mysql_queries", "newrelic-telemetry", "r2d2_redis", "serde", @@ -7409,7 +7409,6 @@ dependencies = [ "cloud_storage", "config", "container_common", - "database_queries", "dotenv", "easyenv", "hashing", @@ -7419,6 +7418,7 @@ dependencies = [ "lfu", "log", "memory_caching", + "mysql_queries", "newrelic-telemetry", "r2d2_redis", "serde", @@ -7489,7 +7489,6 @@ dependencies = [ "config", "container_common", "crossbeam", - "database_queries", "derive_more", "diesel", "dotenv", @@ -7511,6 +7510,7 @@ dependencies = [ "lru_time_cache", "magic-crypt", "md-5", + "mysql_queries", "native-tls", "pulldown-cmark", "r2d2_redis", @@ -7756,7 +7756,6 @@ dependencies = [ "bcrypt", "chrono", "container_common", - "database_queries", "dotenv", "enums", "errors", @@ -7766,6 +7765,7 @@ dependencies = [ "lazy_static", "log", "md-5", + "mysql_queries", "once_cell", "r2d2_redis", "redis_caching", @@ -7840,7 +7840,6 @@ dependencies = [ "cloud_storage", "config", "container_common", - "database_queries", "dotenv", "easyenv", "google_drive_common", @@ -7850,6 +7849,7 @@ dependencies = [ "jobs_common", "lfu", "log", + "mysql_queries", "newrelic-telemetry", "r2d2_redis", "serde", @@ -7872,7 +7872,6 @@ dependencies = [ "cloud_storage", "config", "container_common", - "database_queries", "dotenv", "easyenv", "google_drive_common", @@ -7881,6 +7880,7 @@ dependencies = [ "jobs_common", "lfu", "log", + "mysql_queries", "newrelic-telemetry", "r2d2_redis", "serde", @@ -8188,7 +8188,6 @@ dependencies = [ "config", "container_common", "crossbeam", - "database_queries", "derive_more", "diesel", "dotenv", @@ -8211,6 +8210,7 @@ dependencies = [ "lru_time_cache", "magic-crypt", "md-5", + "mysql_queries", "native-tls", "pulldown-cmark", "r2d2_redis", diff --git a/Cargo.toml b/Cargo.toml index 5cf6ae4d63..5e9df00d54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,6 @@ members = [ "crates/lib/caching/redis_caching", "crates/lib/concurrency", "crates/lib/crockford", - "crates/lib/database_queries", # TODO(bt, 2023-02-13): Rename "mysql_queries", though this will not live beyond a single DB "crates/lib/datetimes", "crates/lib/deprecated/config", # TODO(bt, 2023-02-13): Deprecate or repurpose "crates/lib/deprecated/container_common", # TODO(bt, 2023-02-13): Pull apart and rehome pieces @@ -34,6 +33,7 @@ members = [ "crates/lib/idempotency", "crates/lib/jobs_common", "crates/lib/media", + "crates/lib/mysql_queries", "crates/lib/redis_common", "crates/lib/sqlite_queries", "crates/lib/sqlx_mysql_helpers", diff --git a/crates/lib/database_queries/Cargo.toml b/crates/lib/mysql_queries/Cargo.toml similarity index 95% rename from crates/lib/database_queries/Cargo.toml rename to crates/lib/mysql_queries/Cargo.toml index c2cdceedc1..0468198188 100644 --- a/crates/lib/database_queries/Cargo.toml +++ b/crates/lib/mysql_queries/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "database_queries" +name = "mysql_queries" edition = "2018" version = "0.0.1" authors = [ @@ -9,7 +9,7 @@ authors = [ publish = false [lib] -name = "database_queries" +name = "mysql_queries" path = "src/lib.rs" [dependencies] diff --git a/crates/lib/database_queries/sqlx-data.json b/crates/lib/mysql_queries/sqlx-data.json similarity index 100% rename from crates/lib/database_queries/sqlx-data.json rename to crates/lib/mysql_queries/sqlx-data.json diff --git a/crates/lib/database_queries/src/builders.rs b/crates/lib/mysql_queries/src/builders.rs similarity index 100% rename from crates/lib/database_queries/src/builders.rs rename to crates/lib/mysql_queries/src/builders.rs diff --git a/crates/lib/database_queries/src/column_types/job_status.rs b/crates/lib/mysql_queries/src/column_types/job_status.rs similarity index 100% rename from crates/lib/database_queries/src/column_types/job_status.rs rename to crates/lib/mysql_queries/src/column_types/job_status.rs diff --git a/crates/lib/database_queries/src/column_types/mod.rs b/crates/lib/mysql_queries/src/column_types/mod.rs similarity index 100% rename from crates/lib/database_queries/src/column_types/mod.rs rename to crates/lib/mysql_queries/src/column_types/mod.rs diff --git a/crates/lib/database_queries/src/column_types/tts_model_type.rs b/crates/lib/mysql_queries/src/column_types/tts_model_type.rs similarity index 100% rename from crates/lib/database_queries/src/column_types/tts_model_type.rs rename to crates/lib/mysql_queries/src/column_types/tts_model_type.rs diff --git a/crates/lib/database_queries/src/column_types/twitch_event_category.rs b/crates/lib/mysql_queries/src/column_types/twitch_event_category.rs similarity index 100% rename from crates/lib/database_queries/src/column_types/twitch_event_category.rs rename to crates/lib/mysql_queries/src/column_types/twitch_event_category.rs diff --git a/crates/lib/database_queries/src/column_types/vocoder_type.rs b/crates/lib/mysql_queries/src/column_types/vocoder_type.rs similarity index 100% rename from crates/lib/database_queries/src/column_types/vocoder_type.rs rename to crates/lib/mysql_queries/src/column_types/vocoder_type.rs diff --git a/crates/lib/database_queries/src/complex_models/event_match_predicate.rs b/crates/lib/mysql_queries/src/complex_models/event_match_predicate.rs similarity index 100% rename from crates/lib/database_queries/src/complex_models/event_match_predicate.rs rename to crates/lib/mysql_queries/src/complex_models/event_match_predicate.rs diff --git a/crates/lib/database_queries/src/complex_models/event_responses.rs b/crates/lib/mysql_queries/src/complex_models/event_responses.rs similarity index 100% rename from crates/lib/database_queries/src/complex_models/event_responses.rs rename to crates/lib/mysql_queries/src/complex_models/event_responses.rs diff --git a/crates/lib/database_queries/src/complex_models/mod.rs b/crates/lib/mysql_queries/src/complex_models/mod.rs similarity index 100% rename from crates/lib/database_queries/src/complex_models/mod.rs rename to crates/lib/mysql_queries/src/complex_models/mod.rs diff --git a/crates/lib/database_queries/src/composite_keys/by_table/mod.rs b/crates/lib/mysql_queries/src/composite_keys/by_table/mod.rs similarity index 100% rename from crates/lib/database_queries/src/composite_keys/by_table/mod.rs rename to crates/lib/mysql_queries/src/composite_keys/by_table/mod.rs diff --git a/crates/lib/database_queries/src/composite_keys/by_table/user_ratings/mod.rs b/crates/lib/mysql_queries/src/composite_keys/by_table/user_ratings/mod.rs similarity index 100% rename from crates/lib/database_queries/src/composite_keys/by_table/user_ratings/mod.rs rename to crates/lib/mysql_queries/src/composite_keys/by_table/user_ratings/mod.rs diff --git a/crates/lib/database_queries/src/composite_keys/by_table/user_ratings/user_rating_entity.rs b/crates/lib/mysql_queries/src/composite_keys/by_table/user_ratings/user_rating_entity.rs similarity index 100% rename from crates/lib/database_queries/src/composite_keys/by_table/user_ratings/user_rating_entity.rs rename to crates/lib/mysql_queries/src/composite_keys/by_table/user_ratings/user_rating_entity.rs diff --git a/crates/lib/database_queries/src/composite_keys/mod.rs b/crates/lib/mysql_queries/src/composite_keys/mod.rs similarity index 100% rename from crates/lib/database_queries/src/composite_keys/mod.rs rename to crates/lib/mysql_queries/src/composite_keys/mod.rs diff --git a/crates/lib/database_queries/src/helpers/boolean_converters.rs b/crates/lib/mysql_queries/src/helpers/boolean_converters.rs similarity index 100% rename from crates/lib/database_queries/src/helpers/boolean_converters.rs rename to crates/lib/mysql_queries/src/helpers/boolean_converters.rs diff --git a/crates/lib/database_queries/src/helpers/mod.rs b/crates/lib/mysql_queries/src/helpers/mod.rs similarity index 100% rename from crates/lib/database_queries/src/helpers/mod.rs rename to crates/lib/mysql_queries/src/helpers/mod.rs diff --git a/crates/lib/database_queries/src/helpers/numeric_converters.rs b/crates/lib/mysql_queries/src/helpers/numeric_converters.rs similarity index 100% rename from crates/lib/database_queries/src/helpers/numeric_converters.rs rename to crates/lib/mysql_queries/src/helpers/numeric_converters.rs diff --git a/crates/lib/database_queries/src/lib.rs b/crates/lib/mysql_queries/src/lib.rs similarity index 100% rename from crates/lib/database_queries/src/lib.rs rename to crates/lib/mysql_queries/src/lib.rs diff --git a/crates/lib/database_queries/src/mediators/badge_granter.rs b/crates/lib/mysql_queries/src/mediators/badge_granter.rs similarity index 100% rename from crates/lib/database_queries/src/mediators/badge_granter.rs rename to crates/lib/mysql_queries/src/mediators/badge_granter.rs diff --git a/crates/lib/database_queries/src/mediators/firehose_publisher.rs b/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs similarity index 100% rename from crates/lib/database_queries/src/mediators/firehose_publisher.rs rename to crates/lib/mysql_queries/src/mediators/firehose_publisher.rs diff --git a/crates/lib/database_queries/src/mediators/mod.rs b/crates/lib/mysql_queries/src/mediators/mod.rs similarity index 100% rename from crates/lib/database_queries/src/mediators/mod.rs rename to crates/lib/mysql_queries/src/mediators/mod.rs diff --git a/crates/lib/database_queries/src/payloads/generic_inference_args.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args.rs similarity index 100% rename from crates/lib/database_queries/src/payloads/generic_inference_args.rs rename to crates/lib/mysql_queries/src/payloads/generic_inference_args.rs diff --git a/crates/lib/database_queries/src/payloads/media_upload_details.rs b/crates/lib/mysql_queries/src/payloads/media_upload_details.rs similarity index 100% rename from crates/lib/database_queries/src/payloads/media_upload_details.rs rename to crates/lib/mysql_queries/src/payloads/media_upload_details.rs diff --git a/crates/lib/database_queries/src/payloads/mod.rs b/crates/lib/mysql_queries/src/payloads/mod.rs similarity index 100% rename from crates/lib/database_queries/src/payloads/mod.rs rename to crates/lib/mysql_queries/src/payloads/mod.rs diff --git a/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs b/crates/lib/mysql_queries/src/queries/api_tokens/create_api_token.rs similarity index 100% rename from crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs rename to crates/lib/mysql_queries/src/queries/api_tokens/create_api_token.rs diff --git a/crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs b/crates/lib/mysql_queries/src/queries/api_tokens/delete_api_token.rs similarity index 100% rename from crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs rename to crates/lib/mysql_queries/src/queries/api_tokens/delete_api_token.rs diff --git a/crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs b/crates/lib/mysql_queries/src/queries/api_tokens/edit_api_token.rs similarity index 100% rename from crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs rename to crates/lib/mysql_queries/src/queries/api_tokens/edit_api_token.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs rename to crates/lib/mysql_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs diff --git a/crates/lib/database_queries/src/queries/api_tokens/mod.rs b/crates/lib/mysql_queries/src/queries/api_tokens/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/api_tokens/mod.rs rename to crates/lib/mysql_queries/src/queries/api_tokens/mod.rs diff --git a/crates/lib/database_queries/src/queries/audit_logs/insert_audit_log.rs b/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log.rs similarity index 100% rename from crates/lib/database_queries/src/queries/audit_logs/insert_audit_log.rs rename to crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log.rs diff --git a/crates/lib/database_queries/src/queries/audit_logs/mod.rs b/crates/lib/mysql_queries/src/queries/audit_logs/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/audit_logs/mod.rs rename to crates/lib/mysql_queries/src/queries/audit_logs/mod.rs diff --git a/crates/lib/database_queries/src/queries/billing/mod.rs b/crates/lib/mysql_queries/src/queries/billing/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/billing/mod.rs rename to crates/lib/mysql_queries/src/queries/billing/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs rename to crates/lib/mysql_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs rename to crates/lib/mysql_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs diff --git a/crates/lib/database_queries/src/queries/billing/stripe/mod.rs b/crates/lib/mysql_queries/src/queries/billing/stripe/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/billing/stripe/mod.rs rename to crates/lib/mysql_queries/src/queries/billing/stripe/mod.rs diff --git a/crates/lib/database_queries/src/queries/comments/comment_entity_token.rs b/crates/lib/mysql_queries/src/queries/comments/comment_entity_token.rs similarity index 100% rename from crates/lib/database_queries/src/queries/comments/comment_entity_token.rs rename to crates/lib/mysql_queries/src/queries/comments/comment_entity_token.rs diff --git a/crates/lib/database_queries/src/queries/comments/delete_comment.rs b/crates/lib/mysql_queries/src/queries/comments/delete_comment.rs similarity index 100% rename from crates/lib/database_queries/src/queries/comments/delete_comment.rs rename to crates/lib/mysql_queries/src/queries/comments/delete_comment.rs diff --git a/crates/lib/database_queries/src/queries/comments/insert_comment.rs b/crates/lib/mysql_queries/src/queries/comments/insert_comment.rs similarity index 100% rename from crates/lib/database_queries/src/queries/comments/insert_comment.rs rename to crates/lib/mysql_queries/src/queries/comments/insert_comment.rs diff --git a/crates/lib/database_queries/src/queries/comments/list_comments_for_entity.rs b/crates/lib/mysql_queries/src/queries/comments/list_comments_for_entity.rs similarity index 100% rename from crates/lib/database_queries/src/queries/comments/list_comments_for_entity.rs rename to crates/lib/mysql_queries/src/queries/comments/list_comments_for_entity.rs diff --git a/crates/lib/database_queries/src/queries/comments/mod.rs b/crates/lib/mysql_queries/src/queries/comments/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/comments/mod.rs rename to crates/lib/mysql_queries/src/queries/comments/mod.rs diff --git a/crates/lib/database_queries/src/queries/generic_download/job/_keys.rs b/crates/lib/mysql_queries/src/queries/generic_download/job/_keys.rs similarity index 100% rename from crates/lib/database_queries/src/queries/generic_download/job/_keys.rs rename to crates/lib/mysql_queries/src/queries/generic_download/job/_keys.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs rename to crates/lib/mysql_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs rename to crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs rename to crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs rename to crates/lib/mysql_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs diff --git a/crates/lib/database_queries/src/queries/generic_download/job/mod.rs b/crates/lib/mysql_queries/src/queries/generic_download/job/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/generic_download/job/mod.rs rename to crates/lib/mysql_queries/src/queries/generic_download/job/mod.rs diff --git a/crates/lib/database_queries/src/queries/generic_download/mod.rs b/crates/lib/mysql_queries/src/queries/generic_download/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/generic_download/mod.rs rename to crates/lib/mysql_queries/src/queries/generic_download/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_download/web/get_generic_download_job_status.rs rename to crates/lib/mysql_queries/src/queries/generic_download/web/get_generic_download_job_status.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_download/web/insert_generic_download_job.rs rename to crates/lib/mysql_queries/src/queries/generic_download/web/insert_generic_download_job.rs diff --git a/crates/lib/database_queries/src/queries/generic_download/web/mod.rs b/crates/lib/mysql_queries/src/queries/generic_download/web/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/generic_download/web/mod.rs rename to crates/lib/mysql_queries/src/queries/generic_download/web/mod.rs diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/_keys.rs b/crates/lib/mysql_queries/src/queries/generic_inference/job/_keys.rs similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/job/_keys.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/job/_keys.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/mod.rs b/crates/lib/mysql_queries/src/queries/generic_inference/job/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/job/mod.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/job/mod.rs diff --git a/crates/lib/database_queries/src/queries/generic_inference/mod.rs b/crates/lib/mysql_queries/src/queries/generic_inference/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/mod.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/mod.rs diff --git a/crates/lib/database_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs b/crates/lib/mysql_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs diff --git a/crates/lib/database_queries/src/queries/generic_inference/web/mod.rs b/crates/lib/mysql_queries/src/queries/generic_inference/web/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/generic_inference/web/mod.rs rename to crates/lib/mysql_queries/src/queries/generic_inference/web/mod.rs diff --git a/crates/lib/database_queries/src/queries/health_check/health_check_query.rs b/crates/lib/mysql_queries/src/queries/health_check/health_check_query.rs similarity index 100% rename from crates/lib/database_queries/src/queries/health_check/health_check_query.rs rename to crates/lib/mysql_queries/src/queries/health_check/health_check_query.rs diff --git a/crates/lib/database_queries/src/queries/health_check/mod.rs b/crates/lib/mysql_queries/src/queries/health_check/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/health_check/mod.rs rename to crates/lib/mysql_queries/src/queries/health_check/mod.rs diff --git a/crates/lib/database_queries/src/queries/ip_bans/get_ip_ban.rs b/crates/lib/mysql_queries/src/queries/ip_bans/get_ip_ban.rs similarity index 100% rename from crates/lib/database_queries/src/queries/ip_bans/get_ip_ban.rs rename to crates/lib/mysql_queries/src/queries/ip_bans/get_ip_ban.rs diff --git a/crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs b/crates/lib/mysql_queries/src/queries/ip_bans/list_ip_bans.rs similarity index 100% rename from crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs rename to crates/lib/mysql_queries/src/queries/ip_bans/list_ip_bans.rs diff --git a/crates/lib/database_queries/src/queries/ip_bans/mod.rs b/crates/lib/mysql_queries/src/queries/ip_bans/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/ip_bans/mod.rs rename to crates/lib/mysql_queries/src/queries/ip_bans/mod.rs diff --git a/crates/lib/database_queries/src/queries/ip_bans/toggle_ip_ban.rs b/crates/lib/mysql_queries/src/queries/ip_bans/toggle_ip_ban.rs similarity index 100% rename from crates/lib/database_queries/src/queries/ip_bans/toggle_ip_ban.rs rename to crates/lib/mysql_queries/src/queries/ip_bans/toggle_ip_ban.rs diff --git a/crates/lib/database_queries/src/queries/ip_bans/upsert_ip_ban.rs b/crates/lib/mysql_queries/src/queries/ip_bans/upsert_ip_ban.rs similarity index 100% rename from crates/lib/database_queries/src/queries/ip_bans/upsert_ip_ban.rs rename to crates/lib/mysql_queries/src/queries/ip_bans/upsert_ip_ban.rs diff --git a/crates/lib/database_queries/src/queries/media_uploads/insert_media_upload.rs b/crates/lib/mysql_queries/src/queries/media_uploads/insert_media_upload.rs similarity index 100% rename from crates/lib/database_queries/src/queries/media_uploads/insert_media_upload.rs rename to crates/lib/mysql_queries/src/queries/media_uploads/insert_media_upload.rs diff --git a/crates/lib/database_queries/src/queries/media_uploads/mod.rs b/crates/lib/mysql_queries/src/queries/media_uploads/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/media_uploads/mod.rs rename to crates/lib/mysql_queries/src/queries/media_uploads/mod.rs diff --git a/crates/lib/database_queries/src/queries/mod.rs b/crates/lib/mysql_queries/src/queries/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/mod.rs rename to crates/lib/mysql_queries/src/queries/mod.rs diff --git a/crates/lib/database_queries/src/queries/model_categories/assign_tts_category.rs b/crates/lib/mysql_queries/src/queries/model_categories/assign_tts_category.rs similarity index 100% rename from crates/lib/database_queries/src/queries/model_categories/assign_tts_category.rs rename to crates/lib/mysql_queries/src/queries/model_categories/assign_tts_category.rs diff --git a/crates/lib/database_queries/src/queries/model_categories/create_category.rs b/crates/lib/mysql_queries/src/queries/model_categories/create_category.rs similarity index 100% rename from crates/lib/database_queries/src/queries/model_categories/create_category.rs rename to crates/lib/mysql_queries/src/queries/model_categories/create_category.rs diff --git a/crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs b/crates/lib/mysql_queries/src/queries/model_categories/get_category_by_token.rs similarity index 100% rename from crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs rename to crates/lib/mysql_queries/src/queries/model_categories/get_category_by_token.rs diff --git a/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs b/crates/lib/mysql_queries/src/queries/model_categories/list_categories_query_builder.rs similarity index 100% rename from crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs rename to crates/lib/mysql_queries/src/queries/model_categories/list_categories_query_builder.rs diff --git a/crates/lib/database_queries/src/queries/model_categories/mod.rs b/crates/lib/mysql_queries/src/queries/model_categories/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/model_categories/mod.rs rename to crates/lib/mysql_queries/src/queries/model_categories/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/model_categories/toggle_model_category_soft_delete.rs rename to crates/lib/mysql_queries/src/queries/model_categories/toggle_model_category_soft_delete.rs diff --git a/crates/lib/database_queries/src/queries/model_categories/update_model_category.rs b/crates/lib/mysql_queries/src/queries/model_categories/update_model_category.rs similarity index 100% rename from crates/lib/database_queries/src/queries/model_categories/update_model_category.rs rename to crates/lib/mysql_queries/src/queries/model_categories/update_model_category.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/public_event_feed/list_public_event_feed_items.rs rename to crates/lib/mysql_queries/src/queries/public_event_feed/list_public_event_feed_items.rs diff --git a/crates/lib/database_queries/src/queries/public_event_feed/mod.rs b/crates/lib/mysql_queries/src/queries/public_event_feed/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/public_event_feed/mod.rs rename to crates/lib/mysql_queries/src/queries/public_event_feed/mod.rs diff --git a/crates/lib/database_queries/src/queries/stats/get_on_prem_worker_stats.rs b/crates/lib/mysql_queries/src/queries/stats/get_on_prem_worker_stats.rs similarity index 100% rename from crates/lib/database_queries/src/queries/stats/get_on_prem_worker_stats.rs rename to crates/lib/mysql_queries/src/queries/stats/get_on_prem_worker_stats.rs diff --git a/crates/lib/database_queries/src/queries/stats/get_voice_count_stats.rs b/crates/lib/mysql_queries/src/queries/stats/get_voice_count_stats.rs similarity index 100% rename from crates/lib/database_queries/src/queries/stats/get_voice_count_stats.rs rename to crates/lib/mysql_queries/src/queries/stats/get_voice_count_stats.rs diff --git a/crates/lib/database_queries/src/queries/stats/mod.rs b/crates/lib/mysql_queries/src/queries/stats/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/stats/mod.rs rename to crates/lib/mysql_queries/src/queries/stats/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/trending_model_analytics/list_trending_tts_models.rs rename to crates/lib/mysql_queries/src/queries/trending_model_analytics/list_trending_tts_models.rs diff --git a/crates/lib/database_queries/src/queries/trending_model_analytics/mod.rs b/crates/lib/mysql_queries/src/queries/trending_model_analytics/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/trending_model_analytics/mod.rs rename to crates/lib/mysql_queries/src/queries/trending_model_analytics/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs rename to crates/lib/mysql_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs diff --git a/crates/lib/database_queries/src/queries/tts/mod.rs b/crates/lib/mysql_queries/src/queries/tts/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/mod.rs rename to crates/lib/mysql_queries/src/queries/tts/mod.rs diff --git a/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs b/crates/lib/mysql_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs rename to crates/lib/mysql_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs diff --git a/crates/lib/database_queries/src/queries/tts/stats/mod.rs b/crates/lib/mysql_queries/src/queries/tts/stats/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/stats/mod.rs rename to crates/lib/mysql_queries/src/queries/tts/stats/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_category_assignments/mod.rs b/crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_category_assignments/mod.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_category_assignments/mod.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_download_jobs/mod.rs b/crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_download_jobs/mod.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/_keys.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/_keys.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/_keys.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/_keys.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_detailed_stats.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_detailed_stats.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_tts_inference_job_status.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/get_tts_inference_job_status.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mod.rs b/crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mod.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_inference_jobs/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_model_upload_jobs/get_tts_model_upload_job_status.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/get_tts_model_upload_job_status.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_model_upload_jobs/insert_tts_model_upload_job.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/insert_tts_model_upload_job.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_model_upload_jobs/mod.rs b/crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_model_upload_jobs/mod.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_model_upload_jobs/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/count_tts_model_uses.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/count_tts_model_uses.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/count_tts_model_uses_total.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/count_tts_model_uses_total.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/edit_tts_model_details.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/edit_tts_model_details.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/edit_tts_model_moderator_details.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/edit_tts_model_moderator_details.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/list_all_tts_model_tokens.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/list_all_tts_model_tokens.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/mod.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_models/mod.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_models/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/edit_tts_result.rs b/crates/lib/mysql_queries/src/queries/tts/tts_results/edit_tts_result.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_results/edit_tts_result.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_results/edit_tts_result.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs b/crates/lib/mysql_queries/src/queries/tts/tts_results/insert_tts_result.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_results/insert_tts_result.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/mod.rs b/crates/lib/mysql_queries/src/queries/tts/tts_results/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_results/mod.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_results/mod.rs diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs b/crates/lib/mysql_queries/src/queries/tts/tts_results/query_tts_result.rs similarity index 100% rename from crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs rename to crates/lib/mysql_queries/src/queries/tts/tts_results/query_tts_result.rs diff --git a/crates/lib/database_queries/src/queries/twitch/mod.rs b/crates/lib/mysql_queries/src/queries/twitch/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/mod.rs rename to crates/lib/mysql_queries/src/queries/twitch/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/mod.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_event_rules/mod.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/find.rs similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/find.rs diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/insert.rs similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/insert.rs diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/mod.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_oauth/mod.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_oauth/mod.rs diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/mod.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/twitch/twitch_pubsub/mod.rs rename to crates/lib/mysql_queries/src/queries/twitch/twitch_pubsub/mod.rs diff --git a/crates/lib/database_queries/src/queries/users/mod.rs b/crates/lib/mysql_queries/src/queries/users/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/mod.rs rename to crates/lib/mysql_queries/src/queries/users/mod.rs diff --git a/crates/lib/database_queries/src/queries/users/user/create_account.rs b/crates/lib/mysql_queries/src/queries/users/user/create_account.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user/create_account.rs rename to crates/lib/mysql_queries/src/queries/users/user/create_account.rs diff --git a/crates/lib/database_queries/src/queries/users/user/list_users_query_builder.rs b/crates/lib/mysql_queries/src/queries/users/user/list_users_query_builder.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user/list_users_query_builder.rs rename to crates/lib/mysql_queries/src/queries/users/user/list_users_query_builder.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_email.rs rename to crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_by_email.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_username.rs rename to crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_by_username.rs diff --git a/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_result.rs b/crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_result.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_result.rs rename to crates/lib/mysql_queries/src/queries/users/user/lookup_user_for_login_result.rs diff --git a/crates/lib/database_queries/src/queries/users/user/mod.rs b/crates/lib/mysql_queries/src/queries/users/user/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user/mod.rs rename to crates/lib/mysql_queries/src/queries/users/user/mod.rs diff --git a/crates/lib/database_queries/src/queries/users/user/set_user_ban_status.rs b/crates/lib/mysql_queries/src/queries/users/user/set_user_ban_status.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user/set_user_ban_status.rs rename to crates/lib/mysql_queries/src/queries/users/user/set_user_ban_status.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs rename to crates/lib/mysql_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs diff --git a/crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs b/crates/lib/mysql_queries/src/queries/users/user_badges/list_user_badges.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs rename to crates/lib/mysql_queries/src/queries/users/user_badges/list_user_badges.rs diff --git a/crates/lib/database_queries/src/queries/users/user_badges/mod.rs b/crates/lib/mysql_queries/src/queries/users/user_badges/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_badges/mod.rs rename to crates/lib/mysql_queries/src/queries/users/user_badges/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs rename to crates/lib/mysql_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs rename to crates/lib/mysql_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs rename to crates/lib/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs diff --git a/crates/lib/database_queries/src/queries/users/user_profiles/mod.rs b/crates/lib/mysql_queries/src/queries/users/user_profiles/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_profiles/mod.rs rename to crates/lib/mysql_queries/src/queries/users/user_profiles/mod.rs diff --git a/crates/lib/database_queries/src/queries/users/user_ratings/get_user_rating.rs b/crates/lib/mysql_queries/src/queries/users/user_ratings/get_user_rating.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_ratings/get_user_rating.rs rename to crates/lib/mysql_queries/src/queries/users/user_ratings/get_user_rating.rs diff --git a/crates/lib/database_queries/src/queries/users/user_ratings/mod.rs b/crates/lib/mysql_queries/src/queries/users/user_ratings/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_ratings/mod.rs rename to crates/lib/mysql_queries/src/queries/users/user_ratings/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs rename to crates/lib/mysql_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs diff --git a/crates/lib/database_queries/src/queries/users/user_ratings/upsert_user_rating.rs b/crates/lib/mysql_queries/src/queries/users/user_ratings/upsert_user_rating.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_ratings/upsert_user_rating.rs rename to crates/lib/mysql_queries/src/queries/users/user_ratings/upsert_user_rating.rs diff --git a/crates/lib/database_queries/src/queries/users/user_roles/list_staff.rs b/crates/lib/mysql_queries/src/queries/users/user_roles/list_staff.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_roles/list_staff.rs rename to crates/lib/mysql_queries/src/queries/users/user_roles/list_staff.rs diff --git a/crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs b/crates/lib/mysql_queries/src/queries/users/user_roles/list_user_roles.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs rename to crates/lib/mysql_queries/src/queries/users/user_roles/list_user_roles.rs diff --git a/crates/lib/database_queries/src/queries/users/user_roles/mod.rs b/crates/lib/mysql_queries/src/queries/users/user_roles/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_roles/mod.rs rename to crates/lib/mysql_queries/src/queries/users/user_roles/mod.rs diff --git a/crates/lib/database_queries/src/queries/users/user_roles/set_user_role.rs b/crates/lib/mysql_queries/src/queries/users/user_roles/set_user_role.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_roles/set_user_role.rs rename to crates/lib/mysql_queries/src/queries/users/user_roles/set_user_role.rs diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/create_user_session.rs b/crates/lib/mysql_queries/src/queries/users/user_sessions/create_user_session.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_sessions/create_user_session.rs rename to crates/lib/mysql_queries/src/queries/users/user_sessions/create_user_session.rs diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/delete_user_session.rs b/crates/lib/mysql_queries/src/queries/users/user_sessions/delete_user_session.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_sessions/delete_user_session.rs rename to crates/lib/mysql_queries/src/queries/users/user_sessions/delete_user_session.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token.rs rename to crates/lib/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs rename to crates/lib/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/mod.rs b/crates/lib/mysql_queries/src/queries/users/user_sessions/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_sessions/mod.rs rename to crates/lib/mysql_queries/src/queries/users/user_sessions/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs rename to crates/lib/mysql_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs diff --git a/crates/lib/database_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs b/crates/lib/mysql_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs rename to crates/lib/mysql_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs rename to crates/lib/mysql_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs diff --git a/crates/lib/database_queries/src/queries/users/user_subscriptions/mod.rs b/crates/lib/mysql_queries/src/queries/users/user_subscriptions/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_subscriptions/mod.rs rename to crates/lib/mysql_queries/src/queries/users/user_subscriptions/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs rename to crates/lib/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs diff --git a/crates/lib/database_queries/src/queries/vocoder/get_vocoder_model.rs b/crates/lib/mysql_queries/src/queries/vocoder/get_vocoder_model.rs similarity index 100% rename from crates/lib/database_queries/src/queries/vocoder/get_vocoder_model.rs rename to crates/lib/mysql_queries/src/queries/vocoder/get_vocoder_model.rs diff --git a/crates/lib/database_queries/src/queries/vocoder/insert_vocoder_model.rs b/crates/lib/mysql_queries/src/queries/vocoder/insert_vocoder_model.rs similarity index 100% rename from crates/lib/database_queries/src/queries/vocoder/insert_vocoder_model.rs rename to crates/lib/mysql_queries/src/queries/vocoder/insert_vocoder_model.rs diff --git a/crates/lib/database_queries/src/queries/vocoder/list_vocoder_models.rs b/crates/lib/mysql_queries/src/queries/vocoder/list_vocoder_models.rs similarity index 100% rename from crates/lib/database_queries/src/queries/vocoder/list_vocoder_models.rs rename to crates/lib/mysql_queries/src/queries/vocoder/list_vocoder_models.rs diff --git a/crates/lib/database_queries/src/queries/vocoder/mod.rs b/crates/lib/mysql_queries/src/queries/vocoder/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/vocoder/mod.rs rename to crates/lib/mysql_queries/src/queries/vocoder/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs rename to crates/lib/mysql_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs rename to crates/lib/mysql_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs diff --git a/crates/lib/database_queries/src/queries/voice_clone_requests/mod.rs b/crates/lib/mysql_queries/src/queries/voice_clone_requests/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/voice_clone_requests/mod.rs rename to crates/lib/mysql_queries/src/queries/voice_clone_requests/mod.rs diff --git a/crates/lib/database_queries/src/queries/voice_conversion/inference/mod.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/inference/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/voice_conversion/inference/mod.rs rename to crates/lib/mysql_queries/src/queries/voice_conversion/inference/mod.rs diff --git a/crates/lib/database_queries/src/queries/voice_conversion/mod.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/voice_conversion/mod.rs rename to crates/lib/mysql_queries/src/queries/voice_conversion/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs rename to crates/lib/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs diff --git a/crates/lib/database_queries/src/queries/voice_conversion/models/mod.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/models/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/voice_conversion/models/mod.rs rename to crates/lib/mysql_queries/src/queries/voice_conversion/models/mod.rs diff --git a/crates/lib/database_queries/src/queries/w2l/mod.rs b/crates/lib/mysql_queries/src/queries/w2l/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/mod.rs rename to crates/lib/mysql_queries/src/queries/w2l/mod.rs diff --git a/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs b/crates/lib/mysql_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs rename to crates/lib/mysql_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs diff --git a/crates/lib/database_queries/src/queries/w2l/stats/mod.rs b/crates/lib/mysql_queries/src/queries/w2l/stats/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/stats/mod.rs rename to crates/lib/mysql_queries/src/queries/w2l/stats/mod.rs diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/mod.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_download_jobs/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/mod.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_download_jobs/mod.rs diff --git a/crates/lib/database_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 similarity index 98% rename from crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs index ca772f1585..3cd58357c4 100644 --- a/crates/lib/database_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 @@ -8,7 +8,7 @@ use errors::AnyhowResult; use crate::tokens::Tokens; use sqlx::MySqlPool; -// TODO(2022-08-04): These were moved into the 'database_queries' crate, but they need +// 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/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/get_pending_w2l_inference_job_detailed_stats.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/get_pending_w2l_inference_job_detailed_stats.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/get_w2l_inference_job_status.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/get_w2l_inference_job_status.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job_extended.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job_extended.rs diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/mod.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/mod.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/mod.rs diff --git a/crates/lib/database_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 similarity index 99% rename from crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs index de80857685..a92747feb8 100644 --- a/crates/lib/database_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 @@ -11,7 +11,7 @@ use log::{warn, info}; use sqlx::MySqlPool; use std::path::Path; -// TODO(2022-08-04): These were moved into the 'database_queries' crate, but they need +// 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/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/mod.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_results/mod.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_results/mod.rs diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_results/query_w2l_result.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_results/query_w2l_result.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/mod.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/mod.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_template_upload_jobs/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_templates/check_w2l_template_exists.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_templates/check_w2l_template_exists.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_templates/list_pending_w2l_templates.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_pending_w2l_templates.rs diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_templates/mod.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/mod.rs similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_templates/mod.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_templates/mod.rs diff --git a/crates/lib/database_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 similarity index 100% rename from crates/lib/database_queries/src/queries/w2l/w2l_templates/set_w2l_template_mod_approval.rs rename to crates/lib/mysql_queries/src/queries/w2l/w2l_templates/set_w2l_template_mod_approval.rs diff --git a/crates/lib/database_queries/src/tokens.rs b/crates/lib/mysql_queries/src/tokens.rs similarity index 100% rename from crates/lib/database_queries/src/tokens.rs rename to crates/lib/mysql_queries/src/tokens.rs diff --git a/crates/service/job/analytics_job/Cargo.toml b/crates/service/job/analytics_job/Cargo.toml index 1ef9783084..7a6bb55962 100644 --- a/crates/service/job/analytics_job/Cargo.toml +++ b/crates/service/job/analytics_job/Cargo.toml @@ -17,10 +17,10 @@ path = "src/main.rs" # Internal config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } enums = { path = "../../../_types/enums" } errors = { path = "../../../lib/errors" } jobs_common = { path = "../../../lib/jobs_common" } +mysql_queries = { path = "../../../lib/mysql_queries" } reusable_types = { path = "../../../_types/reusable_types" } tokens = { path = "../../../_types/tokens" } diff --git a/crates/service/job/analytics_job/src/jobs/calculate_model_analytics.rs b/crates/service/job/analytics_job/src/jobs/calculate_model_analytics.rs index 666c97562b..63348223e3 100644 --- a/crates/service/job/analytics_job/src/jobs/calculate_model_analytics.rs +++ b/crates/service/job/analytics_job/src/jobs/calculate_model_analytics.rs @@ -1,8 +1,8 @@ use crate::job_state::JobState; -use database_queries::queries::trending_model_analytics::upsert_trending_model_analytics::{Args, ModelToken, upsert_trending_model_analytics}; -use database_queries::queries::tts::tts_models::count_tts_model_uses::count_tts_model_uses; -use database_queries::queries::tts::tts_models::count_tts_model_uses_total::count_tts_model_uses_total; -use database_queries::queries::tts::tts_models::list_all_tts_model_tokens::{list_all_tts_model_tokens, TtsModelTokens}; +use mysql_queries::queries::trending_model_analytics::upsert_trending_model_analytics::{Args, ModelToken, upsert_trending_model_analytics}; +use mysql_queries::queries::tts::tts_models::count_tts_model_uses::count_tts_model_uses; +use mysql_queries::queries::tts::tts_models::count_tts_model_uses_total::count_tts_model_uses_total; +use mysql_queries::queries::tts::tts_models::list_all_tts_model_tokens::{list_all_tts_model_tokens, TtsModelTokens}; use errors::AnyhowResult; use log::info; use rand::seq::SliceRandom; diff --git a/crates/service/job/download_job/Cargo.toml b/crates/service/job/download_job/Cargo.toml index 529db15b44..2dc6c9d414 100644 --- a/crates/service/job/download_job/Cargo.toml +++ b/crates/service/job/download_job/Cargo.toml @@ -18,11 +18,11 @@ path = "src/main.rs" cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } enums = { path = "../../../_types/enums" } google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } hashing = { path = "../../../lib/hashing" } jobs_common = { path = "../../../lib/jobs_common" } +mysql_queries = { path = "../../../lib/mysql_queries" } reusable_types = { path = "../../../_types/reusable_types" } subprocess_common = { path = "../../../lib/subprocess_common" } tts_common = { path = "../../../lib/tts_common" } diff --git a/crates/service/job/download_job/src/job_state.rs b/crates/service/job/download_job/src/job_state.rs index b502601a9f..68ceca9bbb 100644 --- a/crates/service/job/download_job/src/job_state.rs +++ b/crates/service/job/download_job/src/job_state.rs @@ -4,8 +4,8 @@ use crate::job_types::hifigan::hifigan_model_check_command::HifiGanModelCheckCom use crate::job_types::hifigan_softvc::hifigan_softvc_model_check_command::HifiGanSoftVcModelCheckCommand; use crate::job_types::softvc::softvc_model_check_command::SoftVcModelCheckCommand; use crate::job_types::tacotron::tacotron_model_check_command::TacotronModelCheckCommand; -use database_queries::mediators::badge_granter::BadgeGranter; -use database_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::mediators::badge_granter::BadgeGranter; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; use r2d2_redis::RedisConnectionManager; use r2d2_redis::r2d2; diff --git a/crates/service/job/download_job/src/job_steps/main_loop.rs b/crates/service/job/download_job/src/job_steps/main_loop.rs index e70395224e..c8bb63a2d5 100644 --- a/crates/service/job/download_job/src/job_steps/main_loop.rs +++ b/crates/service/job/download_job/src/job_steps/main_loop.rs @@ -1,8 +1,8 @@ use container_common::anyhow_result::AnyhowResult; use crate::JobState; use crate::job_steps::process_single_job::process_single_job; -use database_queries::queries::generic_download::job::list_available_generic_download_jobs::{AvailableDownloadJob, list_available_generic_download_jobs}; -use database_queries::queries::generic_download::job::mark_generic_download_job_failure::mark_generic_download_job_failure; +use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::{AvailableDownloadJob, list_available_generic_download_jobs}; +use mysql_queries::queries::generic_download::job::mark_generic_download_job_failure::mark_generic_download_job_failure; use jobs_common::noop_logger::NoOpLogger; use log::warn; use std::time::Duration; diff --git a/crates/service/job/download_job/src/job_steps/process_single_job.rs b/crates/service/job/download_job/src/job_steps/process_single_job.rs index 6d1c3fe59a..45105bfb0c 100644 --- a/crates/service/job/download_job/src/job_steps/process_single_job.rs +++ b/crates/service/job/download_job/src/job_steps/process_single_job.rs @@ -7,9 +7,9 @@ use crate::job_types::hifigan::process_hifigan_vocoder::process_hifigan_vocoder; use crate::job_types::hifigan_softvc::process_hifigan_softvc_vocoder::process_hifigan_softvc_vocoder; use crate::job_types::softvc::process_softvc_model::process_softvc_model; use crate::job_types::tacotron::process_tacotron_model::process_tacotron_model; -use database_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; -use database_queries::queries::generic_download::job::mark_generic_download_job_done::mark_generic_download_job_done; -use database_queries::queries::generic_download::job::mark_generic_download_job_pending_and_grab_lock::mark_generic_download_job_pending_and_grab_lock; +use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; +use mysql_queries::queries::generic_download::job::mark_generic_download_job_done::mark_generic_download_job_done; +use mysql_queries::queries::generic_download::job::mark_generic_download_job_pending_and_grab_lock::mark_generic_download_job_pending_and_grab_lock; use enums::workers::generic_download_type::GenericDownloadType; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use log::{info, warn}; diff --git a/crates/service/job/download_job/src/job_types/hifigan/process_hifigan_vocoder.rs b/crates/service/job/download_job/src/job_types/hifigan/process_hifigan_vocoder.rs index 537d098788..2828b49553 100644 --- a/crates/service/job/download_job/src/job_types/hifigan/process_hifigan_vocoder.rs +++ b/crates/service/job/download_job/src/job_types/hifigan/process_hifigan_vocoder.rs @@ -5,8 +5,8 @@ use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_d use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use crate::JobState; use crate::job_steps::job_results::JobResults; -use database_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; -use database_queries::queries::vocoder::insert_vocoder_model::{Args, insert_vocoder_model}; +use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; +use mysql_queries::queries::vocoder::insert_vocoder_model::{Args, insert_vocoder_model}; use enums::common::vocoder_type::VocoderType; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; diff --git a/crates/service/job/download_job/src/job_types/hifigan_softvc/process_hifigan_softvc_vocoder.rs b/crates/service/job/download_job/src/job_types/hifigan_softvc/process_hifigan_softvc_vocoder.rs index 30ac74f488..1805d7839d 100644 --- a/crates/service/job/download_job/src/job_types/hifigan_softvc/process_hifigan_softvc_vocoder.rs +++ b/crates/service/job/download_job/src/job_types/hifigan_softvc/process_hifigan_softvc_vocoder.rs @@ -5,8 +5,8 @@ use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_d use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use crate::JobState; use crate::job_steps::job_results::JobResults; -use database_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; -use database_queries::queries::vocoder::insert_vocoder_model::{Args, insert_vocoder_model}; +use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; +use mysql_queries::queries::vocoder::insert_vocoder_model::{Args, insert_vocoder_model}; use enums::common::vocoder_type::VocoderType; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; diff --git a/crates/service/job/download_job/src/job_types/softvc/process_softvc_model.rs b/crates/service/job/download_job/src/job_types/softvc/process_softvc_model.rs index b8f744641b..59b4545aa2 100644 --- a/crates/service/job/download_job/src/job_types/softvc/process_softvc_model.rs +++ b/crates/service/job/download_job/src/job_types/softvc/process_softvc_model.rs @@ -5,8 +5,8 @@ use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_d use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use crate::JobState; use crate::job_steps::job_results::JobResults; -use database_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; -use database_queries::queries::voice_conversion::models::insert_voice_conversion_model_from_download_job::{Args, insert_voice_conversion_model_from_download_job}; +use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; +use mysql_queries::queries::voice_conversion::models::insert_voice_conversion_model_from_download_job::{Args, insert_voice_conversion_model_from_download_job}; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; diff --git a/crates/service/job/download_job/src/job_types/tacotron/process_tacotron_model.rs b/crates/service/job/download_job/src/job_types/tacotron/process_tacotron_model.rs index 8041ea003e..5cf5bd4165 100644 --- a/crates/service/job/download_job/src/job_types/tacotron/process_tacotron_model.rs +++ b/crates/service/job/download_job/src/job_types/tacotron/process_tacotron_model.rs @@ -5,9 +5,9 @@ use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_d use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use crate::JobState; use crate::job_steps::job_results::JobResults; -use database_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; -use database_queries::queries::tts::tts_models::insert_tts_model_from_download_job::insert_tts_model_from_download_job; -use database_queries::queries::tts::tts_models::insert_tts_model_from_download_job; +use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; +use mysql_queries::queries::tts::tts_models::insert_tts_model_from_download_job::insert_tts_model_from_download_job; +use mysql_queries::queries::tts::tts_models::insert_tts_model_from_download_job; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; diff --git a/crates/service/job/download_job/src/main.rs b/crates/service/job/download_job/src/main.rs index a427f52623..55a83f2cd5 100644 --- a/crates/service/job/download_job/src/main.rs +++ b/crates/service/job/download_job/src/main.rs @@ -34,8 +34,8 @@ use crate::job_types::hifigan::hifigan_model_check_command::HifiGanModelCheckCom use crate::job_types::hifigan_softvc::hifigan_softvc_model_check_command::HifiGanSoftVcModelCheckCommand; use crate::job_types::softvc::softvc_model_check_command::SoftVcModelCheckCommand; use crate::job_types::tacotron::tacotron_model_check_command::TacotronModelCheckCommand; -use database_queries::mediators::badge_granter::BadgeGranter; -use database_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::mediators::badge_granter::BadgeGranter; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; use log::info; use r2d2_redis::RedisConnectionManager; diff --git a/crates/service/job/inference_job/Cargo.toml b/crates/service/job/inference_job/Cargo.toml index 7dbd8cac27..e246ca97cf 100644 --- a/crates/service/job/inference_job/Cargo.toml +++ b/crates/service/job/inference_job/Cargo.toml @@ -18,11 +18,11 @@ path = "src/main.rs" cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } enums = { path = "../../../_types/enums" } errors = { path = "../../../lib/errors" } jobs_common = { path = "../../../lib/jobs_common" } memory_caching = { path = "../../../lib/caching/memory_caching" } +mysql_queries = { path = "../../../lib/mysql_queries" } tokens = { path = "../../../_types/tokens" } tts_common = { path = "../../../lib/tts_common" } diff --git a/crates/service/job/inference_job/src/http_clients/tts_inference_sidecar_client.rs b/crates/service/job/inference_job/src/http_clients/tts_inference_sidecar_client.rs index 0a3a017bc7..b25b6c98f5 100644 --- a/crates/service/job/inference_job/src/http_clients/tts_inference_sidecar_client.rs +++ b/crates/service/job/inference_job/src/http_clients/tts_inference_sidecar_client.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; -use database_queries::column_types::vocoder_type::VocoderType; +use mysql_queries::column_types::vocoder_type::VocoderType; use hyper::client::Client; use hyper::{Body, Request}; use log::info; diff --git a/crates/service/job/inference_job/src/job_steps/job_dependencies.rs b/crates/service/job/inference_job/src/job_steps/job_dependencies.rs index 1c64cd21c0..63f4875beb 100644 --- a/crates/service/job/inference_job/src/job_steps/job_dependencies.rs +++ b/crates/service/job/inference_job/src/job_steps/job_dependencies.rs @@ -7,8 +7,8 @@ use crate::http_clients::tts_sidecar_health_check_client::TtsSidecarHealthCheckC use crate::job_steps::job_stats::JobStats; use crate::script_execution::tacotron_inference_command::TacotronInferenceCommand; use crate::util::scoped_temp_dir_creator::ScopedTempDirCreator; -use database_queries::mediators::firehose_publisher::FirehosePublisher; -use database_queries::queries::tts::tts_models::get_tts_model_for_inference::TtsModelForInferenceRecord; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::queries::tts::tts_models::get_tts_model_for_inference::TtsModelForInferenceRecord; use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporterBuilder; use jobs_common::semi_persistent_cache_dir::SemiPersistentCacheDir; use memory_caching::multi_item_ttl_cache::MultiItemTtlCache; diff --git a/crates/service/job/inference_job/src/job_steps/main_loop.rs b/crates/service/job/inference_job/src/job_steps/main_loop.rs index 434e6b202d..d9f174f3fe 100644 --- a/crates/service/job/inference_job/src/job_steps/main_loop.rs +++ b/crates/service/job/inference_job/src/job_steps/main_loop.rs @@ -1,6 +1,6 @@ use crate::job_steps::job_dependencies::JobDependencies; -use database_queries::queries::generic_inference::job::list_available_generic_inference_jobs::{AvailableInferenceJob, list_available_generic_inference_jobs, ListAvailableGenericInferenceJobArgs}; -use database_queries::queries::generic_inference::job::mark_generic_inference_job_failure::mark_generic_inference_job_failure; +use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::{AvailableInferenceJob, list_available_generic_inference_jobs, ListAvailableGenericInferenceJobArgs}; +use mysql_queries::queries::generic_inference::job::mark_generic_inference_job_failure::mark_generic_inference_job_failure; use errors::AnyhowResult; use jobs_common::noop_logger::NoOpLogger; use log::{error, info, warn}; diff --git a/crates/service/job/inference_job/src/job_steps/main_loop_old.rs.txt b/crates/service/job/inference_job/src/job_steps/main_loop_old.rs.txt index c13727d237..3404ff38de 100644 --- a/crates/service/job/inference_job/src/job_steps/main_loop_old.rs.txt +++ b/crates/service/job/inference_job/src/job_steps/main_loop_old.rs.txt @@ -7,10 +7,10 @@ use crate::job_steps::job_stats::JobStats; use crate::job_steps::process_single_job_old::process_single_job_old; use crate::job_steps::process_single_job_error::ProcessSingleJobError; use crate::job_steps::sidecar_health_check_trap::maybe_block_on_sidecar_health_check; -use database_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::{AvailableTtsInferenceJob, list_available_tts_inference_jobs, list_available_tts_inference_jobs_with_minimum_priority}; -use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_failure::mark_tts_inference_job_failure; -use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_permanently_dead::mark_tts_inference_job_permanently_dead; -use database_queries::queries::tts::tts_models::get_tts_model_for_inference::{get_tts_model_for_inference, TtsModelForInferenceError, TtsModelForInferenceRecord}; +use mysql_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::{AvailableTtsInferenceJob, list_available_tts_inference_jobs, list_available_tts_inference_jobs_with_minimum_priority}; +use mysql_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_failure::mark_tts_inference_job_failure; +use mysql_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_permanently_dead::mark_tts_inference_job_permanently_dead; +use mysql_queries::queries::tts::tts_models::get_tts_model_for_inference::{get_tts_model_for_inference, TtsModelForInferenceError, TtsModelForInferenceRecord}; use jobs_common::noop_logger::NoOpLogger; use jobs_common::semi_persistent_cache_dir::SemiPersistentCacheDir; use log::{error, info, warn}; diff --git a/crates/service/job/inference_job/src/job_steps/process_single_job.rs b/crates/service/job/inference_job/src/job_steps/process_single_job.rs index 210eaa022d..184ba8e663 100644 --- a/crates/service/job/inference_job/src/job_steps/process_single_job.rs +++ b/crates/service/job/inference_job/src/job_steps/process_single_job.rs @@ -1,7 +1,7 @@ use crate::job_steps::job_dependencies::JobDependencies; -use database_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; -use database_queries::queries::generic_inference::job::mark_generic_inference_job_pending_and_grab_lock::mark_generic_inference_job_pending_and_grab_lock; -use database_queries::queries::generic_inference::job::mark_generic_inference_job_successfully_done::mark_generic_inference_job_successfully_done; +use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; +use mysql_queries::queries::generic_inference::job::mark_generic_inference_job_pending_and_grab_lock::mark_generic_inference_job_pending_and_grab_lock; +use mysql_queries::queries::generic_inference::job::mark_generic_inference_job_successfully_done::mark_generic_inference_job_successfully_done; use enums::workers::generic_inference_type::GenericInferenceType; use errors::AnyhowResult; use log::{info, warn}; diff --git a/crates/service/job/inference_job/src/job_steps/process_single_job_old.rs.txt b/crates/service/job/inference_job/src/job_steps/process_single_job_old.rs.txt index 7b9bde648b..6d2b1478f9 100644 --- a/crates/service/job/inference_job/src/job_steps/process_single_job_old.rs.txt +++ b/crates/service/job/inference_job/src/job_steps/process_single_job_old.rs.txt @@ -13,12 +13,12 @@ use crate::job_steps::job_dependencies::JobDependencies; use crate::job_steps::process_single_job_error::ProcessSingleJobError; use crate::job_types::tts::seconds_to_decoder_steps::seconds_to_decoder_steps; use crate::util::download_file_from_bucket::maybe_download_file_from_bucket; -use database_queries::column_types::vocoder_type::VocoderType; -use database_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; -use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_done::mark_tts_inference_job_done; -use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_pending_and_grab_lock::mark_tts_inference_job_pending_and_grab_lock; -use database_queries::queries::tts::tts_models::get_tts_model_for_inference::TtsModelForInferenceRecord; -use database_queries::queries::tts::tts_results::insert_tts_result::insert_tts_result; +use mysql_queries::column_types::vocoder_type::VocoderType; +use mysql_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; +use mysql_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_done::mark_tts_inference_job_done; +use mysql_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_pending_and_grab_lock::mark_tts_inference_job_pending_and_grab_lock; +use mysql_queries::queries::tts::tts_models::get_tts_model_for_inference::TtsModelForInferenceRecord; +use mysql_queries::queries::tts::tts_results::insert_tts_result::insert_tts_result; use errors::AnyhowResult; use log::{warn, info, error}; use newrelic_telemetry::Span; diff --git a/crates/service/job/inference_job/src/job_steps/select_job_batch.rs b/crates/service/job/inference_job/src/job_steps/select_job_batch.rs index 5bb0fcdb1d..78666867e6 100644 --- a/crates/service/job/inference_job/src/job_steps/select_job_batch.rs +++ b/crates/service/job/inference_job/src/job_steps/select_job_batch.rs @@ -1,4 +1,4 @@ -use database_queries::queries::generic_inference::job::list_available_generic_inference_jobs::{list_available_generic_inference_jobs, ListAvailableGenericInferenceJobArgs}; +use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::{list_available_generic_inference_jobs, ListAvailableGenericInferenceJobArgs}; use enums::workers::generic_inference_type::GenericInferenceType; use sqlx::MySqlPool; use std::collections::BTreeSet; diff --git a/crates/service/job/inference_job/src/job_types/tts/handle_tts_inference.rs b/crates/service/job/inference_job/src/job_types/tts/handle_tts_inference.rs index b4371278e3..bd28da0e38 100644 --- a/crates/service/job/inference_job/src/job_types/tts/handle_tts_inference.rs +++ b/crates/service/job/inference_job/src/job_types/tts/handle_tts_inference.rs @@ -1,5 +1,5 @@ use crate::job_steps::job_dependencies::JobDependencies; -use database_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; +use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use errors::AnyhowResult; pub async fn handle_tts_inference( diff --git a/crates/service/job/inference_job/src/main.rs b/crates/service/job/inference_job/src/main.rs index dae31d27cf..96aea48563 100644 --- a/crates/service/job/inference_job/src/main.rs +++ b/crates/service/job/inference_job/src/main.rs @@ -40,7 +40,7 @@ use crate::job_steps::job_dependencies::{JobDependencies, JobCaches, JobHttpClie use crate::job_steps::job_stats::JobStats; use crate::script_execution::tacotron_inference_command::TacotronInferenceCommand; use crate::util::scoped_temp_dir_creator::ScopedTempDirCreator; -use database_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporterBuilder; use jobs_common::job_progress_reporter::noop_job_progress_reporter::NoOpJobProgressReporterBuilder; use jobs_common::job_progress_reporter::redis_job_progress_reporter::RedisJobProgressReporterBuilder; diff --git a/crates/service/job/tts_download_job/Cargo.toml b/crates/service/job/tts_download_job/Cargo.toml index eb2c7a06ba..2a2c90725a 100644 --- a/crates/service/job/tts_download_job/Cargo.toml +++ b/crates/service/job/tts_download_job/Cargo.toml @@ -18,10 +18,10 @@ path = "src/main.rs" cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } hashing = { path = "../../../lib/hashing" } jobs_common = { path = "../../../lib/jobs_common" } +mysql_queries = { path = "../../../lib/mysql_queries" } tts_common = { path = "../../../lib/tts_common" } # Vendored code diff --git a/crates/service/job/tts_download_job/src/main.rs b/crates/service/job/tts_download_job/src/main.rs index d3b4c46dc8..ca065993c7 100644 --- a/crates/service/job/tts_download_job/src/main.rs +++ b/crates/service/job/tts_download_job/src/main.rs @@ -28,15 +28,15 @@ use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_d use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use crate::script_execution::tacotron_model_check_command::TacotronModelCheckCommand; use crate::script_execution::talknet_model_check_command::TalknetModelCheckCommand; -use database_queries::column_types::tts_model_type::TtsModelType; -use database_queries::mediators::badge_granter::BadgeGranter; -use database_queries::mediators::firehose_publisher::FirehosePublisher; -use database_queries::queries::tts::tts_download_jobs::tts_download_job_queries::TtsUploadJobRecord; -use database_queries::queries::tts::tts_download_jobs::tts_download_job_queries::grab_job_lock_and_mark_pending; -use database_queries::queries::tts::tts_download_jobs::tts_download_job_queries::insert_tts_model; -use database_queries::queries::tts::tts_download_jobs::tts_download_job_queries::mark_tts_upload_job_done; -use database_queries::queries::tts::tts_download_jobs::tts_download_job_queries::mark_tts_upload_job_failure; -use database_queries::queries::tts::tts_download_jobs::tts_download_job_queries::query_tts_upload_job_records; +use mysql_queries::column_types::tts_model_type::TtsModelType; +use mysql_queries::mediators::badge_granter::BadgeGranter; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::queries::tts::tts_download_jobs::tts_download_job_queries::TtsUploadJobRecord; +use mysql_queries::queries::tts::tts_download_jobs::tts_download_job_queries::grab_job_lock_and_mark_pending; +use mysql_queries::queries::tts::tts_download_jobs::tts_download_job_queries::insert_tts_model; +use mysql_queries::queries::tts::tts_download_jobs::tts_download_job_queries::mark_tts_upload_job_done; +use mysql_queries::queries::tts::tts_download_jobs::tts_download_job_queries::mark_tts_upload_job_failure; +use mysql_queries::queries::tts::tts_download_jobs::tts_download_job_queries::query_tts_upload_job_records; use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::noop_logger::NoOpLogger; diff --git a/crates/service/job/tts_inference_job/Cargo.toml b/crates/service/job/tts_inference_job/Cargo.toml index d37971ca2c..f0596911e4 100644 --- a/crates/service/job/tts_inference_job/Cargo.toml +++ b/crates/service/job/tts_inference_job/Cargo.toml @@ -18,10 +18,10 @@ path = "src/main.rs" cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } hashing = { path = "../../../lib/hashing" } jobs_common = { path = "../../../lib/jobs_common" } memory_caching = { path = "../../../lib/caching/memory_caching" } +mysql_queries = { path = "../../../lib/mysql_queries" } tts_common = { path = "../../../lib/tts_common" } # Vendored code diff --git a/crates/service/job/tts_inference_job/src/http_clients/tts_inference_sidecar_client.rs b/crates/service/job/tts_inference_job/src/http_clients/tts_inference_sidecar_client.rs index 73ce8aa0f9..176ae648eb 100644 --- a/crates/service/job/tts_inference_job/src/http_clients/tts_inference_sidecar_client.rs +++ b/crates/service/job/tts_inference_job/src/http_clients/tts_inference_sidecar_client.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; -use database_queries::column_types::vocoder_type::VocoderType; +use mysql_queries::column_types::vocoder_type::VocoderType; use hyper::client::Client; use hyper::{Body, Request}; use log::info; diff --git a/crates/service/job/tts_inference_job/src/job_steps/job_args.rs b/crates/service/job/tts_inference_job/src/job_steps/job_args.rs index 6aac938bd2..9e9cbd5432 100644 --- a/crates/service/job/tts_inference_job/src/job_steps/job_args.rs +++ b/crates/service/job/tts_inference_job/src/job_steps/job_args.rs @@ -7,8 +7,8 @@ use crate::http_clients::tts_sidecar_health_check_client::TtsSidecarHealthCheckC use crate::job_steps::job_stats::JobStats; use crate::script_execution::tacotron_inference_command::TacotronInferenceCommand; use crate::util::scoped_temp_dir_creator::ScopedTempDirCreator; -use database_queries::mediators::firehose_publisher::FirehosePublisher; -use database_queries::queries::tts::tts_models::get_tts_model_for_inference::TtsModelForInferenceRecord; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::queries::tts::tts_models::get_tts_model_for_inference::TtsModelForInferenceRecord; use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporterBuilder; use jobs_common::semi_persistent_cache_dir::SemiPersistentCacheDir; use memory_caching::multi_item_ttl_cache::MultiItemTtlCache; diff --git a/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs b/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs index 367616311c..01bede56c9 100644 --- a/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs +++ b/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs @@ -13,12 +13,12 @@ use crate::job_steps::download_file_from_bucket::maybe_download_file_from_bucket use crate::job_steps::job_args::JobArgs; use crate::job_steps::process_single_job_error::ProcessSingleJobError; use crate::job_steps::seconds_to_decoder_steps::seconds_to_decoder_steps; -use database_queries::column_types::vocoder_type::VocoderType; -use database_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; -use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_done::mark_tts_inference_job_done; -use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_pending_and_grab_lock::mark_tts_inference_job_pending_and_grab_lock; -use database_queries::queries::tts::tts_models::get_tts_model_for_inference::{get_tts_model_for_inference, TtsModelForInferenceRecord}; -use database_queries::queries::tts::tts_results::insert_tts_result::insert_tts_result; +use mysql_queries::column_types::vocoder_type::VocoderType; +use mysql_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; +use mysql_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_done::mark_tts_inference_job_done; +use mysql_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_pending_and_grab_lock::mark_tts_inference_job_pending_and_grab_lock; +use mysql_queries::queries::tts::tts_models::get_tts_model_for_inference::{get_tts_model_for_inference, TtsModelForInferenceRecord}; +use mysql_queries::queries::tts::tts_results::insert_tts_result::insert_tts_result; use hashing::sha256::sha256_hash_string::sha256_hash_string; use log::{warn, info, error}; use newrelic_telemetry::Span; diff --git a/crates/service/job/tts_inference_job/src/main.rs b/crates/service/job/tts_inference_job/src/main.rs index e112d5d1de..46b9fdf6a1 100644 --- a/crates/service/job/tts_inference_job/src/main.rs +++ b/crates/service/job/tts_inference_job/src/main.rs @@ -44,11 +44,11 @@ use crate::job_steps::process_single_job::process_single_job; use crate::job_steps::process_single_job_error::ProcessSingleJobError; use crate::script_execution::tacotron_inference_command::TacotronInferenceCommand; use crate::util::scoped_temp_dir_creator::ScopedTempDirCreator; -use database_queries::mediators::firehose_publisher::FirehosePublisher; -use database_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::{AvailableTtsInferenceJob, list_available_tts_inference_jobs, list_available_tts_inference_jobs_with_minimum_priority}; -use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_failure::mark_tts_inference_job_failure; -use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_permanently_dead::mark_tts_inference_job_permanently_dead; -use database_queries::queries::tts::tts_models::get_tts_model_for_inference::{get_tts_model_for_inference, TtsModelForInferenceError, TtsModelForInferenceRecord}; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::{AvailableTtsInferenceJob, list_available_tts_inference_jobs, list_available_tts_inference_jobs_with_minimum_priority}; +use mysql_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_failure::mark_tts_inference_job_failure; +use mysql_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_permanently_dead::mark_tts_inference_job_permanently_dead; +use mysql_queries::queries::tts::tts_models::get_tts_model_for_inference::{get_tts_model_for_inference, TtsModelForInferenceError, TtsModelForInferenceRecord}; use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporterBuilder; use jobs_common::job_progress_reporter::noop_job_progress_reporter::NoOpJobProgressReporterBuilder; use jobs_common::job_progress_reporter::redis_job_progress_reporter::RedisJobProgressReporterBuilder; diff --git a/crates/service/job/w2l_download_job/Cargo.toml b/crates/service/job/w2l_download_job/Cargo.toml index e30843cacb..e886b7a05e 100644 --- a/crates/service/job/w2l_download_job/Cargo.toml +++ b/crates/service/job/w2l_download_job/Cargo.toml @@ -19,10 +19,10 @@ buckets = { path = "../../../_types/buckets" } cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } hashing = { path = "../../../lib/hashing" } jobs_common = { path = "../../../lib/jobs_common" } +mysql_queries = { path = "../../../lib/mysql_queries" } tts_common = { path = "../../../lib/tts_common" } # Vendored code diff --git a/crates/service/job/w2l_download_job/src/main.rs b/crates/service/job/w2l_download_job/src/main.rs index f4ae911df4..c63f1537f4 100644 --- a/crates/service/job/w2l_download_job/src/main.rs +++ b/crates/service/job/w2l_download_job/src/main.rs @@ -30,15 +30,15 @@ use crate::script_execution::ffmpeg_generate_preview_image_command::FfmpegGenera use crate::script_execution::ffmpeg_generate_preview_video_command::FfmpegGeneratePreviewVideoCommand; use crate::script_execution::imagemagick_generate_preview_image_command::ImagemagickGeneratePreviewImageCommand; use crate::script_execution::wav2lip_process_upload_command::{Wav2LipPreprocessClient, Wav2LipPreprocessError}; -use database_queries::mediators::badge_granter::BadgeGranter; -use database_queries::mediators::firehose_publisher::FirehosePublisher; -use database_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::W2lTemplateUploadJobRecord; -use database_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::grab_job_lock_and_mark_pending; -use database_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::insert_w2l_template; -use database_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::mark_w2l_template_upload_job_done; -use database_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::mark_w2l_template_upload_job_failure; -use database_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::mark_w2l_template_upload_job_permanently_dead; -use database_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::query_w2l_template_upload_job_records; +use mysql_queries::mediators::badge_granter::BadgeGranter; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::W2lTemplateUploadJobRecord; +use mysql_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::grab_job_lock_and_mark_pending; +use mysql_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::insert_w2l_template; +use mysql_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::mark_w2l_template_upload_job_done; +use mysql_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::mark_w2l_template_upload_job_failure; +use mysql_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::mark_w2l_template_upload_job_permanently_dead; +use mysql_queries::queries::w2l::w2l_download_jobs::w2l_download_job_queries::query_w2l_template_upload_job_records; use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::noop_logger::NoOpLogger; diff --git a/crates/service/job/w2l_inference_job/Cargo.toml b/crates/service/job/w2l_inference_job/Cargo.toml index dfbb09ab05..913c9474ea 100644 --- a/crates/service/job/w2l_inference_job/Cargo.toml +++ b/crates/service/job/w2l_inference_job/Cargo.toml @@ -18,9 +18,9 @@ path = "src/main.rs" cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } jobs_common = { path = "../../../lib/jobs_common" } +mysql_queries = { path = "../../../lib/mysql_queries" } tts_common = { path = "../../../lib/tts_common" } # Vendored code diff --git a/crates/service/job/w2l_inference_job/src/main.rs b/crates/service/job/w2l_inference_job/src/main.rs index 4c6e264f4e..67bfc09b66 100644 --- a/crates/service/job/w2l_inference_job/src/main.rs +++ b/crates/service/job/w2l_inference_job/src/main.rs @@ -26,14 +26,14 @@ use container_common::filesystem::check_file_exists::check_file_exists; use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use crate::script_execution::wav2lip_inference_command::Wav2LipInferenceCommand; -use database_queries::mediators::firehose_publisher::FirehosePublisher; -use database_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::W2lInferenceJobRecord; -use database_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::get_w2l_template_by_token; -use database_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::grab_job_lock_and_mark_pending; -use database_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::insert_w2l_result; -use database_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::mark_w2l_inference_job_done; -use database_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::mark_w2l_inference_job_failure; -use database_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::query_w2l_inference_job_records; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::W2lInferenceJobRecord; +use mysql_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::get_w2l_template_by_token; +use mysql_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::grab_job_lock_and_mark_pending; +use mysql_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::insert_w2l_result; +use mysql_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::mark_w2l_inference_job_done; +use mysql_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::mark_w2l_inference_job_failure; +use mysql_queries::queries::w2l::w2l_inference_jobs::w2l_inference_job_queries::query_w2l_inference_job_records; use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; use jobs_common::noop_logger::NoOpLogger; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; diff --git a/crates/service/other/twitch_pubsub_subscriber/Cargo.toml b/crates/service/other/twitch_pubsub_subscriber/Cargo.toml index a48c5b4b47..91eb5266fd 100644 --- a/crates/service/other/twitch_pubsub_subscriber/Cargo.toml +++ b/crates/service/other/twitch_pubsub_subscriber/Cargo.toml @@ -17,8 +17,8 @@ path = "src/main.rs" # Internal config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } http_server_common = { path = "../../../lib/deprecated/http_server_common" } +mysql_queries = { path = "../../../lib/mysql_queries" } redis_common = { path = "../../../lib/redis_common" } tts_common = { path = "../../../lib/tts_common" } twitch_common = { path = "../../../lib/api_clients/twitch_common" } diff --git a/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/event_handlers/bits_event_handler.rs b/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/event_handlers/bits_event_handler.rs index ee95769659..0872c3d3d0 100644 --- a/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/event_handlers/bits_event_handler.rs +++ b/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/event_handlers/bits_event_handler.rs @@ -4,11 +4,11 @@ use container_common::collections::random_from_vec::random_from_vec; use container_common::numerics::signed_to_unsigned::i64_to_unsigned_zeroing_negatives; use crate::threads::twitch_pubsub_user_subscriber::subscriber_preferences_cache::{TwitchPubsubCachedState, TwitchEventRuleLight}; use crate::threads::twitch_pubsub_user_subscriber::tts_writer::TtsWriter; -use database_queries::column_types::twitch_event_category::TwitchEventCategory; -use database_queries::complex_models::event_match_predicate::EventMatchPredicate; -use database_queries::complex_models::event_responses::EventResponse; -use database_queries::queries::twitch::twitch_pubsub::insert_bits::TwitchPubsubBitsInsertBuilder; -use database_queries::queries::twitch::twitch_pubsub::insert_channel_points::TwitchPubsubChannelPointsInsertBuilder; +use mysql_queries::column_types::twitch_event_category::TwitchEventCategory; +use mysql_queries::complex_models::event_match_predicate::EventMatchPredicate; +use mysql_queries::complex_models::event_responses::EventResponse; +use mysql_queries::queries::twitch::twitch_pubsub::insert_bits::TwitchPubsubBitsInsertBuilder; +use mysql_queries::queries::twitch::twitch_pubsub::insert_channel_points::TwitchPubsubChannelPointsInsertBuilder; use log::info; use log::error; use r2d2_redis::r2d2; diff --git a/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/event_handlers/channel_points_event_handler.rs b/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/event_handlers/channel_points_event_handler.rs index aafa50bddf..1ae4521b7e 100644 --- a/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/event_handlers/channel_points_event_handler.rs +++ b/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/event_handlers/channel_points_event_handler.rs @@ -3,10 +3,10 @@ use container_common::anyhow_result::AnyhowResult; use container_common::collections::random_from_vec::random_from_vec; use crate::threads::twitch_pubsub_user_subscriber::subscriber_preferences_cache::{TwitchPubsubCachedState, TwitchEventRuleLight}; use crate::threads::twitch_pubsub_user_subscriber::tts_writer::TtsWriter; -use database_queries::column_types::twitch_event_category::TwitchEventCategory; -use database_queries::complex_models::event_match_predicate::EventMatchPredicate; -use database_queries::complex_models::event_responses::EventResponse; -use database_queries::queries::twitch::twitch_pubsub::insert_channel_points::TwitchPubsubChannelPointsInsertBuilder; +use mysql_queries::column_types::twitch_event_category::TwitchEventCategory; +use mysql_queries::complex_models::event_match_predicate::EventMatchPredicate; +use mysql_queries::complex_models::event_responses::EventResponse; +use mysql_queries::queries::twitch::twitch_pubsub::insert_channel_points::TwitchPubsubChannelPointsInsertBuilder; use log::info; use r2d2_redis::r2d2; use sqlx::MySql; diff --git a/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/subscriber_preferences_cache.rs b/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/subscriber_preferences_cache.rs index f19f244212..06c9d6f89e 100644 --- a/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/subscriber_preferences_cache.rs +++ b/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/subscriber_preferences_cache.rs @@ -1,7 +1,7 @@ -use database_queries::queries::twitch::twitch_event_rules::list_twitch_event_rules_for_user::TwitchEventRule; -use database_queries::column_types::twitch_event_category::TwitchEventCategory; -use database_queries::complex_models::event_match_predicate::EventMatchPredicate; -use database_queries::complex_models::event_responses::EventResponse; +use mysql_queries::queries::twitch::twitch_event_rules::list_twitch_event_rules_for_user::TwitchEventRule; +use mysql_queries::column_types::twitch_event_category::TwitchEventCategory; +use mysql_queries::complex_models::event_match_predicate::EventMatchPredicate; +use mysql_queries::complex_models::event_responses::EventResponse; #[derive(Clone)] pub struct TwitchEventRuleLight { diff --git a/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/tts_writer.rs b/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/tts_writer.rs index 164b78fc24..6d5dd7ad28 100644 --- a/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/tts_writer.rs +++ b/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/tts_writer.rs @@ -1,6 +1,6 @@ use container_common::anyhow_result::AnyhowResult; -use database_queries::queries::tts::tts_inference_jobs::insert_tts_inference_job::TtsInferenceJobInsertBuilder; -use database_queries::tokens::Tokens; +use mysql_queries::queries::tts::tts_inference_jobs::insert_tts_inference_job::TtsInferenceJobInsertBuilder; +use mysql_queries::tokens::Tokens; use log::info; use r2d2_redis::RedisConnectionManager; use r2d2_redis::r2d2; diff --git a/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/twitch_pubsub_user_subscriber_thread.rs b/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/twitch_pubsub_user_subscriber_thread.rs index a53ed2d963..ad64b9b119 100644 --- a/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/twitch_pubsub_user_subscriber_thread.rs +++ b/crates/service/other/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/twitch_pubsub_user_subscriber_thread.rs @@ -5,15 +5,15 @@ use crate::twitch::constants::TWITCH_PING_CADENCE; use crate::twitch::oauth::oauth_token_refresher::OauthTokenRefresher; use crate::twitch::pubsub::build_pubsub_topics_for_user::build_pubsub_topics_for_user; use crate::twitch::websocket_client::TwitchWebsocketClient; -use database_queries::complex_models::event_match_predicate::EventMatchPredicate; -use database_queries::complex_models::event_responses::EventResponse; -use database_queries::queries::tts::tts_inference_jobs::insert_tts_inference_job::TtsInferenceJobInsertBuilder; -use database_queries::queries::twitch::twitch_event_rules::list_twitch_event_rules_for_user::list_twitch_event_rules_for_user; -use database_queries::queries::twitch::twitch_oauth::find::{TwitchOauthTokenRecord, TwitchOauthTokenFinder}; -use database_queries::queries::twitch::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; -use database_queries::queries::twitch::twitch_pubsub::insert_bits::TwitchPubsubBitsInsertBuilder; -use database_queries::queries::twitch::twitch_pubsub::insert_channel_points::TwitchPubsubChannelPointsInsertBuilder; -use database_queries::tokens::Tokens; +use mysql_queries::complex_models::event_match_predicate::EventMatchPredicate; +use mysql_queries::complex_models::event_responses::EventResponse; +use mysql_queries::queries::tts::tts_inference_jobs::insert_tts_inference_job::TtsInferenceJobInsertBuilder; +use mysql_queries::queries::twitch::twitch_event_rules::list_twitch_event_rules_for_user::list_twitch_event_rules_for_user; +use mysql_queries::queries::twitch::twitch_oauth::find::{TwitchOauthTokenRecord, TwitchOauthTokenFinder}; +use mysql_queries::queries::twitch::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; +use mysql_queries::queries::twitch::twitch_pubsub::insert_bits::TwitchPubsubBitsInsertBuilder; +use mysql_queries::queries::twitch::twitch_pubsub::insert_channel_points::TwitchPubsubChannelPointsInsertBuilder; +use mysql_queries::tokens::Tokens; use log::debug; use log::error; use log::info; diff --git a/crates/service/plugins/billing/Cargo.toml b/crates/service/plugins/billing/Cargo.toml index ee8ade0eee..560159f0da 100644 --- a/crates/service/plugins/billing/Cargo.toml +++ b/crates/service/plugins/billing/Cargo.toml @@ -16,8 +16,8 @@ path = "src/lib.rs" # Internal container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } http_server_common = { path = "../../../lib/deprecated/http_server_common" } +mysql_queries = { path = "../../../lib/mysql_queries" } reusable_types = { path = "../../../_types/reusable_types" } url_config = { path = "../../../lib/url_config" } diff --git a/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/stripe_webhook_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/stripe_webhook_handler.rs index 63300fe1eb..1ff1f6e166 100644 --- a/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/stripe_webhook_handler.rs +++ b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/stripe_webhook_handler.rs @@ -22,8 +22,8 @@ use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webho use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary; use crate::stripe::stripe_config::StripeConfig; use crate::stripe::traits::internal_subscription_product_lookup::InternalSubscriptionProductLookup; -use database_queries::queries::billing::stripe::get_stripe_webhook_event_log_by_id::get_stripe_webhook_event_log_by_id; -use database_queries::queries::billing::stripe::insert_stripe_webhook_event_log::InsertStripeWebhookEventLog; +use mysql_queries::queries::billing::stripe::get_stripe_webhook_event_log_by_id::get_stripe_webhook_event_log_by_id; +use mysql_queries::queries::billing::stripe::insert_stripe_webhook_event_log::InsertStripeWebhookEventLog; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use http_server_common::util::timer::MultiBenchmarkingTimer; diff --git a/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_created_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_created_handler.rs index a22e6829ba..7faf2bf1ad 100644 --- a/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_created_handler.rs +++ b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_created_handler.rs @@ -4,9 +4,9 @@ use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_sub use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError; use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary; use crate::stripe::traits::internal_subscription_product_lookup::InternalSubscriptionProductLookup; -use database_queries::queries::users::user::update_user_record_with_new_stripe_customer_id::update_user_record_with_new_stripe_customer_id; -use database_queries::queries::users::user_subscriptions::get_user_subscription_by_stripe_subscription_id::get_user_subscription_by_stripe_subscription_id; -use database_queries::queries::users::user_subscriptions::upsert_user_subscription_by_stripe_id::UpsertUserSubscription; +use mysql_queries::queries::users::user::update_user_record_with_new_stripe_customer_id::update_user_record_with_new_stripe_customer_id; +use mysql_queries::queries::users::user_subscriptions::get_user_subscription_by_stripe_subscription_id::get_user_subscription_by_stripe_subscription_id; +use mysql_queries::queries::users::user_subscriptions::upsert_user_subscription_by_stripe_id::UpsertUserSubscription; use log::{error, warn}; use sqlx::MySqlPool; use stripe::Subscription; diff --git a/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_deleted_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_deleted_handler.rs index 03a676d3b4..65f15e92db 100644 --- a/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_deleted_handler.rs +++ b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_deleted_handler.rs @@ -4,8 +4,8 @@ use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_sub use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError; use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary; use crate::stripe::traits::internal_subscription_product_lookup::InternalSubscriptionProductLookup; -use database_queries::queries::users::user_subscriptions::get_user_subscription_by_stripe_subscription_id::get_user_subscription_by_stripe_subscription_id; -use database_queries::queries::users::user_subscriptions::upsert_user_subscription_by_stripe_id::UpsertUserSubscription; +use mysql_queries::queries::users::user_subscriptions::get_user_subscription_by_stripe_subscription_id::get_user_subscription_by_stripe_subscription_id; +use mysql_queries::queries::users::user_subscriptions::upsert_user_subscription_by_stripe_id::UpsertUserSubscription; use log::{error, warn}; use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; use sqlx::MySqlPool; diff --git a/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_updated_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_updated_handler.rs index 3d7d2d9401..c8b241098b 100644 --- a/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_updated_handler.rs +++ b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_updated_handler.rs @@ -4,9 +4,9 @@ use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_sub use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError; use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary; use crate::stripe::traits::internal_subscription_product_lookup::InternalSubscriptionProductLookup; -use database_queries::queries::users::user::update_user_record_with_new_stripe_customer_id::update_user_record_with_new_stripe_customer_id; -use database_queries::queries::users::user_subscriptions::get_user_subscription_by_stripe_subscription_id::get_user_subscription_by_stripe_subscription_id; -use database_queries::queries::users::user_subscriptions::upsert_user_subscription_by_stripe_id::UpsertUserSubscription; +use mysql_queries::queries::users::user::update_user_record_with_new_stripe_customer_id::update_user_record_with_new_stripe_customer_id; +use mysql_queries::queries::users::user_subscriptions::get_user_subscription_by_stripe_subscription_id::get_user_subscription_by_stripe_subscription_id; +use mysql_queries::queries::users::user_subscriptions::upsert_user_subscription_by_stripe_id::UpsertUserSubscription; use log::{error, info, warn}; use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; use sqlx::MySqlPool; diff --git a/crates/service/plugins/users/Cargo.toml b/crates/service/plugins/users/Cargo.toml index da5f733c84..87c068622a 100644 --- a/crates/service/plugins/users/Cargo.toml +++ b/crates/service/plugins/users/Cargo.toml @@ -16,10 +16,10 @@ path = "src/lib.rs" # Internal container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } enums = { path = "../../../_types/enums" } errors = { path = "../../../lib/errors" } http_server_common = { path = "../../../lib/deprecated/http_server_common" } +mysql_queries = { path = "../../../lib/mysql_queries" } redis_caching = { path = "../../../lib/caching/redis_caching" } redis_common = { path = "../../../lib/redis_common" } reusable_types = { path = "../../../_types/reusable_types" } diff --git a/crates/service/plugins/users/src/endpoints/create_account_handler.rs b/crates/service/plugins/users/src/endpoints/create_account_handler.rs index bc44a00858..20943ec0fa 100644 --- a/crates/service/plugins/users/src/endpoints/create_account_handler.rs +++ b/crates/service/plugins/users/src/endpoints/create_account_handler.rs @@ -11,10 +11,10 @@ use crate::utils::session_cookie_manager::SessionCookieManager; use crate::validations::is_reserved_username::is_reserved_username; use crate::validations::validate_passwords::validate_passwords; use crate::validations::validate_username::validate_username; -use database_queries::mediators::firehose_publisher::FirehosePublisher; -use database_queries::queries::users::user::create_account::{create_account, CreateAccountArgs, CreateAccountError}; -use database_queries::queries::users::user_sessions::create_user_session::create_user_session; -use database_queries::tokens::Tokens; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::queries::users::user::create_account::{create_account, CreateAccountArgs, CreateAccountError}; +use mysql_queries::queries::users::user_sessions::create_user_session::create_user_session; +use mysql_queries::tokens::Tokens; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn}; diff --git a/crates/service/plugins/users/src/endpoints/edit_profile_handler.rs b/crates/service/plugins/users/src/endpoints/edit_profile_handler.rs index 7fb2994e35..72d8fd2049 100644 --- a/crates/service/plugins/users/src/endpoints/edit_profile_handler.rs +++ b/crates/service/plugins/users/src/endpoints/edit_profile_handler.rs @@ -14,10 +14,10 @@ use crate::validations::validate_profile_github_username::validate_profile_githu use crate::validations::validate_profile_twitch_username::validate_profile_twitch_username; use crate::validations::validate_profile_twitter_username::{normalize_twitter_username_for_storage, validate_profile_twitter_username}; use crate::validations::validate_profile_website_url::validate_profile_website_url; -use database_queries::queries::users::user_profiles::edit_user_profile_as_account_holder::edit_user_profile_as_account_holder; -use database_queries::queries::users::user_profiles::edit_user_profile_as_mod::edit_user_profile_as_mod; -use database_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; -use database_queries::queries::users::user_profiles::{edit_user_profile_as_account_holder, edit_user_profile_as_mod}; +use mysql_queries::queries::users::user_profiles::edit_user_profile_as_account_holder::edit_user_profile_as_account_holder; +use mysql_queries::queries::users::user_profiles::edit_user_profile_as_mod::edit_user_profile_as_mod; +use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; +use mysql_queries::queries::users::user_profiles::{edit_user_profile_as_account_holder, edit_user_profile_as_mod}; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/plugins/users/src/endpoints/get_profile_handler.rs b/crates/service/plugins/users/src/endpoints/get_profile_handler.rs index 51a7587002..fecdb0d0d9 100644 --- a/crates/service/plugins/users/src/endpoints/get_profile_handler.rs +++ b/crates/service/plugins/users/src/endpoints/get_profile_handler.rs @@ -9,9 +9,9 @@ use actix_web::web::Path; use actix_web::{web, HttpResponse, HttpRequest}; use chrono::{DateTime, Utc}; use crate::utils::session_checker::SessionChecker; -use database_queries::queries::users::user_badges::list_user_badges::UserBadgeForList; -use database_queries::queries::users::user_badges::list_user_badges::list_user_badges; -use database_queries::queries::users::user_profiles::get_user_profile_by_username::{get_user_profile_by_username_from_connection, UserProfileResult}; +use mysql_queries::queries::users::user_badges::list_user_badges::UserBadgeForList; +use mysql_queries::queries::users::user_badges::list_user_badges::list_user_badges; +use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::{get_user_profile_by_username_from_connection, UserProfileResult}; use enums::common::visibility::Visibility; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/plugins/users/src/endpoints/login_handler.rs b/crates/service/plugins/users/src/endpoints/login_handler.rs index 1722f57a49..1a8b1ef512 100644 --- a/crates/service/plugins/users/src/endpoints/login_handler.rs +++ b/crates/service/plugins/users/src/endpoints/login_handler.rs @@ -7,10 +7,10 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{web, HttpResponse, HttpRequest}; use crate::utils::session_cookie_manager::SessionCookieManager; -use database_queries::helpers::boolean_converters::i8_to_bool; -use database_queries::queries::users::user_sessions::create_user_session::create_user_session; -use database_queries::queries::users::user::lookup_user_for_login_by_email::lookup_user_for_login_by_email; -use database_queries::queries::users::user::lookup_user_for_login_by_username::lookup_user_for_login_by_username; +use mysql_queries::helpers::boolean_converters::i8_to_bool; +use mysql_queries::queries::users::user_sessions::create_user_session::create_user_session; +use mysql_queries::queries::users::user::lookup_user_for_login_by_email::lookup_user_for_login_by_email; +use mysql_queries::queries::users::user::lookup_user_for_login_by_username::lookup_user_for_login_by_username; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn}; diff --git a/crates/service/plugins/users/src/endpoints/logout_handler.rs b/crates/service/plugins/users/src/endpoints/logout_handler.rs index ac747bdd85..ae2e77b853 100644 --- a/crates/service/plugins/users/src/endpoints/logout_handler.rs +++ b/crates/service/plugins/users/src/endpoints/logout_handler.rs @@ -7,7 +7,7 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{web, HttpResponse, HttpRequest}; use crate::utils::session_cookie_manager::SessionCookieManager; -use database_queries::queries::users::user_sessions::delete_user_session::delete_user_session; +use mysql_queries::queries::users::user_sessions::delete_user_session::delete_user_session; use http_server_common::response::response_error_helpers::to_simple_json_error; use log::warn; use sqlx::MySqlPool; diff --git a/crates/service/plugins/users/src/utils/session_checker.rs b/crates/service/plugins/users/src/utils/session_checker.rs index e177f38b70..6ab986fb89 100644 --- a/crates/service/plugins/users/src/utils/session_checker.rs +++ b/crates/service/plugins/users/src/utils/session_checker.rs @@ -6,9 +6,9 @@ use actix_web::HttpRequest; use crate::utils::session_cookie_manager::SessionCookieManager; use crate::utils::user_session_extended::{UserSessionExtended, UserSessionPreferences, UserSessionPremiumPlanInfo, UserSessionRoleAndPermissions, UserSessionSubscriptionPlan, UserSessionUserDetails}; -use database_queries::queries::users::user_sessions::get_user_session_by_token::{get_user_session_by_token, get_user_session_by_token_pooled_connection, SessionUserRecord}; -use database_queries::queries::users::user_sessions::get_user_session_by_token_light::{get_user_session_by_token_light, SessionRecord}; -use database_queries::queries::users::user_subscriptions::list_active_user_subscriptions::list_active_user_subscriptions; +use mysql_queries::queries::users::user_sessions::get_user_session_by_token::{get_user_session_by_token, get_user_session_by_token_pooled_connection, SessionUserRecord}; +use mysql_queries::queries::users::user_sessions::get_user_session_by_token_light::{get_user_session_by_token_light, SessionRecord}; +use mysql_queries::queries::users::user_subscriptions::list_active_user_subscriptions::list_active_user_subscriptions; use errors::AnyhowResult; use log::warn; use redis_caching::redis_ttl_cache::{RedisTtlCache, RedisTtlCacheConnection}; diff --git a/crates/service/web/image_generation_service/Cargo.toml b/crates/service/web/image_generation_service/Cargo.toml index 719df68b97..79b0ded562 100644 --- a/crates/service/web/image_generation_service/Cargo.toml +++ b/crates/service/web/image_generation_service/Cargo.toml @@ -19,12 +19,12 @@ path = "src/main.rs" cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } errors = { path = "../../../lib/errors" } google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } http_server_common = { path = "../../../lib/deprecated/http_server_common" } jobs_common = { path = "../../../lib/jobs_common" } memory_caching = { path = "../../../lib/caching/memory_caching" } +mysql_queries = { path = "../../../lib/mysql_queries" } redis_common = { path = "../../../lib/redis_common" } reusable_types = { path = "../../../_types/reusable_types" } tts_common = { path = "../../../lib/tts_common" } diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index 91156fd179..83182737b7 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -21,7 +21,6 @@ buckets = { path = "../../../_types/buckets" } cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } datetimes = { path = "../../../lib/datetimes" } enums = { path = "../../../_types/enums" } errors = { path = "../../../lib/errors" } @@ -31,6 +30,7 @@ http_server_common = { path = "../../../lib/deprecated/http_server_common" } jobs_common = { path = "../../../lib/jobs_common" } media = { path = "../../../lib/media" } memory_caching = { path = "../../../lib/caching/memory_caching" } +mysql_queries = { path = "../../../lib/mysql_queries" } redis_caching = { path = "../../../lib/caching/redis_caching" } redis_common = { path = "../../../lib/redis_common" } reusable_types = { path = "../../../_types/reusable_types" } diff --git a/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs b/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs index 10410342d5..da63665f31 100644 --- a/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs +++ b/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs @@ -3,7 +3,7 @@ use async_trait::async_trait; use chrono::Utc; use billing_component::stripe::traits::internal_user_lookup::{InternalUserLookup, InternalUserLookupError, SubscriptionKey, UserMetadata}; use crate::MySqlPool; -use database_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; +use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; use log::warn; use users_component::utils::session_checker::SessionChecker; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs index 533b827429..4a330743e1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs @@ -9,8 +9,8 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::api_tokens::create_api_token::create_api_token_for_user; -use database_queries::tokens::Tokens; +use mysql_queries::queries::api_tokens::create_api_token::create_api_token_for_user; +use mysql_queries::tokens::Tokens; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs index 3bb6cab0c6..519acfe406 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs @@ -9,8 +9,8 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::api_tokens::delete_api_token::delete_api_token; -use database_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; +use mysql_queries::queries::api_tokens::delete_api_token::delete_api_token; +use mysql_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs index a3919d2c1c..ce39738d7e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs @@ -9,8 +9,8 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::api_tokens::edit_api_token::edit_api_token; -use database_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; +use mysql_queries::queries::api_tokens::edit_api_token::edit_api_token; +use mysql_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs index 08b85a9f7b..8ca31e2474 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; +use mysql_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use lexical_sort::natural_lexical_cmp; use log::{info, warn, log}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/create_category.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/create_category.rs index f4b5998386..012f20d6dc 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/create_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/create_category.rs @@ -9,8 +9,8 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::model_categories::create_category::{create_category, CreateCategoryArgs}; -use database_queries::tokens::Tokens; +use mysql_queries::queries::model_categories::create_category::{create_category, CreateCategoryArgs}; +use mysql_queries::tokens::Tokens; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/get_category.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/get_category.rs index c815a91c00..bc5866b5b9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/get_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/get_category.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::model_categories::get_category_by_token::get_category_by_token; +use mysql_queries::queries::model_categories::get_category_by_token::get_category_by_token; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/assign_tts_category.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/assign_tts_category.rs index 9b9a57d1b5..b81b221bad 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/assign_tts_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/assign_tts_category.rs @@ -10,8 +10,8 @@ use anyhow::anyhow; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::model_categories::get_category_by_token::get_category_by_token; -use database_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token; +use mysql_queries::queries::model_categories::get_category_by_token::get_category_by_token; +use mysql_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log, error}; @@ -22,7 +22,7 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::fmt; use std::sync::Arc; -use database_queries::queries::model_categories::assign_tts_category::{assign_tts_category, AssignOrDeleteAction, AssignTtsCategoryArgs}; +use mysql_queries::queries::model_categories::assign_tts_category::{assign_tts_category, AssignOrDeleteAction, AssignTtsCategoryArgs}; // =============== Request =============== diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/add_synthetic_categories.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/add_synthetic_categories.rs index bcfa0c8a78..2209c87a71 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/add_synthetic_categories.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/add_synthetic_categories.rs @@ -5,7 +5,7 @@ use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::{CategoryTokenToModelTokensMap, TtsModelInfoLite}; use crate::model::categories::synthetic_category_list::{SYNTHETIC_CATEGORY_LATEST_TTS_MODELS, SYNTHETIC_CATEGORY_TRENDING_TTS_MODELS}; -use database_queries::queries::trending_model_analytics::list_trending_tts_models::TrendingModels; +use mysql_queries::queries::trending_model_analytics::list_trending_tts_models::TrendingModels; use enums::by_table::trending_model_analytics::window_name::WindowName; use std::collections::BTreeSet; use tokens::tokens::model_categories::ModelCategoryToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/query_and_construct_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/query_and_construct_payload.rs index 2b8aa93c9e..4a71efde90 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/query_and_construct_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/query_and_construct_payload.rs @@ -9,10 +9,10 @@ use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::list_fully_computed_assigned_tts_categories::ModelTokensByCategoryToken; use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::recursively_build_category_map::recursive_category_to_model_map; use crate::model::cached_queries::list_cached_tts_categories_for_public_dropdown::list_cached_tts_categories_for_public_dropdown; -use database_queries::queries::model_categories::list_categories_query_builder::CategoryList; -use database_queries::queries::trending_model_analytics::list_trending_tts_models::list_trending_tts_models; -use database_queries::queries::tts::tts_category_assignments::fetch_and_build_tts_model_category_map::fetch_and_build_tts_model_category_map_with_connection; -use database_queries::queries::tts::tts_models::list_tts_models::list_tts_models_with_connection; +use mysql_queries::queries::model_categories::list_categories_query_builder::CategoryList; +use mysql_queries::queries::trending_model_analytics::list_trending_tts_models::list_trending_tts_models; +use mysql_queries::queries::tts::tts_category_assignments::fetch_and_build_tts_model_category_map::fetch_and_build_tts_model_category_map_with_connection; +use mysql_queries::queries::tts::tts_models::list_tts_models::list_tts_models_with_connection; use errors::AnyhowResult; use lexical_sort::natural_lexical_cmp; use log::error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_tts_model_assigned_categories.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_tts_model_assigned_categories.rs index 249c6ead70..1e6bed50ba 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_tts_model_assigned_categories.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_tts_model_assigned_categories.rs @@ -9,7 +9,7 @@ use actix_web::web::Path; use actix_web::{web, HttpResponse, HttpRequest}; use chrono::{DateTime, Utc}; use crate::server_state::ServerState; -use database_queries::queries::tts::tts_category_assignments::list_assigned_tts_categories_query_builder::ListAssignedTtsCategoriesQueryBuilder; +use mysql_queries::queries::tts::tts_category_assignments::list_assigned_tts_categories_query_builder::ListAssignedTtsCategoriesQueryBuilder; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::warn; use std::fmt; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs index 959b04ad4d..74dc33c2e6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs @@ -10,8 +10,8 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; use crate::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use database_queries::queries::generic_download::web::insert_generic_download_job::{Args, insert_generic_download_job}; -use database_queries::tokens::Tokens; +use mysql_queries::queries::generic_download::web::insert_generic_download_job::{Args, insert_generic_download_job}; +use mysql_queries::tokens::Tokens; use enums::common::visibility::Visibility; use enums::workers::generic_download_type::GenericDownloadType; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs index cddda3a3c3..0ba7af44a1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs @@ -11,7 +11,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::generic_download::web::get_generic_download_job_status::{GenericDownloadJobStatus, get_generic_download_job_status}; +use mysql_queries::queries::generic_download::web::get_generic_download_job_status::{GenericDownloadJobStatus, get_generic_download_job_status}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use r2d2_redis::redis::Commands; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/events/list_events.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/events/list_events.rs index e1ac61f185..ae943997f8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/events/list_events.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/events/list_events.rs @@ -9,7 +9,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::public_event_feed::list_public_event_feed_items::list_public_event_feed_items; +use mysql_queries::queries::public_event_feed::list_public_event_feed_items::list_public_event_feed_items; use derive_more::{Display, Error}; use log::{info, warn, log, error}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs index b116225e5d..1eb8ef4985 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs @@ -9,10 +9,10 @@ use actix_web::{web, HttpResponse, HttpRequest}; use errors::AnyhowResult; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; -use database_queries::queries::tts::stats::calculate_tts_model_leaderboard::TtsLeaderboardRecordForList; -use database_queries::queries::tts::stats::calculate_tts_model_leaderboard::calculate_tts_model_leaderboard; -use database_queries::queries::w2l::stats::calculate_w2l_template_leaderboard::W2lLeaderboardRecordForList; -use database_queries::queries::w2l::stats::calculate_w2l_template_leaderboard::calculate_w2l_template_leaderboard; +use mysql_queries::queries::tts::stats::calculate_tts_model_leaderboard::TtsLeaderboardRecordForList; +use mysql_queries::queries::tts::stats::calculate_tts_model_leaderboard::calculate_tts_model_leaderboard; +use mysql_queries::queries::w2l::stats::calculate_w2l_template_leaderboard::W2lLeaderboardRecordForList; +use mysql_queries::queries::w2l::stats::calculate_w2l_template_leaderboard::calculate_w2l_template_leaderboard; use log::{debug, error, warn}; use sqlx::MySqlPool; use std::fmt; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/upload_media.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/upload_media.rs index db16548a29..2b2766c25b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/upload_media.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/upload_media.rs @@ -14,8 +14,8 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; use crate::validations::validate_idempotency_token_format::validate_idempotency_token_format; -use database_queries::payloads::media_upload_details::MediaUploadDetails; -use database_queries::queries::media_uploads::insert_media_upload::{Args, insert_media_upload}; +use mysql_queries::payloads::media_upload_details::MediaUploadDetails; +use mysql_queries::queries::media_uploads::insert_media_upload::{Args, insert_media_upload}; use enums::by_table::media_uploads::media_upload_type::MediaUploadType; use enums::common::visibility::Visibility; use files::hash::hash_bytes_sha2; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs index 543d98ea2d..ac64726e68 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs @@ -9,7 +9,7 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use chrono::{DateTime, Utc}; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; -use database_queries::queries::w2l::w2l_templates::list_pending_w2l_templates::list_pending_w2l_templates; +use mysql_queries::queries::w2l::w2l_templates::list_pending_w2l_templates::list_pending_w2l_templates; use log::{info, warn, log}; use sqlx::error::DatabaseError; use sqlx::error::Error::Database; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/delete_category.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/delete_category.rs index dab7b7cf10..1a5855a714 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/delete_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/delete_category.rs @@ -9,7 +9,7 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::model_categories::toggle_model_category_soft_delete::{toggle_model_category_soft_delete, ToggleSoftDeleteState}; +use mysql_queries::queries::model_categories::toggle_model_category_soft_delete::{toggle_model_category_soft_delete, ToggleSoftDeleteState}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs index 6479785e3e..97f4253a06 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs @@ -9,7 +9,7 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::model_categories::get_category_by_token::get_category_by_token; +use mysql_queries::queries::model_categories::get_category_by_token::get_category_by_token; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use regex::Regex; @@ -19,7 +19,7 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::fmt; use std::sync::Arc; -use database_queries::queries::model_categories::update_model_category::{update_model_category, UpdateModelCategoryArgs}; +use mysql_queries::queries::model_categories::update_model_category::{update_model_category, UpdateModelCategoryArgs}; // =============== Request =============== diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs index 9d5f52dfb7..ac52242b91 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder; +use mysql_queries::queries::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs index a1938de01e..5fd2a159c0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs @@ -9,7 +9,7 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::ip_bans::upsert_ip_ban::{upsert_ip_ban, UpsertIpBanArgs}; +use mysql_queries::queries::ip_bans::upsert_ip_ban::{upsert_ip_ban, UpsertIpBanArgs}; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs index a39233f3cf..2b1e7714a2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs @@ -10,7 +10,7 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::ip_bans::toggle_ip_ban::{IpBanToggleState, toggle_ip_ban}; +use mysql_queries::queries::ip_bans::toggle_ip_ban::{IpBanToggleState, toggle_ip_ban}; use derive_more::{Display, Error}; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs index 8262fdc4d7..28ffb360cf 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs @@ -11,7 +11,7 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::ip_bans::get_ip_ban::get_ip_ban; +use mysql_queries::queries::ip_bans::get_ip_ban::get_ip_ban; use derive_more::{Display, Error}; use log::{info, warn, log, error}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs index d15d7041b1..cb74ccf786 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs @@ -11,7 +11,7 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::ip_bans::list_ip_bans::list_ip_bans; +use mysql_queries::queries::ip_bans::list_ip_bans::list_ip_bans; use log::{info, warn, log, error}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs index 34c5c31741..2622e5d8a9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; -use database_queries::queries::tts::tts_inference_jobs::get_pending_tts_inference_job_detailed_stats::{get_pending_tts_inference_job_detailed_stats, PendingCountResult}; +use mysql_queries::queries::tts::tts_inference_jobs::get_pending_tts_inference_job_detailed_stats::{get_pending_tts_inference_job_detailed_stats, PendingCountResult}; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs index efe2ce3877..ac19f61c53 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs @@ -17,7 +17,7 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::fmt; use std::sync::Arc; -use database_queries::queries::w2l::w2l_inference_jobs::get_pending_w2l_inference_job_detailed_stats::{get_pending_w2l_inference_job_detailed_stats, PendingCountResult}; +use mysql_queries::queries::w2l::w2l_inference_jobs::get_pending_w2l_inference_job_detailed_stats::{get_pending_w2l_inference_job_detailed_stats, PendingCountResult}; #[derive(Serialize)] pub struct GetW2lInferenceQueueCountResponse { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs index ec4df966b2..c9af3e565d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs @@ -7,7 +7,7 @@ use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::server_state::ServerState; -use database_queries::queries::tts::tts_inference_jobs::kill_tts_inference_jobs::{kill_tts_inference_jobs, JobStatus}; +use mysql_queries::queries::tts::tts_inference_jobs::kill_tts_inference_jobs::{kill_tts_inference_jobs, JobStatus}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log, error}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_on_prem_worker_stats.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_on_prem_worker_stats.rs index c453c6dc28..0cd24ae5c3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_on_prem_worker_stats.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_on_prem_worker_stats.rs @@ -2,7 +2,7 @@ use actix_web::web::Query; use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use crate::ServerState; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; -use database_queries::queries::stats::get_on_prem_worker_stats::get_on_prem_worker_stats; +use mysql_queries::queries::stats::get_on_prem_worker_stats::get_on_prem_worker_stats; use hyper::StatusCode; use log::warn; use std::sync::Arc; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs index 7861f48098..ad0a7cbb8a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; -use database_queries::queries::stats::get_voice_count_stats::get_voice_count_stats; +use mysql_queries::queries::stats::get_voice_count_stats::get_voice_count_stats; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs index f18b17ebf6..4fd6d51229 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs @@ -9,8 +9,8 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; -use database_queries::queries::users::user::set_user_ban_status::{set_user_ban_status, SetUserBanStatsArgs}; -use database_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; +use mysql_queries::queries::users::user::set_user_ban_status::{set_user_ban_status, SetUserBanStatsArgs}; +use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs index 4fe5784e67..876515e566 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs @@ -11,7 +11,7 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::users::user_roles::list_user_roles::{UserRoleForList, list_user_roles}; +use mysql_queries::queries::users::user_roles::list_user_roles::{UserRoleForList, list_user_roles}; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs index 8918b860ad..f0816027e5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs @@ -11,7 +11,7 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::users::user_roles::list_staff::list_staff; +use mysql_queries::queries::users::user_roles::list_staff::list_staff; use derive_more::{Display, Error}; use log::{info, warn, log, error}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs index fff718da6a..2f97a6f2f7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs @@ -10,8 +10,8 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; -use database_queries::queries::users::user_roles::list_user_roles::list_user_roles; +use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; +use mysql_queries::queries::users::user_roles::list_user_roles::list_user_roles; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; @@ -19,7 +19,7 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::fmt; use std::sync::Arc; -use database_queries::queries::users::user_roles::set_user_role::set_user_role; +use mysql_queries::queries::users::user_roles::set_user_role::set_user_role; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs index d11cddec12..30f840e6a1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs @@ -9,7 +9,7 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; -use database_queries::queries::users::user::list_users_query_builder::{UserForList, ListUsersQueryBuilder}; +use mysql_queries::queries::users::user::list_users_query_builder::{UserForList, ListUsersQueryBuilder}; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs index 334d6e4956..9fd046343e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc, NaiveDateTime}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::complex_models::event_responses::EventResponse; +use mysql_queries::complex_models::event_responses::EventResponse; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use lexical_sort::natural_lexical_cmp; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_model_downloads.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_model_downloads.rs index 472fb56352..b44bea307f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_model_downloads.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_model_downloads.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc, NaiveDateTime}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::complex_models::event_responses::EventResponse; +use mysql_queries::complex_models::event_responses::EventResponse; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use lexical_sort::natural_lexical_cmp; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_news.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_news.rs index 11793ef93e..24609dfa8d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_news.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_news.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc, NaiveDateTime}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::complex_models::event_responses::EventResponse; +use mysql_queries::complex_models::event_responses::EventResponse; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use lexical_sort::natural_lexical_cmp; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_plans.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_plans.rs index ef74a31a50..ec97622197 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_plans.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_plans.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc, NaiveDateTime}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::complex_models::event_responses::EventResponse; +use mysql_queries::complex_models::event_responses::EventResponse; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use lexical_sort::natural_lexical_cmp; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/post_app_analytics.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/post_app_analytics.rs index 7a81a9b55b..4c719eae34 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/post_app_analytics.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/post_app_analytics.rs @@ -9,7 +9,7 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::voice_clone_requests::insert_voice_clone_requests_builder::InsertVoiceCloneRequestBuilder; +use mysql_queries::queries::voice_clone_requests::insert_voice_clone_requests_builder::InsertVoiceCloneRequestBuilder; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/unsubscribe_reason.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/unsubscribe_reason.rs index 0569b02f97..d4a3de3e96 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/unsubscribe_reason.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/unsubscribe_reason.rs @@ -2,7 +2,7 @@ use actix_web::http::StatusCode; use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use http_server_common::request::get_request_ip::get_request_ip; use crate::server_state::ServerState; -use database_queries::queries::users::user_subscriptions::insert_unsubscribe_reason::UnsubscribeReasonInsertBuilder; +use mysql_queries::queries::users::user_subscriptions::insert_unsubscribe_reason::UnsubscribeReasonInsertBuilder; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{error, info}; use std::sync::Arc; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs index 5d4ea7a6e6..bafee7e9d4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs @@ -15,10 +15,10 @@ use errors::AnyhowResult; use crate::model::cached_queries::list_cached_tts_categories_for_public_dropdown::list_cached_tts_categories_for_public_dropdown; use crate::model::categories::synthetic_category_list::SYNTHETIC_CATEGORY_LATEST_TTS_MODELS; use crate::server_state::ServerState; -use database_queries::queries::model_categories::list_categories_query_builder::CategoryList; -use database_queries::queries::trending_model_analytics::list_trending_tts_models::{list_trending_tts_models, list_trending_tts_models_with_pool}; -use database_queries::queries::tts::tts_category_assignments::fetch_and_build_tts_model_category_map::fetch_and_build_tts_model_category_map_with_connection; -use database_queries::queries::tts::tts_models::list_tts_models::list_tts_models_with_connection; +use mysql_queries::queries::model_categories::list_categories_query_builder::CategoryList; +use mysql_queries::queries::trending_model_analytics::list_trending_tts_models::{list_trending_tts_models, list_trending_tts_models_with_pool}; +use mysql_queries::queries::tts::tts_category_assignments::fetch_and_build_tts_model_category_map::fetch_and_build_tts_model_category_map_with_connection; +use mysql_queries::queries::tts::tts_models::list_tts_models::list_tts_models_with_connection; use enums::by_table::trending_model_analytics::window_name::WindowName; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs index 957c873266..739febf9a2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs @@ -11,11 +11,11 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success use crate::server_state::ServerState; use crate::util::delete_role_disambiguation::DeleteRole; use crate::util::delete_role_disambiguation::delete_role_disambiguation; -use database_queries::queries::tts::tts_models::delete_tts_model_various_scopes::delete_tts_model_as_mod; -use database_queries::queries::tts::tts_models::delete_tts_model_various_scopes::delete_tts_model_as_user; -use database_queries::queries::tts::tts_models::delete_tts_model_various_scopes::undelete_tts_model_as_mod; -use database_queries::queries::tts::tts_models::delete_tts_model_various_scopes::undelete_tts_model_as_user; -use database_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token; +use mysql_queries::queries::tts::tts_models::delete_tts_model_various_scopes::delete_tts_model_as_mod; +use mysql_queries::queries::tts::tts_models::delete_tts_model_various_scopes::delete_tts_model_as_user; +use mysql_queries::queries::tts::tts_models::delete_tts_model_various_scopes::undelete_tts_model_as_mod; +use mysql_queries::queries::tts::tts_models::delete_tts_model_various_scopes::undelete_tts_model_as_user; +use mysql_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token; use http_server_common::request::get_request_ip::get_request_ip; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs index da0920fba7..450d638f12 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs @@ -12,11 +12,11 @@ use crate::server_state::ServerState; use crate::util::delete_role_disambiguation::DeleteRole; use crate::util::delete_role_disambiguation::delete_role_disambiguation; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::tts::tts_results::delete_tts_result_various_scopes::delete_tts_inference_result_as_mod; -use database_queries::queries::tts::tts_results::delete_tts_result_various_scopes::delete_tts_inference_result_as_user; -use database_queries::queries::tts::tts_results::delete_tts_result_various_scopes::undelete_tts_inference_result_as_mod; -use database_queries::queries::tts::tts_results::delete_tts_result_various_scopes::undelete_tts_inference_result_as_user; -use database_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; +use mysql_queries::queries::tts::tts_results::delete_tts_result_various_scopes::delete_tts_inference_result_as_mod; +use mysql_queries::queries::tts::tts_results::delete_tts_result_various_scopes::delete_tts_inference_result_as_user; +use mysql_queries::queries::tts::tts_results::delete_tts_result_various_scopes::undelete_tts_inference_result_as_mod; +use mysql_queries::queries::tts::tts_results::delete_tts_result_various_scopes::undelete_tts_inference_result_as_user; +use mysql_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs index c069ce222c..0d761401f5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs @@ -11,10 +11,10 @@ use container_common::i18n::supported_languages_for_models::get_canonicalized_la use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::column_types::vocoder_type::VocoderType; -use database_queries::queries::tts::tts_models::edit_tts_model_details::{edit_tts_model_details_as_author, edit_tts_model_details_as_mod}; -use database_queries::queries::tts::tts_models::edit_tts_model_moderator_details::edit_tts_model_moderator_details; -use database_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token; +use mysql_queries::column_types::vocoder_type::VocoderType; +use mysql_queries::queries::tts::tts_models::edit_tts_model_details::{edit_tts_model_details_as_author, edit_tts_model_details_as_mod}; +use mysql_queries::queries::tts::tts_models::edit_tts_model_moderator_details::edit_tts_model_moderator_details; +use mysql_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use language_tags::LanguageTag; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs index 627f684a07..ae9ac40638 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs @@ -10,8 +10,8 @@ use actix_web::{web, HttpResponse, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::tts::tts_results::edit_tts_result::{CreatorOrModFields, edit_tts_result, EditTtsResultArgs}; -use database_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; +use mysql_queries::queries::tts::tts_results::edit_tts_result::{CreatorOrModFields, edit_tts_result, EditTtsResultArgs}; +use mysql_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts.rs index 72aa10b422..63c645a0ea 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts.rs @@ -10,9 +10,9 @@ use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_se use crate::http_server::endpoints::investor_demo::demo_cookie::request_has_demo_cookie; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::tts::tts_inference_jobs::insert_tts_inference_job::TtsInferenceJobInsertBuilder; -use database_queries::queries::tts::tts_models::get_tts_model::{get_tts_model_by_token_using_connection, TtsModelRecord}; -use database_queries::tokens::Tokens; +use mysql_queries::queries::tts::tts_inference_jobs::insert_tts_inference_job::TtsInferenceJobInsertBuilder; +use mysql_queries::queries::tts::tts_models::get_tts_model::{get_tts_model_by_token_using_connection, TtsModelRecord}; +use mysql_queries::tokens::Tokens; use enums::common::visibility::Visibility; use http_server_common::request::get_request_api_token::get_request_api_token; use http_server_common::request::get_request_header_optional::get_request_header_optional; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs index e8fc0c9220..1b7560f225 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs @@ -10,7 +10,7 @@ use config::bad_urls::is_bad_tts_model_download_url; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::tts::tts_model_upload_jobs::insert_tts_model_upload_job::{insert_tts_model_upload_job, InsertTtsModelUploadJobArgs}; +use mysql_queries::queries::tts::tts_model_upload_jobs::insert_tts_model_upload_job::{insert_tts_model_upload_job, InsertTtsModelUploadJobArgs}; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_pending_tts_inference_job_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_pending_tts_inference_job_count.rs index df58e34f96..5860e49ae0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_pending_tts_inference_job_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_pending_tts_inference_job_count.rs @@ -2,7 +2,7 @@ use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use chrono::NaiveDateTime; use crate::ServerState; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use database_queries::queries::tts::tts_inference_jobs::get_pending_tts_inference_job_count::get_pending_tts_inference_job_count; +use mysql_queries::queries::tts::tts_inference_jobs::get_pending_tts_inference_job_count::get_pending_tts_inference_job_count; use errors::AnyhowResult; use hyper::StatusCode; use log::{debug, error, info, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs index 097de6f968..c4ea9ad279 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs @@ -24,7 +24,7 @@ use std::borrow::BorrowMut; use std::fmt; use std::ops::Deref; use std::sync::Arc; -use database_queries::queries::tts::tts_inference_jobs::get_tts_inference_job_status::get_tts_inference_job_status; +use mysql_queries::queries::tts::tts_inference_jobs::get_tts_inference_job_status::get_tts_inference_job_status; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs index 916922bcb7..5d503c783d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs @@ -9,8 +9,8 @@ use actix_web::web::Path; use actix_web::{web, HttpResponse, HttpRequest}; use chrono::{DateTime, Utc}; use crate::server_state::ServerState; -use database_queries::column_types::vocoder_type::VocoderType; -use database_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token_using_connection; +use mysql_queries::column_types::vocoder_type::VocoderType; +use mysql_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token_using_connection; use enums::common::visibility::Visibility; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs index bfb92488e0..abaca6cb6b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs @@ -10,8 +10,8 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::tts::tts_results::query_tts_result::TtsResultRecordForResponse; -use database_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; +use mysql_queries::queries::tts::tts_results::query_tts_result::TtsResultRecordForResponse; +use mysql_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs index 23378b723d..e03d3ac54a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::tts::tts_model_upload_jobs::get_tts_model_upload_job_status::get_tts_model_upload_job_status; +use mysql_queries::queries::tts::tts_model_upload_jobs::get_tts_model_upload_job_status::get_tts_model_upload_job_status; use derive_more::{Display, Error}; use log::{info, warn, log, error}; use r2d2_redis::redis::Commands; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs index c34ca66a4c..13ab600c56 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs @@ -10,8 +10,8 @@ use chrono::{DateTime, Utc}; use errors::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::tts::tts_category_assignments::fetch_and_build_tts_model_category_map::fetch_and_build_tts_model_category_map_with_connection; -use database_queries::queries::tts::tts_models::list_tts_models::list_tts_models_with_connection; +use mysql_queries::queries::tts::tts_category_assignments::fetch_and_build_tts_model_category_map::fetch_and_build_tts_model_category_map_with_connection; +use mysql_queries::queries::tts::tts_models::list_tts_models::list_tts_models_with_connection; use lexical_sort::natural_lexical_cmp; use log::{info, warn, error}; use sqlx::MySql; @@ -19,7 +19,7 @@ use sqlx::pool::PoolConnection; use std::collections::HashSet; use std::fmt; use std::sync::Arc; -use database_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; +use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; use enums::common::visibility::Visibility; #[derive(Serialize, Clone)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs index 68e50e4ec4..ee05dde7b5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::tts::tts_results::list_tts_results_query_builder::{ListTtsResultsQueryBuilder, TtsInferenceRecordForList}; +use mysql_queries::queries::tts::tts_results::list_tts_results_query_builder::{ListTtsResultsQueryBuilder, TtsInferenceRecordForList}; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs index ace2c6a14a..e78c627178 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::tts::tts_models::list_tts_models::{TtsModelRecordForList, list_tts_models}; +use mysql_queries::queries::tts::tts_models::list_tts_models::{TtsModelRecordForList, list_tts_models}; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/create_event_rule.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/create_event_rule.rs index 931570a10a..3cf38460b0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/create_event_rule.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/create_event_rule.rs @@ -9,11 +9,11 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::column_types::twitch_event_category::TwitchEventCategory; -use database_queries::complex_models::event_match_predicate::EventMatchPredicate; -use database_queries::complex_models::event_responses::EventResponse; -use database_queries::queries::twitch::twitch_event_rules::insert_twitch_event_rule_builder::InsertTwitchEventRuleBuilder; -use database_queries::tokens::Tokens; +use mysql_queries::column_types::twitch_event_category::TwitchEventCategory; +use mysql_queries::complex_models::event_match_predicate::EventMatchPredicate; +use mysql_queries::complex_models::event_responses::EventResponse; +use mysql_queries::queries::twitch::twitch_event_rules::insert_twitch_event_rule_builder::InsertTwitchEventRuleBuilder; +use mysql_queries::tokens::Tokens; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/delete_event_rule.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/delete_event_rule.rs index 737bdded67..232af3bf71 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/delete_event_rule.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/delete_event_rule.rs @@ -9,8 +9,8 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::twitch::twitch_event_rules::delete_twitch_event_rule::delete_twitch_event_rule; -use database_queries::queries::twitch::twitch_event_rules::get_twitch_event_rule_for_user::get_twitch_event_rule_for_user; +use mysql_queries::queries::twitch::twitch_event_rules::delete_twitch_event_rule::delete_twitch_event_rule; +use mysql_queries::queries::twitch::twitch_event_rules::get_twitch_event_rule_for_user::get_twitch_event_rule_for_user; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/edit_event_rule.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/edit_event_rule.rs index e0a5cabb65..7741a57231 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/edit_event_rule.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/edit_event_rule.rs @@ -11,10 +11,10 @@ use crate::http_server::endpoints::twitch::event_rules::validations::validate_ev use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::complex_models::event_match_predicate::EventMatchPredicate; -use database_queries::complex_models::event_responses::EventResponse; -use database_queries::queries::twitch::twitch_event_rules::get_twitch_event_rule_for_user::get_twitch_event_rule_for_user; -use database_queries::queries::twitch::twitch_event_rules::update_twitch_event_rule_builder::UpdateTwitchEventRuleBuilder; +use mysql_queries::complex_models::event_match_predicate::EventMatchPredicate; +use mysql_queries::complex_models::event_responses::EventResponse; +use mysql_queries::queries::twitch::twitch_event_rules::get_twitch_event_rule_for_user::get_twitch_event_rule_for_user; +use mysql_queries::queries::twitch::twitch_event_rules::update_twitch_event_rule_builder::UpdateTwitchEventRuleBuilder; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/get_event_rule.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/get_event_rule.rs index 936109e4b3..6795a7fc57 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/get_event_rule.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/get_event_rule.rs @@ -10,10 +10,10 @@ use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::column_types::twitch_event_category::TwitchEventCategory; -use database_queries::complex_models::event_match_predicate::EventMatchPredicate; -use database_queries::complex_models::event_responses::EventResponse; -use database_queries::queries::twitch::twitch_event_rules::list_twitch_event_rules_for_user::{TwitchEventRule, list_twitch_event_rules_for_user}; +use mysql_queries::column_types::twitch_event_category::TwitchEventCategory; +use mysql_queries::complex_models::event_match_predicate::EventMatchPredicate; +use mysql_queries::complex_models::event_responses::EventResponse; +use mysql_queries::queries::twitch::twitch_event_rules::list_twitch_event_rules_for_user::{TwitchEventRule, list_twitch_event_rules_for_user}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use lexical_sort::natural_lexical_cmp; use log::{info, warn, log, error}; @@ -23,7 +23,7 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::fmt; use std::sync::Arc; -use database_queries::queries::twitch::twitch_event_rules::get_twitch_event_rule_for_user::get_twitch_event_rule_for_user; +use mysql_queries::queries::twitch::twitch_event_rules::get_twitch_event_rule_for_user::get_twitch_event_rule_for_user; // =============== Request =============== diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/list_event_rules_for_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/list_event_rules_for_user.rs index 5e4b9950d6..19d337e14f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/list_event_rules_for_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/list_event_rules_for_user.rs @@ -10,10 +10,10 @@ use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::column_types::twitch_event_category::TwitchEventCategory; -use database_queries::complex_models::event_match_predicate::EventMatchPredicate; -use database_queries::complex_models::event_responses::EventResponse; -use database_queries::queries::twitch::twitch_event_rules::list_twitch_event_rules_for_user::{TwitchEventRule, list_twitch_event_rules_for_user}; +use mysql_queries::column_types::twitch_event_category::TwitchEventCategory; +use mysql_queries::complex_models::event_match_predicate::EventMatchPredicate; +use mysql_queries::complex_models::event_responses::EventResponse; +use mysql_queries::queries::twitch::twitch_event_rules::list_twitch_event_rules_for_user::{TwitchEventRule, list_twitch_event_rules_for_user}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use lexical_sort::natural_lexical_cmp; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/reorder_twitch_event_rules.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/reorder_twitch_event_rules.rs index e20df6d41f..5a7b8e6c46 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/reorder_twitch_event_rules.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/reorder_twitch_event_rules.rs @@ -11,12 +11,12 @@ use crate::http_server::endpoints::twitch::event_rules::validations::validate_ev use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::complex_models::event_match_predicate::EventMatchPredicate; -use database_queries::complex_models::event_responses::EventResponse; -use database_queries::queries::twitch::twitch_event_rules::get_twitch_event_rule_for_user::get_twitch_event_rule_for_user; -use database_queries::queries::twitch::twitch_event_rules::list_twitch_event_rules_for_user::list_twitch_event_rules_for_user; -use database_queries::queries::twitch::twitch_event_rules::reorder_twitch_event_rules::reorder_twitch_event_rules; -use database_queries::queries::twitch::twitch_event_rules::update_twitch_event_rule_builder::UpdateTwitchEventRuleBuilder; +use mysql_queries::complex_models::event_match_predicate::EventMatchPredicate; +use mysql_queries::complex_models::event_responses::EventResponse; +use mysql_queries::queries::twitch::twitch_event_rules::get_twitch_event_rule_for_user::get_twitch_event_rule_for_user; +use mysql_queries::queries::twitch::twitch_event_rules::list_twitch_event_rules_for_user::list_twitch_event_rules_for_user; +use mysql_queries::queries::twitch::twitch_event_rules::reorder_twitch_event_rules::reorder_twitch_event_rules; +use mysql_queries::queries::twitch::twitch_event_rules::update_twitch_event_rule_builder::UpdateTwitchEventRuleBuilder; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log, error}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/validations/validate_event_match_predicate.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/validations/validate_event_match_predicate.rs index 443cc02b2b..070de3d321 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/validations/validate_event_match_predicate.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/validations/validate_event_match_predicate.rs @@ -1,4 +1,4 @@ -use database_queries::complex_models::event_match_predicate::EventMatchPredicate; +use mysql_queries::complex_models::event_match_predicate::EventMatchPredicate; // TODO: Check that the tokens are valid models. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/validations/validate_event_response.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/validations/validate_event_response.rs index 3356246df4..c2c17a0ac5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/validations/validate_event_response.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/validations/validate_event_response.rs @@ -1,4 +1,4 @@ -use database_queries::complex_models::event_responses::EventResponse; +use mysql_queries::complex_models::event_responses::EventResponse; // TODO: Check that the tokens are valid models. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/oauth/check_oauth_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/oauth/check_oauth_status.rs index 60d1c24476..650fd290b9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/oauth/check_oauth_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/oauth/check_oauth_status.rs @@ -1,7 +1,7 @@ use actix_http::{StatusCode, header}; use actix_web::{HttpResponse, HttpRequest, web, ResponseError}; use crate::server_state::ServerState; -use database_queries::queries::twitch::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; +use mysql_queries::queries::twitch::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::response_error_helpers::to_simple_json_error; use log::error; @@ -12,8 +12,8 @@ use std::sync::Arc; use twitch_common::oauth_token_builder::get_oauth_token_builder; use twitch_oauth2::tokens::BearerTokenType::UserToken; use twitch_oauth2::{CsrfToken, TwitchToken}; -use database_queries::tokens::Tokens; -use database_queries::queries::twitch::twitch_oauth::find::{TwitchOauthTokenFinder, TwitchOauthTokenRecord}; +use mysql_queries::tokens::Tokens; +use mysql_queries::queries::twitch::twitch_oauth::find::{TwitchOauthTokenFinder, TwitchOauthTokenRecord}; #[derive(Serialize)] pub struct CheckOauthResponse { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/oauth/oauth_end.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/oauth/oauth_end.rs index 1bab1a8e9b..f8461a1682 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/oauth/oauth_end.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/oauth/oauth_end.rs @@ -1,7 +1,7 @@ use actix_http::{StatusCode, header}; use actix_web::{HttpResponse, HttpRequest, web, ResponseError}; use crate::server_state::ServerState; -use database_queries::queries::twitch::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; +use mysql_queries::queries::twitch::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::response_error_helpers::to_simple_json_error; use log::error; @@ -12,7 +12,7 @@ use std::sync::Arc; use twitch_common::oauth_token_builder::get_oauth_token_builder; use twitch_oauth2::tokens::BearerTokenType::UserToken; use twitch_oauth2::{CsrfToken, TwitchToken}; -use database_queries::tokens::Tokens; +use mysql_queries::tokens::Tokens; #[derive(Deserialize)] pub struct QueryParams { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs index 8612c6aeb5..f324eb5afc 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs @@ -1,8 +1,8 @@ use actix_web::http::StatusCode; use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use crate::server_state::ServerState; -use database_queries::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; -use database_queries::queries::users::user_ratings::get_user_rating::{Args, get_user_rating}; +use mysql_queries::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; +use mysql_queries::queries::users::user_ratings::get_user_rating::{Args, get_user_rating}; use enums::by_table::user_ratings::entity_type::UserRatingEntityType; use enums::by_table::user_ratings::rating_value::UserRatingValue; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs index 4cb4ca2543..19c26804e6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs @@ -1,15 +1,15 @@ use actix_web::http::StatusCode; use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use crate::server_state::ServerState; -use database_queries::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; -use database_queries::queries::users::user_ratings::upsert_user_rating::{Args, upsert_user_rating}; +use mysql_queries::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; +use mysql_queries::queries::users::user_ratings::upsert_user_rating::{Args, upsert_user_rating}; use enums::by_table::user_ratings::entity_type::UserRatingEntityType; use enums::by_table::user_ratings::rating_value::UserRatingValue; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{error, info}; use std::sync::Arc; -use database_queries::queries::users::user_ratings::update_tts_model_ratings::update_tts_model_ratings; +use mysql_queries::queries::users::user_ratings::update_tts_model_ratings::update_tts_model_ratings; use tokens::tokens::tts_models::TtsModelToken; use tokens::tokens::w2l_templates::W2lTemplateToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/vocoders/get_vocoder.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/vocoders/get_vocoder.rs index af9588bda5..893eeaa951 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/vocoders/get_vocoder.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/vocoders/get_vocoder.rs @@ -10,7 +10,7 @@ use actix_web::{web, HttpResponse, HttpRequest}; use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::vocoder::get_vocoder_model::get_vocoder_model_by_token; +use mysql_queries::queries::vocoder::get_vocoder_model::get_vocoder_model_by_token; use enums::common::visibility::Visibility; use enums::common::vocoder_type::VocoderType; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/vocoders/list_vocoders.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/vocoders/list_vocoders.rs index 6b38117dc9..10964f7e87 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/vocoders/list_vocoders.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/vocoders/list_vocoders.rs @@ -9,7 +9,7 @@ use actix_web::{web, HttpResponse, HttpRequest}; use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::vocoder::list_vocoder_models::{list_vocoder_models, VocoderModelListItem}; +use mysql_queries::queries::vocoder::list_vocoder_models::{list_vocoder_models, VocoderModelListItem}; use enums::common::vocoder_type::VocoderType; use log::warn; use std::fmt; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs index 1f08c4eac1..897f07075d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs @@ -9,8 +9,8 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::voice_clone_requests::get_voice_clone_request::{get_voice_clone_request_by_user_token, get_voice_clone_request_by_token}; -use database_queries::queries::voice_clone_requests::insert_voice_clone_requests_builder::InsertVoiceCloneRequestBuilder; +use mysql_queries::queries::voice_clone_requests::get_voice_clone_request::{get_voice_clone_request_by_user_token, get_voice_clone_request_by_token}; +use mysql_queries::queries::voice_clone_requests::insert_voice_clone_requests_builder::InsertVoiceCloneRequestBuilder; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs index 9f5a83d747..a8c7252e12 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs @@ -9,7 +9,7 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::voice_clone_requests::insert_voice_clone_requests_builder::InsertVoiceCloneRequestBuilder; +use mysql_queries::queries::voice_clone_requests::insert_voice_clone_requests_builder::InsertVoiceCloneRequestBuilder; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/inference/enqueue_voice_conversion_inference.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/inference/enqueue_voice_conversion_inference.rs index 5ea98ada75..bf5558369b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/inference/enqueue_voice_conversion_inference.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/inference/enqueue_voice_conversion_inference.rs @@ -10,7 +10,7 @@ use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_se use crate::http_server::endpoints::investor_demo::demo_cookie::request_has_demo_cookie; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::generic_inference::web::insert_generic_inference_job::{Args, insert_generic_inference_job}; +use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{Args, insert_generic_inference_job}; use enums::common::visibility::Visibility; use enums::workers::generic_inference_type::GenericInferenceType; use http_server_common::request::get_request_header_optional::get_request_header_optional; @@ -20,7 +20,7 @@ use r2d2_redis::redis::Commands; use redis_common::redis_keys::RedisKeys; use std::fmt; use std::sync::Arc; -use database_queries::payloads::generic_inference_args::{GenericInferenceArgs, PolymorphicInferenceArgs}; +use mysql_queries::payloads::generic_inference_args::{GenericInferenceArgs, PolymorphicInferenceArgs}; use tokens::files::media_upload::MediaUploadToken; use tokens::jobs::inference::InferenceJobToken; use tokens::users::user::UserToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs index a578e68c43..d0b70e8f29 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs @@ -12,11 +12,11 @@ use crate::server_state::ServerState; use crate::util::delete_role_disambiguation::DeleteRole; use crate::util::delete_role_disambiguation::delete_role_disambiguation; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::delete_w2l_inference_result_as_mod; -use database_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::delete_w2l_inference_result_as_user; -use database_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::undelete_w2l_inference_result_as_mod; -use database_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::undelete_w2l_inference_result_as_user; -use database_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; +use mysql_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::delete_w2l_inference_result_as_mod; +use mysql_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::delete_w2l_inference_result_as_user; +use mysql_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::undelete_w2l_inference_result_as_mod; +use mysql_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::undelete_w2l_inference_result_as_user; +use mysql_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs index 7259c70958..3a9397b272 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs @@ -12,11 +12,11 @@ use crate::server_state::ServerState; use crate::util::delete_role_disambiguation::DeleteRole; use crate::util::delete_role_disambiguation::delete_role_disambiguation; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::delete_w2l_template_as_mod; -use database_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::delete_w2l_template_as_user; -use database_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::undelete_w2l_template_as_mod; -use database_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::undelete_w2l_template_as_user; -use database_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; +use mysql_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::delete_w2l_template_as_mod; +use mysql_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::delete_w2l_template_as_user; +use mysql_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::undelete_w2l_template_as_mod; +use mysql_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::undelete_w2l_template_as_user; +use mysql_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; use http_server_common::request::get_request_ip::get_request_ip; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs index b3f30c2a85..105f00c8ab 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs @@ -10,13 +10,13 @@ use actix_web::{web, HttpResponse, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; +use mysql_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, warn}; use std::fmt; use std::sync::Arc; -use database_queries::queries::w2l::w2l_results::edit_w2l_result::{CreatorOrModFields, edit_w2l_result, EditW2lResultArgs}; +use mysql_queries::queries::w2l::w2l_results::edit_w2l_result::{CreatorOrModFields, edit_w2l_result, EditW2lResultArgs}; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs index 25eb46f898..fa374e5076 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs @@ -10,13 +10,13 @@ use actix_web::{web, HttpResponse, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; +use mysql_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, info, warn}; use std::fmt; use std::sync::Arc; -use database_queries::queries::w2l::w2l_templates::edit_w2l_template::{CreatorOrModFields, edit_w2l_template, EditW2lTemplateArgs, ModFields}; +use mysql_queries::queries::w2l::w2l_templates::edit_w2l_template::{CreatorOrModFields, edit_w2l_template, EditW2lTemplateArgs, ModFields}; use user_input_common::check_for_slurs::contains_slurs; use user_input_common::markdown_to_html::markdown_to_html; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs index fce2d23ee8..c01387279d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs @@ -8,7 +8,7 @@ use actix_web::http::StatusCode; use actix_web::{web, HttpResponse, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::w2l::w2l_inference_jobs::insert_w2l_inference_job::{insert_w2l_inference_job, InsertW2lInferenceJobArgs}; +use mysql_queries::queries::w2l::w2l_inference_jobs::insert_w2l_inference_job::{insert_w2l_inference_job, InsertW2lInferenceJobArgs}; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use log::{info, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs index 2ca924ae33..248e80949e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs @@ -21,8 +21,8 @@ use r2d2_redis::redis::Commands; use redis_common::redis_keys::RedisKeys; use std::fmt; use std::sync::Arc; -use database_queries::queries::w2l::w2l_inference_jobs::insert_w2l_inference_job_extended::{insert_w2l_inference_job_extended, InsertW2lInferenceJobExtendedArgs}; -use database_queries::queries::w2l::w2l_templates::check_w2l_template_exists::check_w2l_template_exists; +use mysql_queries::queries::w2l::w2l_inference_jobs::insert_w2l_inference_job_extended::{insert_w2l_inference_job_extended, InsertW2lInferenceJobExtendedArgs}; +use mysql_queries::queries::w2l::w2l_templates::check_w2l_template_exists::check_w2l_template_exists; const BUCKET_AUDIO_FILE_NAME : &'static str = "input_audio_file"; const BUCKET_IMAGE_FILE_NAME: &'static str = "input_image_file"; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs index 2f797f56e6..9eac77a96f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs @@ -10,7 +10,7 @@ use config::is_bad_video_download_url::is_bad_video_download_url; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::w2l::w2l_template_upload_jobs::insert_w2l_template_upload_job::{insert_w2l_template_upload_job, InsertW2lTemplateUploadJobArgs}; +use mysql_queries::queries::w2l::w2l_template_upload_jobs::insert_w2l_template_upload_job::{insert_w2l_template_upload_job, InsertW2lTemplateUploadJobArgs}; use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs index e8a5fb9ec4..0e7749a328 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::w2l::w2l_inference_jobs::get_w2l_inference_job_status::get_w2l_inference_job_status; +use mysql_queries::queries::w2l::w2l_inference_jobs::get_w2l_inference_job_status::get_w2l_inference_job_status; use log::{info, warn, log}; use r2d2_redis::redis::Commands; use redis_common::redis_keys::RedisKeys; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs index 0204780f6a..5b2a16c279 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs @@ -9,8 +9,8 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::w2l::w2l_results::query_w2l_result::W2lResultRecordForResponse; -use database_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; +use mysql_queries::queries::w2l::w2l_results::query_w2l_result::W2lResultRecordForResponse; +use mysql_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs index 0dbb528ed8..4d135bb635 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs @@ -9,8 +9,8 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::w2l::w2l_templates::get_w2l_template::W2lTemplateRecordForResponse; -use database_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; +use mysql_queries::queries::w2l::w2l_templates::get_w2l_template::W2lTemplateRecordForResponse; +use mysql_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs index 7ebee069de..ba9b0f4663 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs @@ -20,7 +20,7 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use database_queries::queries::w2l::w2l_template_upload_jobs::get_w2l_template_upload_job_status::get_w2l_template_upload_job_status; +use mysql_queries::queries::w2l::w2l_template_upload_jobs::get_w2l_template_upload_job_status::get_w2l_template_upload_job_status; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_inference_results.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_inference_results.rs index 5f8f585cdd..c65b9cd4d5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_inference_results.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_inference_results.rs @@ -10,8 +10,8 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::w2l::w2l_results::list_w2l_inference_results_query_builder::ListW2lResultsQueryBuilder; -use database_queries::queries::w2l::w2l_results::list_w2l_inference_results_query_builder::W2lInferenceRecordForList; +use mysql_queries::queries::w2l::w2l_results::list_w2l_inference_results_query_builder::ListW2lResultsQueryBuilder; +use mysql_queries::queries::w2l::w2l_results::list_w2l_inference_results_query_builder::W2lInferenceRecordForList; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_templates.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_templates.rs index 8c6f9f1f5d..e540d8ccbf 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_templates.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_templates.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::w2l::w2l_templates::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; +use mysql_queries::queries::w2l::w2l_templates::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs index 3152365e4e..0f93a69b23 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs @@ -9,7 +9,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::queries::w2l::w2l_templates::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; +use mysql_queries::queries::w2l::w2l_templates::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; use log::{info, warn, log, error}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs index c28429693e..b2b534a2bf 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs @@ -9,7 +9,7 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; -use database_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; +use mysql_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; use http_server_common::request::get_request_ip::get_request_ip; use log::{info, warn, log}; use regex::Regex; @@ -18,7 +18,7 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::fmt; use std::sync::Arc; -use database_queries::queries::w2l::w2l_templates::set_w2l_template_mod_approval::set_w2l_template_mod_approval; +use mysql_queries::queries::w2l::w2l_templates::set_w2l_template_mod_approval::set_w2l_template_mod_approval; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/crates/service/web/storyteller_web/src/main.rs b/crates/service/web/storyteller_web/src/main.rs index 401019d5a5..920615a6e1 100644 --- a/crates/service/web/storyteller_web/src/main.rs +++ b/crates/service/web/storyteller_web/src/main.rs @@ -31,15 +31,11 @@ pub mod threads; pub mod util; pub mod validations; -// TODO: Eventually move all of these to the `database_queries` crate and no longer write inline MySQL. -// NB: Also so sqlx codegens everything. -// Not sure if this is strictly necessary. -mod shared_queries { - use database_queries::queries::twitch::twitch_oauth::find; - use database_queries::queries::twitch::twitch_oauth::insert; -} - use actix_cors::Cors; +use actix_helpers::middleware::endpoint_disablement::disabled_endpoints::disabled_endpoints::DisabledEndpoints; +use actix_helpers::middleware::endpoint_disablement::disabled_endpoints::exact_match_endpoint_disablements::ExactMatchEndpointDisablements; +use actix_helpers::middleware::endpoint_disablement::disabled_endpoints::prefix_endpoint_disablements::PrefixEndpointDisablements; +use actix_helpers::middleware::endpoint_disablement::endpoint_disablement_middleware::EndpointDisablementFilter; use actix_helpers::middleware::ip_filter::ip_ban_list::ip_ban_list::IpBanList; use actix_helpers::middleware::ip_filter::ip_ban_list::load_ip_ban_list_from_directory::load_ip_ban_list_from_directory; use actix_helpers::middleware::ip_filter::ip_filter_middleware::IpFilter; @@ -49,6 +45,7 @@ use actix_web::{HttpServer, web, HttpResponse, App, middleware}; use anyhow::anyhow; use billing_component::stripe::stripe_config::{FullUrlOrPath, StripeCheckoutConfigs, StripeConfig, StripeCustomerPortalConfigs, StripeSecrets}; use billing_component::stripe::traits::internal_product_to_stripe_lookup::InternalProductToStripeLookup; +use billing_component::stripe::traits::internal_session_cache_purge::InternalSessionCachePurge; use billing_component::stripe::traits::internal_subscription_product_lookup::InternalSubscriptionProductLookup; use billing_component::stripe::traits::internal_user_lookup::InternalUserLookup; use cloud_storage::bucket_client::BucketClient; @@ -57,6 +54,7 @@ use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use config::shared_constants::DEFAULT_RUST_LOG; use container_common::files::read_toml_file_to_struct::read_toml_file_to_struct; use crate::billing::internal_product_to_stripe_lookup_impl::InternalProductToStripeLookupImpl; +use crate::billing::internal_session_cache_purge_impl::InternalSessionCachePurgeImpl; use crate::billing::stripe_internal_subscription_product_lookup_impl::StripeInternalSubscriptionProductLookupImpl; use crate::billing::stripe_internal_user_lookup_impl::StripeInternalUserLookupImpl; use crate::configs::static_api_tokens::{StaticApiTokenConfig, StaticApiTokens, StaticApiTokenSet}; @@ -68,34 +66,28 @@ use crate::threads::db_health_checker_thread::db_health_check_status::HealthChec use crate::threads::db_health_checker_thread::db_health_checker_thread::db_health_checker_thread; use crate::threads::poll_ip_banlist_thread::poll_ip_bans; use crate::util::encrypted_sort_id::SortKeyCrypto; -use database_queries::mediators::badge_granter::BadgeGranter; -use database_queries::mediators::firehose_publisher::FirehosePublisher; use errors::AnyhowResult; use futures::Future; use http_server_common::cors::{build_cors_config, build_production_cors_config}; use limitation::Limiter; use log::{error, info}; use memory_caching::single_item_ttl_cache::SingleItemTtlCache; +use mysql_queries::mediators::badge_granter::BadgeGranter; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; use r2d2_redis::RedisConnectionManager; use r2d2_redis::r2d2; use r2d2_redis::redis::Commands; +use redis_caching::redis_ttl_cache::RedisTtlCache; use reusable_types::server_environment::ServerEnvironment; use sqlx::MySqlPool; use sqlx::mysql::MySqlPoolOptions; use std::sync::Arc; use std::time::Duration; use tokio::runtime::Runtime; -use actix_helpers::middleware::endpoint_disablement::disabled_endpoints::disabled_endpoints::DisabledEndpoints; -use actix_helpers::middleware::endpoint_disablement::disabled_endpoints::exact_match_endpoint_disablements::ExactMatchEndpointDisablements; -use actix_helpers::middleware::endpoint_disablement::disabled_endpoints::prefix_endpoint_disablements::PrefixEndpointDisablements; -use actix_helpers::middleware::endpoint_disablement::endpoint_disablement_middleware::EndpointDisablementFilter; -use billing_component::stripe::traits::internal_session_cache_purge::InternalSessionCachePurge; -use redis_caching::redis_ttl_cache::RedisTtlCache; use twitch_common::twitch_secrets::TwitchSecrets; use url_config::third_party_url_redirector::ThirdPartyUrlRedirector; use users_component::utils::session_checker::SessionChecker; use users_component::utils::session_cookie_manager::SessionCookieManager; -use crate::billing::internal_session_cache_purge_impl::InternalSessionCachePurgeImpl; const DEFAULT_BIND_ADDRESS : &'static str = "0.0.0.0:12345"; diff --git a/crates/service/web/storyteller_web/src/model/cached_queries/list_cached_tts_categories_for_public_dropdown.rs b/crates/service/web/storyteller_web/src/model/cached_queries/list_cached_tts_categories_for_public_dropdown.rs index 632b236120..24361790ad 100644 --- a/crates/service/web/storyteller_web/src/model/cached_queries/list_cached_tts_categories_for_public_dropdown.rs +++ b/crates/service/web/storyteller_web/src/model/cached_queries/list_cached_tts_categories_for_public_dropdown.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use database_queries::queries::model_categories::list_categories_query_builder::{CategoryList, ListCategoriesQueryBuilder}; +use mysql_queries::queries::model_categories::list_categories_query_builder::{CategoryList, ListCategoriesQueryBuilder}; use errors::AnyhowResult; use lexical_sort::natural_lexical_cmp; use log::{error}; diff --git a/crates/service/web/storyteller_web/src/server_state.rs b/crates/service/web/storyteller_web/src/server_state.rs index fb9f5e5654..d0b29600fd 100644 --- a/crates/service/web/storyteller_web/src/server_state.rs +++ b/crates/service/web/storyteller_web/src/server_state.rs @@ -9,11 +9,11 @@ use crate::http_server::endpoints::tts::list_tts_models::TtsModelRecordForRespon use crate::http_server::web_utils::redis_rate_limiter::RedisRateLimiter; use crate::threads::db_health_checker_thread::db_health_check_status::HealthCheckStatus; use crate::util::encrypted_sort_id::SortKeyCrypto; -use database_queries::mediators::badge_granter::BadgeGranter; -use database_queries::mediators::firehose_publisher::FirehosePublisher; -use database_queries::queries::model_categories::list_categories_query_builder::CategoryList; -use database_queries::queries::tts::tts_inference_jobs::get_pending_tts_inference_job_count::TtsQueueLengthResult; -use database_queries::queries::w2l::w2l_templates::list_w2l_templates::W2lTemplateRecordForList; +use mysql_queries::mediators::badge_granter::BadgeGranter; +use mysql_queries::mediators::firehose_publisher::FirehosePublisher; +use mysql_queries::queries::model_categories::list_categories_query_builder::CategoryList; +use mysql_queries::queries::tts::tts_inference_jobs::get_pending_tts_inference_job_count::TtsQueueLengthResult; +use mysql_queries::queries::w2l::w2l_templates::list_w2l_templates::W2lTemplateRecordForList; use memory_caching::single_item_ttl_cache::SingleItemTtlCache; use r2d2_redis::{r2d2, RedisConnectionManager}; use redis_caching::redis_ttl_cache::RedisTtlCache; diff --git a/crates/service/web/storyteller_web/src/threads/db_health_checker_thread/db_health_checker_thread.rs b/crates/service/web/storyteller_web/src/threads/db_health_checker_thread/db_health_checker_thread.rs index c49f264602..7b3192bcaa 100644 --- a/crates/service/web/storyteller_web/src/threads/db_health_checker_thread/db_health_checker_thread.rs +++ b/crates/service/web/storyteller_web/src/threads/db_health_checker_thread/db_health_checker_thread.rs @@ -1,6 +1,6 @@ use anyhow::Error; use crate::threads::db_health_checker_thread::db_health_check_status::HealthCheckStatus; -use database_queries::queries::health_check::health_check_query::{health_check_db, HealthCheckResult}; +use mysql_queries::queries::health_check::health_check_query::{health_check_db, HealthCheckResult}; use log::debug; use log::error; use log::info; diff --git a/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs b/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs index 1d3e137fa9..bc56731b2b 100644 --- a/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs +++ b/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs @@ -1,6 +1,6 @@ use actix_helpers::middleware::ip_filter::ip_ban_list::ip_ban_list::IpBanList; use actix_helpers::middleware::ip_filter::ip_ban_list::ip_set::IpSet; -use database_queries::queries::ip_bans::list_ip_bans::list_ip_bans; +use mysql_queries::queries::ip_bans::list_ip_bans::list_ip_bans; use errors::AnyhowResult; use log::{debug, error, info}; use log::warn; diff --git a/crates/service/web/websocket_gateway/Cargo.toml b/crates/service/web/websocket_gateway/Cargo.toml index 8e3ce9b0a0..02cbc1cb01 100644 --- a/crates/service/web/websocket_gateway/Cargo.toml +++ b/crates/service/web/websocket_gateway/Cargo.toml @@ -17,9 +17,9 @@ path = "src/main.rs" # Internal config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } -database_queries = { path = "../../../lib/database_queries" } errors = { path = "../../../lib/errors" } http_server_common = { path = "../../../lib/deprecated/http_server_common" } +mysql_queries = { path = "../../../lib/mysql_queries" } redis_common = { path = "../../../lib/redis_common" } twitch_common = { path = "../../../lib/api_clients/twitch_common" } diff --git a/crates/service/web/websocket_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs b/crates/service/web/websocket_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs index 1b5df8ab83..347313cd7d 100644 --- a/crates/service/web/websocket_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs +++ b/crates/service/web/websocket_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs @@ -11,7 +11,7 @@ use crate::endpoints_ws::obs_gateway_websocket_handler::ResponseType::TtsEvent; use crate::endpoints_ws::threads::redis_pubsub_event_listener_thread::RedisPubsubEventListenerThread; use crate::endpoints_ws::threads::tts_inference_job_token_queue::TtsInferenceJobTokenQueue; use crate::server_state::ObsGatewayServerState; -use database_queries::queries::twitch::twitch_oauth::find::{TwitchOauthTokenFinder, TwitchOauthTokenRecord}; +use mysql_queries::queries::twitch::twitch_oauth::find::{TwitchOauthTokenFinder, TwitchOauthTokenRecord}; use futures_timer::Delay; use futures_util::FutureExt; use http_server_common::error::common_server_error::CommonServerError;