From 5ab2bb47da0f378ad90a404ddfb36dfba8e79bd7 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 22 Mar 2026 13:04:58 -0400 Subject: [PATCH 1/5] begin replacing enums with enums_api --- Cargo.lock | 6 +++--- .../artcraft/artcraft_api_defs/Cargo.toml | 2 +- .../cost_estimate/estimate_image_cost.rs | 8 ++++---- .../cost_estimate/estimate_splat_cost.rs | 4 ++-- .../cost_estimate/estimate_video_cost.rs | 8 ++++---- .../src/jobs/list_session_jobs.rs | 11 +++++------ .../list_batch_generated_media_files.rs | 6 +++--- .../src/moderation/jobs/user/list_user_jobs.rs | 4 ++-- .../user/user_lookup_by_stripe_customer_id.rs | 2 +- .../list_wallet_ledger_entries_by_wallet.rs | 2 +- .../moderator_get_wallet_ledger_entry.rs | 2 +- .../src/moderation/wallets/list_user_wallets.rs | 2 +- .../wallets/moderator_create_wallet_for_user.rs | 2 +- .../moderation/wallets/moderator_get_wallet.rs | 2 +- .../src/prompts/create_prompt.rs | 4 ++-- ...new_user_account_and_subscription_checkout.rs | 2 +- .../create_credits_pack_checkout.rs | 2 +- .../create_subscription_checkout.rs | 2 +- .../customer_portal_switch_plan.rs | 2 +- .../subscriptions/get_session_subscription.rs | 2 +- .../artcraft_api_defs/src/users/session_info.rs | 2 +- .../artcraft/artcraft_client/Cargo.toml | 2 +- .../src/endpoints/credits/get_session_credits.rs | 4 ++-- .../src/endpoints/jobs/list_session_jobs.rs | 4 ++-- .../endpoints/media_files/delete_media_file.rs | 2 +- .../src/endpoints/media_files/get_media_file.rs | 14 +++++++------- .../legacy_upload_media_file_from_file.rs | 16 ++++++++-------- .../upload_image_media_file_from_bytes.rs | 14 +++++++------- .../upload_image_media_file_from_file.rs | 16 ++++++++-------- .../upload_new_engine_asset_from_file.rs | 14 +++++++------- .../upload_video_media_file_from_file.rs | 14 +++++++------- .../subscriptions/get_session_subscription.rs | 4 ++-- crates/api_clients/fakeyou_client/Cargo.toml | 2 +- crates/lib/actix_artcraft/Cargo.toml | 2 +- .../requests/get_request_signup_source_enum.rs | 4 ++-- 35 files changed, 94 insertions(+), 95 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 400d353ddf..896ea7b8a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -339,7 +339,7 @@ dependencies = [ "actix-web", "actix_helpers", "anyhow", - "enums", + "enums_api", "errors", "http_headers", "jwt_signer", @@ -726,7 +726,7 @@ version = "0.0.1" dependencies = [ "anyhow", "chrono", - "enums", + "enums_api", "enums_public", "serde", "serde_derive", @@ -747,7 +747,7 @@ dependencies = [ "chrono", "cloudflare_errors", "cookie 0.18.1", - "enums", + "enums_api", "enums_public", "errors", "log", diff --git a/crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml b/crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml index 31654ea0f2..ad461ce407 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml +++ b/crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml @@ -20,7 +20,7 @@ path = "src/lib.rs" workspace-build-acceleration.workspace = true # Internal -enums.workspace = true +enums_api.workspace = true enums_public.workspace = true tokens.workspace = true diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs index fc5e1ad9c2..58c856b860 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs @@ -1,10 +1,10 @@ use serde::{Deserialize, Serialize}; use utoipa::ToSchema; -use enums::common::generation::common_aspect_ratio::CommonAspectRatio; -use enums::common::generation::common_image_model::CommonImageModel; -use enums::common::generation::common_video_resolution::CommonVideoResolution; -use enums::common::generation_provider::GenerationProvider; +use enums_api::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums_api::common::generation::common_image_model::CommonImageModel; +use enums_api::common::generation::common_video_resolution::CommonVideoResolution; +use enums_api::common::generation::generation_provider::GenerationProvider; pub const ESTIMATE_IMAGE_COST_PATH: &str = "/v1/generate/cost_estimate/image"; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_splat_cost.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_splat_cost.rs index a42355bfe8..8fe1fc3541 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_splat_cost.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_splat_cost.rs @@ -1,8 +1,8 @@ use serde::{Deserialize, Serialize}; use utoipa::ToSchema; -use enums::common::generation::common_splat_model::CommonSplatModel; -use enums::common::generation_provider::GenerationProvider; +use enums_api::common::generation::common_splat_model::CommonSplatModel; +use enums_api::common::generation::generation_provider::GenerationProvider; pub const ESTIMATE_SPLAT_COST_PATH: &str = "/v1/generate/cost_estimate/splat"; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_video_cost.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_video_cost.rs index 32cf88424e..c1f0d1dc12 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_video_cost.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_video_cost.rs @@ -1,10 +1,10 @@ use serde::{Deserialize, Serialize}; use utoipa::ToSchema; -use enums::common::generation::common_aspect_ratio::CommonAspectRatio; -use enums::common::generation::common_video_model::CommonVideoModel; -use enums::common::generation::common_video_resolution::CommonVideoResolution; -use enums::common::generation_provider::GenerationProvider; +use enums_api::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums_api::common::generation::common_video_model::CommonVideoModel; +use enums_api::common::generation::common_video_resolution::CommonVideoResolution; +use enums_api::common::generation::generation_provider::GenerationProvider; pub const ESTIMATE_VIDEO_COST_PATH: &str = "/v1/generate/cost_estimate/video"; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/jobs/list_session_jobs.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/jobs/list_session_jobs.rs index 54abbfc856..d7ff781174 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/jobs/list_session_jobs.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/jobs/list_session_jobs.rs @@ -1,16 +1,15 @@ use crate::common::responses::job_details::{JobDetailsLipsyncRequest, JobDetailsLivePortraitRequest}; use crate::common::responses::media_links::MediaLinks; use chrono::{DateTime, Utc}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_api::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_api::common::job_status_plus::JobStatusPlus; +use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName; use serde::Deserialize; use serde::Serialize; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use utoipa::{IntoParams, ToSchema}; -use enums::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_api_clients::FrontendFailureCategoryForApiClients; -use enums::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_old_clients::FrontendFailureCategoryForOldClients; +use enums_api::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_api_clients::FrontendFailureCategoryForApiClients; +use enums_api::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_old_clients::FrontendFailureCategoryForOldClients; use tokens::tokens::batch_generations::BatchGenerationToken; pub const LIST_SESSION_JOBS_URL_PATH: &str = "/v1/jobs/session"; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs index e49833fde7..6305d316b9 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs @@ -2,9 +2,9 @@ use crate::common::responses::media_file_cover_image_details::MediaFileCoverImag use crate::common::responses::media_links::MediaLinks; use crate::common::responses::user_details_light::UserDetailsLight; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::common::visibility::Visibility; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs index ef9b8e899a..f6d5e3b92f 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs @@ -1,5 +1,5 @@ -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; -use enums::common::job_status_plus::JobStatusPlus; +use enums_api::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_api::common::job_status_plus::JobStatusPlus; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/user_lookup_by_stripe_customer_id.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/user_lookup_by_stripe_customer_id.rs index 46636aa2a1..0c375a4fe7 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/user_lookup_by_stripe_customer_id.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/user_lookup_by_stripe_customer_id.rs @@ -1,4 +1,4 @@ -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::users::UserToken; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs index 2b0d33612e..36770d9b9a 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_api::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry.rs index 49343351e3..b912f6d0c2 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_api::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/list_user_wallets.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/list_user_wallets.rs index fa7ffeda6a..4f58d240dc 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/list_user_wallets.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/list_user_wallets.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::users::UserToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_create_wallet_for_user.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_create_wallet_for_user.rs index 6661ae5828..5075f313b7 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_create_wallet_for_user.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_create_wallet_for_user.rs @@ -1,4 +1,4 @@ -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::users::UserToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_get_wallet.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_get_wallet.rs index f88ad68fe6..ffeb89a47a 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_get_wallet.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_get_wallet.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::users::UserToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/create_prompt.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/create_prompt.rs index 8d58e3d057..7e23ca1a18 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/create_prompt.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/create_prompt.rs @@ -1,8 +1,8 @@ use serde_derive::{Deserialize, Serialize}; use tokens::tokens::prompts::PromptToken; use utoipa::ToSchema; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; +use enums_api::common::generation::generation_provider::GenerationProvider; +use enums_api::common::model_type::ModelType; pub const CREATE_PROMPT_PATH: &str = "/v1/prompts/create"; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_create_new_user_account_and_subscription_checkout.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_create_new_user_account_and_subscription_checkout.rs index 0ebc0aa085..bc1c3e43a9 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_create_new_user_account_and_subscription_checkout.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_create_new_user_account_and_subscription_checkout.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use serde_derive::{Deserialize, Serialize}; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs index 4aed91b671..4ebda49438 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; use serde_derive::{Deserialize, Serialize}; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs index 2d30193d87..df6990cc6c 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use serde_derive::{Deserialize, Serialize}; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/customer_portal_switch_plan.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/customer_portal_switch_plan.rs index f04285f2bd..33e01a0215 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/customer_portal_switch_plan.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/customer_portal_switch_plan.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use serde_derive::{Deserialize, Serialize}; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/subscriptions/get_session_subscription.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/subscriptions/get_session_subscription.rs index aa7a0088dd..365eea29c7 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/subscriptions/get_session_subscription.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/subscriptions/get_session_subscription.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::user_subscriptions::UserSubscriptionToken; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/users/session_info.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/users/session_info.rs index a4baac7c97..ea34194a18 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/users/session_info.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/users/session_info.rs @@ -1,5 +1,5 @@ use crate::common::responses::user_details_light::UserDetailsLight; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_api::by_table::users::user_feature_flag::UserFeatureFlag; use serde_derive::Serialize; use std::collections::BTreeSet; use tokens::tokens::users::UserToken; diff --git a/crates/api_clients/artcraft/artcraft_client/Cargo.toml b/crates/api_clients/artcraft/artcraft_client/Cargo.toml index f3660a06a7..e1700e6fc7 100644 --- a/crates/api_clients/artcraft/artcraft_client/Cargo.toml +++ b/crates/api_clients/artcraft/artcraft_client/Cargo.toml @@ -25,7 +25,7 @@ workspace-build-acceleration.workspace = true # Internal artcraft_api_defs.workspace = true cloudflare_errors.workspace = true -enums.workspace = true +enums_api.workspace = true enums_public.workspace = true errors.workspace = true uuid_utils.workspace = true diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs index 55a4bf7a2c..684ed563f7 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs @@ -3,7 +3,7 @@ use crate::error::storyteller_error::StorytellerError; use crate::utils::api_host::ApiHost; use crate::utils::basic_json_get_request::basic_json_get_request; use artcraft_api_defs::credits::get_session_credits::GetSessionCreditsResponse; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; pub async fn get_session_credits( api_host: &ApiHost, @@ -21,7 +21,7 @@ pub async fn get_session_credits( fn get_url_path(payments_namespace: PaymentsNamespace) -> String { - let payments_namespace = payments_namespace.to_str(); + let payments_namespace = serde_json::to_string(&payments_namespace).unwrap().replace('"', ""); format!("/v1/credits/namespace/{}", payments_namespace) } diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs index accf2a6043..eb7e07381d 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs @@ -3,7 +3,7 @@ use crate::error::storyteller_error::StorytellerError; use crate::utils::api_host::ApiHost; use crate::utils::basic_json_get_request::basic_json_get_request; use artcraft_api_defs::jobs::list_session_jobs::{ListSessionJobsSuccessResponse, LIST_SESSION_JOBS_URL_PATH}; -use enums::common::job_status_plus::JobStatusPlus; +use enums_api::common::job_status_plus::JobStatusPlus; use std::collections::HashSet; #[derive(Clone)] @@ -37,7 +37,7 @@ pub async fn list_session_jobs( fn states_string(states: &HashSet) -> String { states.iter() - .map(|state| state.to_str()) + .map(|state| serde_json::to_string(state).unwrap().replace('"', "")) .collect::>() .join(",") } \ No newline at end of file diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/delete_media_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/delete_media_file.rs index a430ad7eef..f2051ebb2e 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/delete_media_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/delete_media_file.rs @@ -5,7 +5,7 @@ use crate::utils::basic_json_delete_request::basic_json_delete_request; use artcraft_api_defs::common::responses::simple_generic_json_success::SimpleGenericJsonSuccess; use artcraft_api_defs::media_file::delete_media_file::DeleteMediaFileRequest; use artcraft_api_defs::subscriptions::get_session_subscription::GetSessionSubscriptionResponse; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use log::debug; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/get_media_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/get_media_file.rs index d782591e08..45dfac1def 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/get_media_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/get_media_file.rs @@ -8,13 +8,13 @@ use artcraft_api_defs::common::responses::media_links::MediaLinks; use artcraft_api_defs::common::responses::simple_entity_stats::SimpleEntityStats; use artcraft_api_defs::common::responses::user_details_light::UserDetailsLight; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::visibility::Visibility; +use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use log::debug; use serde_derive::Deserialize; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs index 272879a397..c913f708c2 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs @@ -7,14 +7,14 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT}; use crate::utils::filter_bad_response::filter_bad_response; use crate::utils::http_get_anonymous::http_get_anonymous; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::generation_provider::GenerationProvider; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::generation::generation_provider::GenerationProvider; +use enums_api::common::visibility::Visibility; +use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use uuid_utils::uuid::generate_random_uuid; use log::debug; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs index 2128e5021a..cd1530fd2f 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs @@ -7,13 +7,13 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT}; use crate::utils::filter_bad_response::filter_bad_response; use crate::utils::http_get_anonymous::http_get_anonymous; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::visibility::Visibility; +use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use uuid_utils::uuid::generate_random_uuid; use log::debug; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs index 708963cf0e..3c5aa1ee21 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs @@ -7,14 +7,14 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT}; use crate::utils::filter_bad_response::filter_bad_response; use crate::utils::http_get_anonymous::http_get_anonymous; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::generation_provider::GenerationProvider; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::generation::generation_provider::GenerationProvider; +use enums_api::common::visibility::Visibility; +use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use uuid_utils::uuid::generate_random_uuid; use log::debug; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs index 00c72a474a..292cce71f3 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs @@ -5,13 +5,13 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT}; use crate::utils::filter_bad_response::filter_bad_response; use crate::utils::http_get_anonymous::http_get_anonymous; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::visibility::Visibility; +use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use uuid_utils::uuid::generate_random_uuid; use log::debug; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs index 73800f129c..42f0e2e35a 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs @@ -5,13 +5,13 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT}; use crate::utils::filter_bad_response::filter_bad_response; use crate::utils::http_get_anonymous::http_get_anonymous; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::visibility::Visibility; +use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use uuid_utils::uuid::generate_random_uuid; use log::debug; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs index e0fb5b0142..740a1694f1 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs @@ -3,7 +3,7 @@ use crate::error::storyteller_error::StorytellerError; use crate::utils::api_host::ApiHost; use crate::utils::basic_json_get_request::basic_json_get_request; use artcraft_api_defs::subscriptions::get_session_subscription::GetSessionSubscriptionResponse; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use log::debug; pub async fn get_session_subscription( @@ -23,6 +23,6 @@ pub async fn get_session_subscription( } fn get_url_path(payments_namespace: PaymentsNamespace) -> String { - let payments_namespace = payments_namespace.to_str(); + let payments_namespace = serde_json::to_string(&payments_namespace).unwrap().replace('"', ""); format!("/v1/subscriptions/namespace/{}", payments_namespace) } diff --git a/crates/api_clients/fakeyou_client/Cargo.toml b/crates/api_clients/fakeyou_client/Cargo.toml index db62b5d498..410ea6a98e 100644 --- a/crates/api_clients/fakeyou_client/Cargo.toml +++ b/crates/api_clients/fakeyou_client/Cargo.toml @@ -20,7 +20,7 @@ path = "src/lib.rs" workspace-build-acceleration.workspace = true # Internal -enums.workspace = true +enums_api.workspace = true errors.workspace = true tokens.workspace = true diff --git a/crates/lib/actix_artcraft/Cargo.toml b/crates/lib/actix_artcraft/Cargo.toml index a1dec467af..bc2c96453f 100644 --- a/crates/lib/actix_artcraft/Cargo.toml +++ b/crates/lib/actix_artcraft/Cargo.toml @@ -23,7 +23,7 @@ workspace-build-acceleration.workspace = true # Internal actix_helpers.workspace = true jwt_signer.workspace = true -enums.workspace = true +enums_api.workspace = true errors.workspace = true http_headers.workspace = true tokens.workspace = true diff --git a/crates/lib/actix_artcraft/src/requests/get_request_signup_source_enum.rs b/crates/lib/actix_artcraft/src/requests/get_request_signup_source_enum.rs index 55bccfe413..2290e7a3cf 100644 --- a/crates/lib/actix_artcraft/src/requests/get_request_signup_source_enum.rs +++ b/crates/lib/actix_artcraft/src/requests/get_request_signup_source_enum.rs @@ -1,6 +1,6 @@ use actix_helpers::extractors::get_request_origin_uri::get_request_origin_uri; use actix_web::HttpRequest; -use enums::by_table::users::user_signup_source::UserSignupSource; +use enums_api::by_table::users::user_signup_source::UserSignupSource; use log::warn; pub fn get_request_signup_source_enum(http_request: &HttpRequest) -> Option { @@ -52,7 +52,7 @@ mod tests { mod origin_header_enum { use super::*; use crate::requests::get_request_signup_source_enum::get_request_signup_source_enum; - use enums::by_table::users::user_signup_source::UserSignupSource; + use enums_api::by_table::users::user_signup_source::UserSignupSource; #[test] fn artcraft_dot_ai() { From 12254141652d7a09b30f6ebea3aec6450832b5a8 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 22 Mar 2026 13:09:57 -0400 Subject: [PATCH 2/5] fix awkward serde to_json in client code --- .../endpoints/credits/get_session_credits.rs | 2 +- .../src/endpoints/jobs/list_session_jobs.rs | 2 +- .../subscriptions/get_session_subscription.rs | 2 +- .../enums_api/src/common/job_status_plus.rs | 39 +++++++++++++++++++ .../src/common/payments_namespace.rs | 27 +++++++++++++ 5 files changed, 69 insertions(+), 3 deletions(-) diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs index 684ed563f7..d9eb8cfaa6 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs @@ -21,7 +21,7 @@ pub async fn get_session_credits( fn get_url_path(payments_namespace: PaymentsNamespace) -> String { - let payments_namespace = serde_json::to_string(&payments_namespace).unwrap().replace('"', ""); + let payments_namespace = payments_namespace.to_str(); format!("/v1/credits/namespace/{}", payments_namespace) } diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs index eb7e07381d..a6965e7606 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs @@ -37,7 +37,7 @@ pub async fn list_session_jobs( fn states_string(states: &HashSet) -> String { states.iter() - .map(|state| serde_json::to_string(state).unwrap().replace('"', "")) + .map(|state| state.to_str()) .collect::>() .join(",") } \ No newline at end of file diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs index 740a1694f1..4ae988051e 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs @@ -23,6 +23,6 @@ pub async fn get_session_subscription( } fn get_url_path(payments_namespace: PaymentsNamespace) -> String { - let payments_namespace = serde_json::to_string(&payments_namespace).unwrap().replace('"', ""); + let payments_namespace = payments_namespace.to_str(); format!("/v1/subscriptions/namespace/{}", payments_namespace) } diff --git a/crates/schema/public/enums_api/src/common/job_status_plus.rs b/crates/schema/public/enums_api/src/common/job_status_plus.rs index b730e18246..281b716d73 100644 --- a/crates/schema/public/enums_api/src/common/job_status_plus.rs +++ b/crates/schema/public/enums_api/src/common/job_status_plus.rs @@ -24,6 +24,21 @@ pub enum JobStatusPlus { CancelledBySystem, } +impl JobStatusPlus { + pub const fn to_str(&self) -> &'static str { + match self { + Self::Pending => "pending", + Self::Started => "started", + Self::CompleteSuccess => "complete_success", + Self::CompleteFailure => "complete_failure", + Self::AttemptFailed => "attempt_failed", + Self::Dead => "dead", + Self::CancelledByUser => "cancelled_by_user", + Self::CancelledBySystem => "cancelled_by_system", + } + } +} + #[cfg(test)] mod tests { use super::JobStatusPlus; @@ -63,6 +78,30 @@ mod tests { } } + mod to_str_checks { + use super::*; + + #[test] + fn to_str() { + assert_eq!(JobStatusPlus::Pending.to_str(), "pending"); + assert_eq!(JobStatusPlus::Started.to_str(), "started"); + assert_eq!(JobStatusPlus::CompleteSuccess.to_str(), "complete_success"); + assert_eq!(JobStatusPlus::CompleteFailure.to_str(), "complete_failure"); + assert_eq!(JobStatusPlus::AttemptFailed.to_str(), "attempt_failed"); + assert_eq!(JobStatusPlus::Dead.to_str(), "dead"); + assert_eq!(JobStatusPlus::CancelledByUser.to_str(), "cancelled_by_user"); + assert_eq!(JobStatusPlus::CancelledBySystem.to_str(), "cancelled_by_system"); + } + + #[test] + fn to_str_matches_serde() { + for variant in JobStatusPlus::iter() { + let serde_str = serde_json::to_string(&variant).unwrap().replace('"', ""); + assert_eq!(variant.to_str(), serde_str); + } + } + } + mod mechanical_checks { use super::*; diff --git a/crates/schema/public/enums_api/src/common/payments_namespace.rs b/crates/schema/public/enums_api/src/common/payments_namespace.rs index f81d280028..7b85378adb 100644 --- a/crates/schema/public/enums_api/src/common/payments_namespace.rs +++ b/crates/schema/public/enums_api/src/common/payments_namespace.rs @@ -13,6 +13,15 @@ pub enum PaymentsNamespace { FakeYou, } +impl PaymentsNamespace { + pub const fn to_str(&self) -> &'static str { + match self { + Self::Artcraft => "artcraft", + Self::FakeYou => "fakeyou", + } + } +} + #[cfg(test)] mod tests { use super::PaymentsNamespace; @@ -40,6 +49,24 @@ mod tests { } } + mod to_str_checks { + use super::*; + + #[test] + fn to_str() { + assert_eq!(PaymentsNamespace::Artcraft.to_str(), "artcraft"); + assert_eq!(PaymentsNamespace::FakeYou.to_str(), "fakeyou"); + } + + #[test] + fn to_str_matches_serde() { + for variant in PaymentsNamespace::iter() { + let serde_str = serde_json::to_string(&variant).unwrap().replace('"', ""); + assert_eq!(variant.to_str(), serde_str); + } + } + } + mod mechanical_checks { use super::*; From f2b9a9c5f2dd687d36c55224eef19331d2b11940 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 22 Mar 2026 13:35:13 -0400 Subject: [PATCH 3/5] replace of enums with enums_db appears harmless --- Cargo.lock | 30 ++++++------ .../cli/devenv/dev-database-seed/Cargo.toml | 2 +- .../src/seeding/media_files.rs | 4 +- .../src/seeding/model_weights.rs | 4 +- .../src/seeding/seed_media_files.rs | 4 +- .../src/seeding/seed_model_weights.rs | 2 +- .../src/seeding/tts_tacotron2.rs | 4 +- .../src/seeding/voice_conversion.rs | 2 +- .../src/seeding/zero_shot_tts.rs | 12 ++--- .../devenv/dev-upload-media-file/Cargo.toml | 2 +- .../devenv/dev-upload-media-file/src/main.rs | 4 +- crates/cli/production/db-backfill/Cargo.toml | 2 +- crates/cli/production/db-cleanup/Cargo.toml | 2 +- .../delete_all_anonymous_user_images.rs | 4 +- .../delete_user_files/delete_user_files.rs | 2 +- .../production/elasticsearch-cli/Cargo.toml | 2 +- .../production/elasticsearch-cli/src/main.rs | 2 +- ...create_dimensional_media_file_documents.rs | 6 +-- .../test_search_media_files_documents.rs | 2 +- .../create_all_model_weight_documents.rs | 2 +- .../test_search_model_weights_documents.rs | 2 +- .../cli/production/migration-tool/Cargo.toml | 2 +- .../tts_models_to_weights/migrate.rs | 2 +- .../copy_cloud_files.rs | 2 +- .../voice_conversion_to_weights/migrate.rs | 2 +- .../database/elasticsearch_schema/Cargo.toml | 2 +- .../src/documents/media_file_document.rs | 12 ++--- .../src/documents/model_weight_document.rs | 6 +-- .../src/documents/tts_model_document.rs | 2 +- .../src/searches/search_media_files.rs | 12 ++--- .../search_model_weights/predicates.rs | 4 +- .../search_model_weights.rs | 8 ++-- crates/schema/database/migration/Cargo.toml | 2 +- ...s_model_for_enqueue_inference_migration.rs | 6 +-- ...t_tts_model_for_run_inference_migration.rs | 2 +- .../get_tts_model_info_migration.rs | 4 +- .../list_tts_models_for_migration.rs | 2 +- .../list_vc_models_for_migration.rs | 6 +-- .../query_vc_model_for_migration.rs | 8 ++-- .../query_vc_model_info_lite_for_migration.rs | 20 ++++---- .../schema/database/mysql_queries/Cargo.toml | 3 +- .../user_ratings/user_rating_entity.rs | 2 +- .../inner_payloads/gptsovits_payload.rs | 2 +- .../inner_payloads/studio_gen2_payload.rs | 2 +- .../inner_payloads/workflow_payload.rs | 4 +- .../encoded_style_transfer_name.rs | 2 +- .../prompt_args/prompt_inner_payload.rs | 2 +- .../upsert_analytics_app_active_user.rs | 2 +- .../upsert_analytics_app_session.rs | 2 +- .../queries/audit_logs/insert_audit_log.rs | 2 +- .../insert_audit_log_transactional.rs | 2 +- .../beta_keys/get_beta_key_by_value.rs | 4 +- .../beta_keys/insert_batch_beta_keys.rs | 2 +- .../src/queries/beta_keys/list_beta_keys.rs | 4 +- .../queries/comments/comment_entity_token.rs | 2 +- .../src/queries/comments/get_comment.rs | 4 +- .../insert_email_sender_job.rs | 2 +- .../list_available_email_sender_jobs.rs | 4 +- .../entity_stats/stats_entity_token.rs | 6 +-- .../list_available_generic_download_jobs.rs | 11 +++-- .../web/insert_generic_download_job.rs | 4 +- .../fal/get_inference_job_by_fal_id.rs | 16 +++---- ...ert_generic_inference_job_for_fal_queue.rs | 2 +- ...nference_job_for_fal_queue_mock_failure.rs | 6 +-- ...ob_for_fal_queue_with_apriori_job_token.rs | 14 +++--- ...generic_inference_job_successfully_done.rs | 4 +- .../job/count_untried_jobs_of_type.rs | 18 +++---- .../list_available_generic_inference_jobs.rs | 18 +++---- ...generic_inference_job_completely_failed.rs | 2 +- .../job/mark_generic_inference_job_failure.rs | 2 +- ...generic_inference_job_successfully_done.rs | 2 +- .../job/mark_job_failed_by_token.rs | 4 +- ...edance2pro_queue_with_apriori_job_token.rs | 12 ++--- .../list_pending_seedance2pro_jobs.rs | 6 +-- .../web/batch_get_inference_job_status.rs | 14 +++--- .../web/get_inference_job_status.rs | 20 ++++---- .../web/insert_generic_inference_job.rs | 12 ++--- .../generic_inference/web/job_status.rs | 10 ++-- .../web/kill_generic_inference_jobs.rs | 10 ++-- .../web/list_session_jobs.rs | 14 +++--- .../web/list_user_jobs_for_moderation.rs | 8 ++-- ...nference_job_successfully_done_by_token.rs | 2 +- ..._worldlabs_queue_with_apriori_job_token.rs | 12 ++--- .../worldlabs/list_pending_worldlabs_jobs.rs | 6 +-- ...actional_increment_generic_synthetic_id.rs | 2 +- .../insert_media_file_generic.rs | 16 +++---- .../insert_media_file_generic_from_job.rs | 12 ++--- .../media_file_insert_builder.rs | 14 +++--- .../insert_media_file_from_face_fusion.rs | 12 ++--- .../insert_media_file_from_gptsovits.rs | 12 ++--- .../insert_media_file_from_live_portrait.rs | 12 ++--- ...ert_media_file_from_studio_scene_render.rs | 14 +++--- .../insert_media_file_from_cli_tool.rs | 8 ++-- .../insert_media_file_from_comfy_ui.rs | 12 ++--- .../insert_media_file_from_f5_tts.rs | 12 ++--- .../insert_media_file_from_face_animation.rs | 12 ++--- .../insert_media_file_from_file_upload.rs | 16 +++---- .../insert_media_file_from_mocapnet.rs | 10 ++-- .../insert_media_file_from_rerender.rs | 10 ++-- .../insert_media_file_from_seed_vc.rs | 12 ++--- .../insert_media_file_from_studio_gen2.rs | 12 ++--- .../insert_media_file_from_tacotron2.rs | 12 ++--- ...insert_media_file_from_voice_conversion.rs | 12 ++--- .../insert_media_file_from_zero_shot_tts.rs | 10 ++-- .../edit/update_media_file_animation_type.rs | 2 +- .../edit/update_media_file_engine_category.rs | 2 +- .../edit/update_media_file_visibility.rs | 2 +- ...ate_media_file_visibility_transactional.rs | 2 +- .../media_files/get/batch_get_media_files.rs | 22 ++++----- .../get/batch_get_media_files_by_tokens.rs | 22 ++++----- .../queries/media_files/get/get_media_file.rs | 48 +++++++++---------- .../get/get_media_file_for_inference.rs | 8 ++-- .../list_batch_generated_redux_media_files.rs | 18 +++---- .../list/list_featured_media_files.rs | 24 +++++----- .../media_files/list/list_media_files.rs | 24 +++++----- .../list/list_media_files_by_batch_token.rs | 24 +++++----- ...or_elastic_search_backfill_using_cursor.rs | 22 ++++----- .../list/list_media_files_for_user.rs | 24 +++++----- ..._media_files_without_thumbnails_for_job.rs | 2 +- .../upsert_media_file_from_file_upload.rs | 18 +++---- .../media_uploads/get_media_upload_by_uuid.rs | 8 ++-- .../get_media_upload_for_inference.rs | 8 ++-- .../media_uploads/insert_media_upload.rs | 6 +-- ...reverse_list_user_media_uploads_of_type.rs | 8 ++-- .../list_categories_query_builder.rs | 4 +- ...del_weights_for_elastic_search_backfill.rs | 12 ++--- ...ight_from_voice_conversion_download_job.rs | 6 +-- .../model_weights/create/create_weight.rs | 4 +- .../model_weights/edit/update_weight.rs | 2 +- .../queries/model_weights/get/get_weight.rs | 20 ++++---- .../get/get_weight_for_legacy_tts_enqueue.rs | 18 +++---- .../get_weight_for_legacy_tts_inference.rs | 16 +++---- .../get/get_weight_for_legacy_tts_info.rs | 22 ++++----- ...r_legacy_tts_info_with_legacy_tts_token.rs | 22 ++++----- ...l_weight_for_voice_conversion_inference.rs | 4 +- ...st_all_model_weight_tokens_for_backfill.rs | 4 +- ...weight_tokens_for_cached_usage_backfill.rs | 2 +- .../list/list_featured_weights.rs | 8 ++-- .../list_model_weight_tokens_updated_since.rs | 4 +- ...or_elastic_search_backfill_using_cursor.rs | 12 ++--- .../list_model_weights_for_text_to_speech.rs | 8 ++-- ...list_model_weights_for_voice_conversion.rs | 8 ++-- .../list/list_weights_by_tokens.rs | 8 ++-- .../list/list_weights_by_user.rs | 8 ++-- .../list/list_weights_query_builder.rs | 6 +-- .../upsert_model_weight_from_tts_model.rs | 4 +- ...odel_weight_from_voice_conversion_model.rs | 6 +-- .../get_model_weight_info_lite.rs | 4 +- .../list_model_weight_info_lite.rs | 4 +- .../model_weight_info_lite.rs | 2 +- .../src/queries/model_weights/tests.rs | 6 +-- .../insert_batch_prompt_context_items.rs | 2 +- .../list_prompt_context_items.rs | 4 +- .../src/queries/prompts/get_prompt.rs | 12 ++--- .../src/queries/prompts/insert_prompt.rs | 6 +-- .../list_trending_tts_models.rs | 4 +- .../upsert_trending_model_analytics.rs | 4 +- ...t_assigned_tts_categories_query_builder.rs | 4 +- .../list_available_tts_inference_jobs.rs | 16 +++---- .../tts/tts_models/edit_tts_model_details.rs | 2 +- .../queries/tts/tts_models/get_tts_model.rs | 8 ++-- .../tts_models/get_tts_model_for_inference.rs | 4 +- .../get_tts_model_for_inference_improved.rs | 8 ++-- .../insert_tts_model_from_download_job.rs | 4 +- .../queries/tts/tts_models/list_tts_models.rs | 10 ++-- .../list_whole_tts_models_using_cursor.rs | 8 ++-- .../tts/tts_results/edit_tts_result.rs | 2 +- .../list_tts_results_query_builder.rs | 6 +-- .../tts/tts_results/query_tts_result.rs | 2 +- .../create_account_from_email_and_password.rs | 4 +- .../create/create_account_from_google_sso.rs | 4 +- .../create_account_from_stripe_checkout.rs | 4 +- .../user/create/create_account_generic.rs | 4 +- .../user/update/set_user_feature_flags.rs | 2 +- .../set_user_feature_flags_transactional.rs | 2 +- .../batch_get_user_bookmarks.rs | 2 +- .../users/user_bookmarks/get_user_bookmark.rs | 4 +- ...get_user_bookmark_transactional_locking.rs | 6 +-- .../user_bookmarks/list_user_bookmarks.rs | 8 ++-- .../list_user_bookmarks_result.rs | 14 +++--- .../user_bookmark_entity_token.rs | 2 +- .../get_user_profile_by_token.rs | 6 +-- .../get_user_profile_by_username.rs | 6 +-- .../user_ratings/batch_get_user_rating.rs | 4 +- .../users/user_ratings/get_user_rating.rs | 4 +- .../get_user_rating_transactional_locking.rs | 4 +- .../users/user_ratings/upsert_user_rating.rs | 2 +- .../get_user_session_by_token.rs | 6 +-- .../find_user_stripe_customer_link.rs | 4 +- .../upsert_user_stripe_customer_link.rs | 2 +- ...ctive_first_subscription_for_owner_user.rs | 6 +-- .../find_subscription_for_owner_user.rs | 8 ++-- .../list_active_user_subscriptions.rs | 4 +- .../lookup_users_by_stripe_customer_id.rs | 4 +- .../upsert_user_subscription_by_stripe_id.rs | 2 +- ...n_with_invoice_paid_status_by_stripe_id.rs | 2 +- .../src/queries/vocoder/get_vocoder_model.rs | 12 ++--- .../queries/vocoder/insert_vocoder_model.rs | 4 +- .../queries/vocoder/list_vocoder_models.rs | 10 ++-- ...et_voice_conversion_model_for_inference.rs | 4 +- ...le_voice_conversion_models_using_cursor.rs | 8 ++-- .../get_voice_conversion_model_info_lite.rs | 4 +- .../list_voice_conversion_model_info_lite.rs | 4 +- .../model_info_lite/model_info_lite.rs | 2 +- ...oice_conversion_model_from_download_job.rs | 4 +- .../models/list_voice_conversion_models.rs | 12 ++--- .../results/get_voice_conversion_result.rs | 2 +- ...t_voice_conversion_result_for_inference.rs | 2 +- .../results/insert_voice_conversion_result.rs | 2 +- .../voice_designer/datasets/create_dataset.rs | 4 +- .../voice_designer/datasets/get_dataset.rs | 6 +-- .../datasets/list_datasets_by_username.rs | 6 +-- .../voice_designer/datasets/update_dataset.rs | 4 +- .../insert_dataset_sample_and_media_file.rs | 8 ++-- .../list_dataset_samples_for_dataset_token.rs | 6 +-- .../voice_designer/voices/create_voice.rs | 10 ++-- .../voice_designer/voices/get_voice.rs | 6 +-- .../voices/list_voices_by_username.rs | 6 +-- .../voices/list_voices_query_builder.rs | 2 +- .../voice_designer/voices/update_voice.rs | 2 +- .../insert_w2l_inference_job_extended.rs | 2 +- .../w2l_inference_job_queries.rs | 4 +- .../w2l/w2l_results/edit_w2l_result.rs | 2 +- ...ist_w2l_inference_results_query_builder.rs | 6 +-- .../w2l/w2l_results/query_w2l_result.rs | 2 +- .../w2l/w2l_templates/edit_w2l_template.rs | 2 +- .../w2l/w2l_templates/get_w2l_template.rs | 2 +- .../get_wallet_ledger_entry_for_moderation.rs | 4 +- ...rnal_insert_wallet_created_ledger_entry.rs | 2 +- .../internal_insert_wallet_ledger_entry.rs | 2 +- .../list_wallet_ledger_entries_by_wallet.rs | 4 +- .../add_durable_banked_balance_to_wallet.rs | 2 +- ...eate_new_artcraft_wallet_for_owner_user.rs | 2 +- .../create_new_wallet_for_owner_user.rs | 2 +- .../wallets/find_primary_wallet_for_owner.rs | 4 +- .../find_primary_wallet_token_for_owner.rs | 2 +- .../wallets/get_wallet_for_moderation.rs | 4 +- ...ternal_select_wallet_balance_for_update.rs | 4 +- .../list_user_wallets_for_moderation.rs | 4 +- ...efill_monthly_credits_balance_on_wallet.rs | 2 +- .../refund/try_to_refund_ledger_entry.rs | 2 +- .../wallets/refund/wallet_refund_error.rs | 2 +- .../spend/try_to_spend_wallet_balance.rs | 2 +- .../queries/wallets/wallet_update_summary.rs | 2 +- .../schema/database/redis_schema/Cargo.toml | 2 +- .../premium/inner_state/premium_payload.rs | 2 +- .../inner_state/product_by_week_store.rs | 2 +- .../inner_state/product_by_week_subkey.rs | 2 +- .../schema/database/sqlite_queries/Cargo.toml | 2 +- .../news_stories/insert_news_story.rs | 2 +- .../list/list_news_stories_all.rs | 2 +- .../list/list_news_stories_replayable.rs | 2 +- .../insert_news_story_production.rs | 2 +- ...tions_awaiting_audio_final_verification.rs | 16 +++---- ...y_productions_awaiting_audio_generation.rs | 16 +++---- ...s_story_productions_awaiting_greenlight.rs | 16 +++---- ...y_productions_awaiting_image_generation.rs | 16 +++---- ...productions_awaiting_llm_categorization.rs | 16 +++---- ...tory_productions_awaiting_llm_rendition.rs | 16 +++---- ..._productions_awaiting_llm_title_summary.rs | 16 +++---- ..._news_story_productions_ready_for_debut.rs | 16 +++---- .../list/news_story_production_item.rs | 4 +- ...date_news_story_audio_finalized_failure.rs | 2 +- ...date_news_story_audio_finalized_success.rs | 2 +- ...e_news_story_audio_preprocessing_status.rs | 2 +- ...date_news_story_image_generation_status.rs | 2 +- ...te_news_story_llm_categorization_status.rs | 2 +- .../update_news_story_llm_rendition_status.rs | 2 +- ...ate_news_story_llm_title_summary_status.rs | 2 +- ...ate_news_story_post_production_complete.rs | 2 +- ...e_news_story_production_greenlit_status.rs | 4 +- ...list_tts_render_tasks_awaiting_download.rs | 2 +- .../list_tts_render_tasks_awaiting_render.rs | 4 +- .../list_tts_render_tasks_for_story_token.rs | 4 +- .../tts_render_tasks/list/tts_render_task.rs | 2 +- ...tts_render_task_successfully_downloaded.rs | 2 +- ..._tts_render_task_successfully_submitted.rs | 2 +- ...ts_render_task_unsuccessfully_submitted.rs | 4 +- .../insert_web_scraping_target.rs | 6 +-- .../list/list_all_web_scraping_targets.rs | 8 ++-- .../list/list_web_scraping_targets.rs | 8 ++-- .../list/web_scraping_target.rs | 4 +- .../update_web_scraping_target.rs | 2 +- .../schema/database/sqlite_tasks/Cargo.toml | 3 +- .../schema/database/sqlite_tasks/src/error.rs | 12 ++--- .../sqlite_tasks/src/queries/create_task.rs | 10 ++-- ...et_task_by_provider_and_provider_job_id.rs | 10 ++-- .../list_tasks_by_provider_and_status.rs | 10 ++-- .../list_tasks_by_provider_and_tokens.rs | 10 ++-- .../src/queries/list_tasks_for_frontend.rs | 14 +++--- .../database/sqlite_tasks/src/queries/task.rs | 10 ++-- ...te_successful_task_status_with_metadata.rs | 4 +- ...l_task_status_with_metadata_by_provider.rs | 6 +-- .../src/queries/update_task_status.rs | 2 +- .../update_task_status_with_rich_failure.rs | 4 +- .../public/composite_identifiers/Cargo.toml | 2 +- .../by_table/audit_logs/audit_log_entity.rs | 2 +- .../batch_generation_entity.rs | 2 +- .../featured_items/featured_item_entity.rs | 2 +- .../src/by_table/tag_uses/tag_use_entity.rs | 2 +- .../job/deprecated/analytics_job/Cargo.toml | 2 +- .../calculate_old_model_analytics.rs | 2 +- .../job/deprecated/es-update-job/Cargo.toml | 2 +- ...reate_model_weight_document_from_record.rs | 2 +- .../update_engine_media_files.rs | 6 +-- 305 files changed, 998 insertions(+), 993 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 896ea7b8a3..a9d2b0861e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -512,7 +512,7 @@ dependencies = [ "datetimes", "dotenv", "easyenv", - "enums", + "enums_db", "errors", "futures 0.3.32", "hostname 0.4.0", @@ -2373,7 +2373,7 @@ dependencies = [ name = "composite_identifiers" version = "0.0.1" dependencies = [ - "enums", + "enums_db", "serde", "serde_derive", "serde_json", @@ -2971,7 +2971,7 @@ dependencies = [ "datetimes", "dotenv", "easyenv", - "enums", + "enums_db", "errors", "futures 0.3.32", "log", @@ -3005,7 +3005,7 @@ dependencies = [ "clap 4.5.60", "dotenv", "easyenv", - "enums", + "enums_db", "errors", "itertools 0.13.0", "log", @@ -3136,7 +3136,7 @@ dependencies = [ "config", "easyenv", "elasticsearch", - "enums", + "enums_db", "errors", "filesys", "hashing", @@ -3161,7 +3161,7 @@ dependencies = [ "cloud_storage", "config", "easyenv", - "enums", + "enums_db", "errors", "filesys", "log", @@ -3614,7 +3614,7 @@ dependencies = [ "easyenv", "elasticsearch", "elasticsearch_schema", - "enums", + "enums_db", "errors", "log", "mysql_queries", @@ -3636,7 +3636,7 @@ version = "0.0.1" dependencies = [ "chrono", "elasticsearch", - "enums", + "enums_db", "errors", "jsonpath_lib", "log", @@ -3965,7 +3965,7 @@ dependencies = [ "easyenv", "elasticsearch", "elasticsearch_schema", - "enums", + "enums_db", "errors", "futures 0.3.32", "hostname 0.4.0", @@ -6884,7 +6884,7 @@ dependencies = [ "bucket_paths", "chrono", "cloud_storage", - "enums", + "enums_db", "errors", "jobs_common", "mysql_queries", @@ -6908,7 +6908,7 @@ dependencies = [ "cloud_storage", "config", "easyenv", - "enums", + "enums_db", "errors", "filesys", "hashing", @@ -7130,7 +7130,7 @@ dependencies = [ "bucket_paths", "chrono", "composite_identifiers", - "enums", + "enums_db", "errors", "log", "num-traits", @@ -7143,6 +7143,7 @@ dependencies = [ "serde_json", "serial_test", "sqlx", + "strum", "tokens", "tokio", "uuid_utils", @@ -9297,7 +9298,7 @@ name = "redis_schema" version = "0.0.1" dependencies = [ "chrono", - "enums", + "enums_db", "errors", "r2d2", "redis 1.0.2", @@ -10964,7 +10965,8 @@ version = "0.0.1" dependencies = [ "anyhow", "chrono", - "enums", + "enums_db", + "enums_shared", "errors", "log", "once_cell", diff --git a/crates/cli/devenv/dev-database-seed/Cargo.toml b/crates/cli/devenv/dev-database-seed/Cargo.toml index 95d64e1777..b1906ddbd0 100644 --- a/crates/cli/devenv/dev-database-seed/Cargo.toml +++ b/crates/cli/devenv/dev-database-seed/Cargo.toml @@ -24,7 +24,7 @@ bucket_paths.workspace = true cloud_storage.workspace = true config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } -enums.workspace = true +enums_db.workspace = true errors.workspace = true filesys.workspace = true hashing = { path = "../../../lib/files/hashing" } diff --git a/crates/cli/devenv/dev-database-seed/src/seeding/media_files.rs b/crates/cli/devenv/dev-database-seed/src/seeding/media_files.rs index 6ac85b024c..f917a952fb 100644 --- a/crates/cli/devenv/dev-database-seed/src/seeding/media_files.rs +++ b/crates/cli/devenv/dev-database-seed/src/seeding/media_files.rs @@ -3,8 +3,8 @@ use sqlx::{MySql, Pool}; use bucket_paths::legacy::remote_file_manager_paths::media_descriptor::MediaVideoMp4Descriptor; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use errors::{anyhow, AnyhowResult}; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_cli_tool::{insert_media_file_from_cli_tool, InsertArgs}; use mysql_queries::queries::users::user::get::get_user_token_by_username::get_user_token_by_username; diff --git a/crates/cli/devenv/dev-database-seed/src/seeding/model_weights.rs b/crates/cli/devenv/dev-database-seed/src/seeding/model_weights.rs index a55dd80a5e..7499ea27a9 100644 --- a/crates/cli/devenv/dev-database-seed/src/seeding/model_weights.rs +++ b/crates/cli/devenv/dev-database-seed/src/seeding/model_weights.rs @@ -7,11 +7,11 @@ use sqlx::{MySql, Pool}; use bucket_paths::legacy::remote_file_manager_paths::weights_descriptor::{WeightsLoRADescriptor, WeightsSD15Descriptor, WeightsWorkflowDescriptor}; use bucket_paths::legacy::remote_file_manager_paths::remote_cloud_bucket_details::RemoteCloudBucketDetails; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; -use enums::by_table::model_weights::{ +use enums_db::by_table::model_weights::{ weights_category::WeightsCategory, weights_types::WeightsType, }; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::{anyhow, AnyhowResult}; use mysql_queries::queries::model_weights::create::create_weight::{create_weight, CreateModelWeightsArgs}; use mysql_queries::queries::users::user::get::get_user_token_by_username::get_user_token_by_username; diff --git a/crates/cli/devenv/dev-database-seed/src/seeding/seed_media_files.rs b/crates/cli/devenv/dev-database-seed/src/seeding/seed_media_files.rs index 16303901cf..f1bd9b77c1 100644 --- a/crates/cli/devenv/dev-database-seed/src/seeding/seed_media_files.rs +++ b/crates/cli/devenv/dev-database-seed/src/seeding/seed_media_files.rs @@ -4,8 +4,8 @@ use log::{info, warn}; use sqlx::{MySql, Pool}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use filesys::file_read_bytes::file_read_bytes; use filesys::file_size::file_size; diff --git a/crates/cli/devenv/dev-database-seed/src/seeding/seed_model_weights.rs b/crates/cli/devenv/dev-database-seed/src/seeding/seed_model_weights.rs index c202257c98..1d0d6928ad 100644 --- a/crates/cli/devenv/dev-database-seed/src/seeding/seed_model_weights.rs +++ b/crates/cli/devenv/dev-database-seed/src/seeding/seed_model_weights.rs @@ -6,7 +6,7 @@ use rand::Rng; use sqlx::{MySql, Pool}; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath; -use enums::{ +use enums_db::{ by_table::model_weights::{weights_category::WeightsCategory, weights_types::WeightsType}, common::visibility::Visibility, }; diff --git a/crates/cli/devenv/dev-database-seed/src/seeding/tts_tacotron2.rs b/crates/cli/devenv/dev-database-seed/src/seeding/tts_tacotron2.rs index 564b910c3e..7e7e5be08a 100644 --- a/crates/cli/devenv/dev-database-seed/src/seeding/tts_tacotron2.rs +++ b/crates/cli/devenv/dev-database-seed/src/seeding/tts_tacotron2.rs @@ -4,8 +4,8 @@ use log::{info, warn}; use sqlx::{MySql, Pool}; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; -use enums::by_table::tts_models::tts_model_type::TtsModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::tts_models::tts_model_type::TtsModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use filesys::file_read_bytes::file_read_bytes; use filesys::path_to_string::path_to_string; diff --git a/crates/cli/devenv/dev-database-seed/src/seeding/voice_conversion.rs b/crates/cli/devenv/dev-database-seed/src/seeding/voice_conversion.rs index 59f821e6e2..2c01843a05 100644 --- a/crates/cli/devenv/dev-database-seed/src/seeding/voice_conversion.rs +++ b/crates/cli/devenv/dev-database-seed/src/seeding/voice_conversion.rs @@ -1,7 +1,7 @@ use log::info; use sqlx::{MySql, Pool}; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use errors::{anyhow, AnyhowResult}; use mysql_queries::queries::users::user::get::get_user_token_by_username::get_user_token_by_username; use mysql_queries::queries::voice_conversion::models::insert_voice_conversion_model_from_download_job::{insert_voice_conversion_model_from_download_job, InsertVoiceConversionModelArgs}; diff --git a/crates/cli/devenv/dev-database-seed/src/seeding/zero_shot_tts.rs b/crates/cli/devenv/dev-database-seed/src/seeding/zero_shot_tts.rs index c8d61de3ca..451b12b321 100644 --- a/crates/cli/devenv/dev-database-seed/src/seeding/zero_shot_tts.rs +++ b/crates/cli/devenv/dev-database-seed/src/seeding/zero_shot_tts.rs @@ -3,12 +3,12 @@ use sqlx::{MySql, Pool}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::bucket_client::BucketClient; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_uploads::media_upload_type::MediaUploadType; -use enums::by_table::zs_voices::encoding_type::ZsVoiceEncodingType; -use enums::by_table::zs_voices::model_category::ZsVoiceModelCategory; -use enums::by_table::zs_voices::model_type::ZsVoiceModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_uploads::media_upload_type::MediaUploadType; +use enums_db::by_table::zs_voices::encoding_type::ZsVoiceEncodingType; +use enums_db::by_table::zs_voices::model_category::ZsVoiceModelCategory; +use enums_db::by_table::zs_voices::model_type::ZsVoiceModelType; +use enums_db::common::visibility::Visibility; use errors::{anyhow, AnyhowResult}; use filesys::file_read_bytes::file_read_bytes; use uuid_utils::uuid::generate_random_uuid; diff --git a/crates/cli/devenv/dev-upload-media-file/Cargo.toml b/crates/cli/devenv/dev-upload-media-file/Cargo.toml index 4a13592ec5..9daf341311 100644 --- a/crates/cli/devenv/dev-upload-media-file/Cargo.toml +++ b/crates/cli/devenv/dev-upload-media-file/Cargo.toml @@ -24,7 +24,7 @@ bucket_paths.workspace = true cloud_storage.workspace = true config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } -enums.workspace = true +enums_db.workspace = true errors.workspace = true filesys.workspace = true mimetypes.workspace = true diff --git a/crates/cli/devenv/dev-upload-media-file/src/main.rs b/crates/cli/devenv/dev-upload-media-file/src/main.rs index 87b4626ed2..01e219c5af 100644 --- a/crates/cli/devenv/dev-upload-media-file/src/main.rs +++ b/crates/cli/devenv/dev-upload-media-file/src/main.rs @@ -6,8 +6,8 @@ use sqlx::mysql::MySqlPoolOptions; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::bucket_client::BucketClient; use config::shared_constants::{DEFAULT_MYSQL_CONNECTION_STRING, DEFAULT_RUST_LOG}; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use errors::{AnyhowResult, bail}; use filesys::file_read_bytes::file_read_bytes; use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; diff --git a/crates/cli/production/db-backfill/Cargo.toml b/crates/cli/production/db-backfill/Cargo.toml index 4d4329f249..b3aabaaf10 100644 --- a/crates/cli/production/db-backfill/Cargo.toml +++ b/crates/cli/production/db-backfill/Cargo.toml @@ -22,7 +22,7 @@ workspace-build-acceleration = { workspace = true } # Internal datetimes = { path = "../../../lib/data/datetimes" } easyenv = { path = "../../../lib/easyenv" } -enums = { path = "../../../schema/public/enums" } +enums_db.workspace = true errors = { path = "../../../lib/errors" } mysql_queries = { path = "../../../schema/database/mysql_queries" } tokens = { path = "../../../schema/public/tokens" } diff --git a/crates/cli/production/db-cleanup/Cargo.toml b/crates/cli/production/db-cleanup/Cargo.toml index 3bf4dd5ae9..4f6970e2bf 100644 --- a/crates/cli/production/db-cleanup/Cargo.toml +++ b/crates/cli/production/db-cleanup/Cargo.toml @@ -22,7 +22,7 @@ workspace-build-acceleration = { workspace = true } # Internal bucket_paths.workspace = true easyenv = { path = "../../../lib/easyenv" } -enums = { path = "../../../schema/public/enums" } +enums_db.workspace = true errors = { path = "../../../lib/errors" } mysql_queries = { path = "../../../schema/database/mysql_queries" } storyteller_root = { path = "../../../lib/storyteller_root" } diff --git a/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs b/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs index 6e141fa267..5999e4378e 100644 --- a/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs +++ b/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs @@ -5,8 +5,8 @@ use std::time::Duration; use log::info; use sqlx::{MySql, Pool}; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::view_as::ViewAs; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::view_as::ViewAs; use errors::AnyhowResult; use mysql_queries::queries::media_files::delete::delete_media_file::delete_media_file_as_mod; use mysql_queries::queries::media_files::list::list_media_files::{list_media_files, ListMediaFilesArgs}; diff --git a/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs b/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs index 25c3e35ebd..95218c72ae 100644 --- a/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs +++ b/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs @@ -4,7 +4,7 @@ use std::time::Duration; use log::info; use sqlx::{MySql, Pool}; -use enums::common::view_as::ViewAs; +use enums_db::common::view_as::ViewAs; use errors::{anyhow, AnyhowResult}; use mysql_queries::queries::media_files::delete::delete_media_file::delete_media_file_as_mod; use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs}; diff --git a/crates/cli/production/elasticsearch-cli/Cargo.toml b/crates/cli/production/elasticsearch-cli/Cargo.toml index d70c726999..76e43eada2 100644 --- a/crates/cli/production/elasticsearch-cli/Cargo.toml +++ b/crates/cli/production/elasticsearch-cli/Cargo.toml @@ -24,7 +24,7 @@ bucket_paths.workspace = true config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } elasticsearch_schema = { path = "../../../schema/database/elasticsearch_schema" } -enums = { path = "../../../schema/public/enums" } +enums_db.workspace = true errors = { path = "../../../lib/errors" } mysql_queries = { path = "../../../schema/database/mysql_queries" } primitives = { path = "../../../lib/data/primitives" } diff --git a/crates/cli/production/elasticsearch-cli/src/main.rs b/crates/cli/production/elasticsearch-cli/src/main.rs index 29d30b3709..ba6a8e9f38 100644 --- a/crates/cli/production/elasticsearch-cli/src/main.rs +++ b/crates/cli/production/elasticsearch-cli/src/main.rs @@ -16,7 +16,7 @@ use std::iter::FromIterator; use config::shared_constants::DEFAULT_RUST_LOG; use elasticsearch_schema::searches::search_tts_models::search_tts_models; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use crate::cli_args::{parse_cli_args, Action, Environment}; diff --git a/crates/cli/production/elasticsearch-cli/src/plans/media_files/create_dimensional_media_file_documents.rs b/crates/cli/production/elasticsearch-cli/src/plans/media_files/create_dimensional_media_file_documents.rs index 5ad199bf68..e47d769f11 100644 --- a/crates/cli/production/elasticsearch-cli/src/plans/media_files/create_dimensional_media_file_documents.rs +++ b/crates/cli/production/elasticsearch-cli/src/plans/media_files/create_dimensional_media_file_documents.rs @@ -10,9 +10,9 @@ use sqlx::{MySql, Pool}; use elasticsearch_schema::documents::media_file_document::{MEDIA_FILE_INDEX, MediaFileDocument}; use elasticsearch_schema::traits::document::Document; use elasticsearch_schema::utils::create_index_if_not_exists::{create_index_if_not_exists, CreateIndexArgs}; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use mysql_queries::queries::media_files::list::list_media_files_for_elastic_search_backfill_using_cursor::{list_media_files_for_elastic_search_backfill_using_cursor, ListArgs, MediaFileForElasticsearchRecord}; use mysql_queries::queries::model_weights::list::list_model_weights_for_elastic_search_backfill_using_cursor::{list_model_weights_for_elastic_search_backfill_using_cursor, ModelWeightForElasticsearchRecord}; diff --git a/crates/cli/production/elasticsearch-cli/src/plans/media_files/test_search_media_files_documents.rs b/crates/cli/production/elasticsearch-cli/src/plans/media_files/test_search_media_files_documents.rs index 9315a97fbb..d57b4f80e5 100644 --- a/crates/cli/production/elasticsearch-cli/src/plans/media_files/test_search_media_files_documents.rs +++ b/crates/cli/production/elasticsearch-cli/src/plans/media_files/test_search_media_files_documents.rs @@ -4,7 +4,7 @@ use std::iter::FromIterator; use elasticsearch::Elasticsearch; use elasticsearch_schema::searches::search_media_files::{search_media_files, SearchArgs}; -use enums::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; use errors::AnyhowResult; pub async fn test_search_media_files(client: &Elasticsearch) -> AnyhowResult<()> { diff --git a/crates/cli/production/elasticsearch-cli/src/plans/model_weights/create_all_model_weight_documents.rs b/crates/cli/production/elasticsearch-cli/src/plans/model_weights/create_all_model_weight_documents.rs index 054eea7cba..69d8fec2bc 100644 --- a/crates/cli/production/elasticsearch-cli/src/plans/model_weights/create_all_model_weight_documents.rs +++ b/crates/cli/production/elasticsearch-cli/src/plans/model_weights/create_all_model_weight_documents.rs @@ -8,7 +8,7 @@ use sqlx::{MySql, Pool}; use elasticsearch_schema::documents::model_weight_document::{MODEL_WEIGHT_INDEX, ModelWeightDocument}; use elasticsearch_schema::traits::document::Document; use elasticsearch_schema::utils::create_index_if_not_exists::{create_index_if_not_exists, CreateIndexArgs}; -use enums::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; use errors::AnyhowResult; use mysql_queries::queries::model_weights::list::list_model_weights_for_elastic_search_backfill_using_cursor::{list_model_weights_for_elastic_search_backfill_using_cursor, ModelWeightForElasticsearchRecord}; use primitives::numerics::u64_to_i32_saturating::u64_to_i32_saturating; diff --git a/crates/cli/production/elasticsearch-cli/src/plans/model_weights/test_search_model_weights_documents.rs b/crates/cli/production/elasticsearch-cli/src/plans/model_weights/test_search_model_weights_documents.rs index 539560fee7..71e284bf12 100644 --- a/crates/cli/production/elasticsearch-cli/src/plans/model_weights/test_search_model_weights_documents.rs +++ b/crates/cli/production/elasticsearch-cli/src/plans/model_weights/test_search_model_weights_documents.rs @@ -1,7 +1,7 @@ use elasticsearch::Elasticsearch; use elasticsearch_schema::documents::model_weight_document::ModelWeightDocument; use elasticsearch_schema::searches::search_model_weights::search_model_weights::{search_model_weights, ModelWeightsSortDirection, ModelWeightsSortField, SearchArgs}; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use std::collections::HashSet; use std::iter::FromIterator; diff --git a/crates/cli/production/migration-tool/Cargo.toml b/crates/cli/production/migration-tool/Cargo.toml index aaedd34a9a..d478b45994 100644 --- a/crates/cli/production/migration-tool/Cargo.toml +++ b/crates/cli/production/migration-tool/Cargo.toml @@ -24,7 +24,7 @@ bucket_paths.workspace = true cloud_storage.workspace = true config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } -enums.workspace = true +enums_db.workspace = true errors.workspace = true filesys.workspace = true hashing = { path = "../../../lib/files/hashing" } diff --git a/crates/cli/production/migration-tool/src/migrations/tts_models_to_weights/migrate.rs b/crates/cli/production/migration-tool/src/migrations/tts_models_to_weights/migrate.rs index 9d84183325..2442b4e5ff 100644 --- a/crates/cli/production/migration-tool/src/migrations/tts_models_to_weights/migrate.rs +++ b/crates/cli/production/migration-tool/src/migrations/tts_models_to_weights/migrate.rs @@ -4,7 +4,7 @@ use std::time::Duration; use log::{info, warn}; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token; use mysql_queries::queries::model_weights::migration::upsert_model_weight_from_tts_model::{CopiedTtsFileData, upsert_model_weight_from_tts_model}; diff --git a/crates/cli/production/migration-tool/src/migrations/voice_conversion_to_weights/copy_cloud_files.rs b/crates/cli/production/migration-tool/src/migrations/voice_conversion_to_weights/copy_cloud_files.rs index b24d1d722e..d84bffaed7 100644 --- a/crates/cli/production/migration-tool/src/migrations/voice_conversion_to_weights/copy_cloud_files.rs +++ b/crates/cli/production/migration-tool/src/migrations/voice_conversion_to_weights/copy_cloud_files.rs @@ -2,7 +2,7 @@ use tempdir::TempDir; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use errors::{anyhow, AnyhowResult}; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; use filesys::file_deletion::safe_delete_file::safe_delete_file; diff --git a/crates/cli/production/migration-tool/src/migrations/voice_conversion_to_weights/migrate.rs b/crates/cli/production/migration-tool/src/migrations/voice_conversion_to_weights/migrate.rs index 6b359268b6..a26df2481f 100644 --- a/crates/cli/production/migration-tool/src/migrations/voice_conversion_to_weights/migrate.rs +++ b/crates/cli/production/migration-tool/src/migrations/voice_conversion_to_weights/migrate.rs @@ -4,7 +4,7 @@ use std::time::Duration; use log::{info, warn}; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token; use mysql_queries::queries::model_weights::migration::upsert_model_weight_from_voice_conversion_model::{CopiedFileData, upsert_model_weight_from_voice_conversion_model}; diff --git a/crates/schema/database/elasticsearch_schema/Cargo.toml b/crates/schema/database/elasticsearch_schema/Cargo.toml index d2bdcb2b34..032c3df25b 100644 --- a/crates/schema/database/elasticsearch_schema/Cargo.toml +++ b/crates/schema/database/elasticsearch_schema/Cargo.toml @@ -20,7 +20,7 @@ normal = ["workspace-build-acceleration"] workspace-build-acceleration = { workspace = true } # Internal -enums = { workspace = true } +enums_db = { workspace = true } errors = { workspace = true } tokens = { workspace = true } diff --git a/crates/schema/database/elasticsearch_schema/src/documents/media_file_document.rs b/crates/schema/database/elasticsearch_schema/src/documents/media_file_document.rs index d088f75bbc..421c953088 100644 --- a/crates/schema/database/elasticsearch_schema/src/documents/media_file_document.rs +++ b/crates/schema/database/elasticsearch_schema/src/documents/media_file_document.rs @@ -3,12 +3,12 @@ use std::path::PathBuf; use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_subtype::MediaFileSubtype; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_subtype::MediaFileSubtype; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/elasticsearch_schema/src/documents/model_weight_document.rs b/crates/schema/database/elasticsearch_schema/src/documents/model_weight_document.rs index 7bcac69809..a13aa2521b 100644 --- a/crates/schema/database/elasticsearch_schema/src/documents/model_weight_document.rs +++ b/crates/schema/database/elasticsearch_schema/src/documents/model_weight_document.rs @@ -3,9 +3,9 @@ use std::path::PathBuf; use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/elasticsearch_schema/src/documents/tts_model_document.rs b/crates/schema/database/elasticsearch_schema/src/documents/tts_model_document.rs index 90e72999f4..d343717006 100644 --- a/crates/schema/database/elasticsearch_schema/src/documents/tts_model_document.rs +++ b/crates/schema/database/elasticsearch_schema/src/documents/tts_model_document.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use tokens::tokens::tts_models::TtsModelToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/elasticsearch_schema/src/searches/search_media_files.rs b/crates/schema/database/elasticsearch_schema/src/searches/search_media_files.rs index edd519d3b8..057f64950f 100644 --- a/crates/schema/database/elasticsearch_schema/src/searches/search_media_files.rs +++ b/crates/schema/database/elasticsearch_schema/src/searches/search_media_files.rs @@ -4,9 +4,9 @@ use elasticsearch::{Elasticsearch, SearchParts}; use once_cell::sync::Lazy; use serde_json::{json, Value}; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::users::UserToken; @@ -196,9 +196,9 @@ mod tests { use serde_json::Value; - use enums::by_table::media_files::media_file_class::MediaFileClass; - use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; - use enums::by_table::media_files::media_file_type::MediaFileType; + use enums_db::by_table::media_files::media_file_class::MediaFileClass; + use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; + use enums_db::by_table::media_files::media_file_type::MediaFileType; use tokens::tokens::users::UserToken; use crate::searches::search_media_files::{build_query, SearchArgs}; diff --git a/crates/schema/database/elasticsearch_schema/src/searches/search_model_weights/predicates.rs b/crates/schema/database/elasticsearch_schema/src/searches/search_model_weights/predicates.rs index debc6749c5..79ffadade9 100644 --- a/crates/schema/database/elasticsearch_schema/src/searches/search_model_weights/predicates.rs +++ b/crates/schema/database/elasticsearch_schema/src/searches/search_model_weights/predicates.rs @@ -1,7 +1,7 @@ use std::collections::HashSet; use serde_json::{json, Value}; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; use tokens::tokens::users::UserToken; pub fn must_be_not_deleted() -> Value { diff --git a/crates/schema/database/elasticsearch_schema/src/searches/search_model_weights/search_model_weights.rs b/crates/schema/database/elasticsearch_schema/src/searches/search_model_weights/search_model_weights.rs index 0885ac6d61..7529cf7d16 100644 --- a/crates/schema/database/elasticsearch_schema/src/searches/search_model_weights/search_model_weights.rs +++ b/crates/schema/database/elasticsearch_schema/src/searches/search_model_weights/search_model_weights.rs @@ -5,8 +5,8 @@ use log::debug; use once_cell::sync::Lazy; use serde_json::{json, Number, Value}; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use tokens::tokens::users::UserToken; @@ -175,8 +175,8 @@ mod tests { use serde_json::Value; - use enums::by_table::model_weights::weights_category::WeightsCategory; - use enums::by_table::model_weights::weights_types::WeightsType; + use enums_db::by_table::model_weights::weights_category::WeightsCategory; + use enums_db::by_table::model_weights::weights_types::WeightsType; use tokens::tokens::users::UserToken; use crate::searches::search_model_weights::search_model_weights::build_query; diff --git a/crates/schema/database/migration/Cargo.toml b/crates/schema/database/migration/Cargo.toml index d9fd0618fb..42b5bf6dd1 100644 --- a/crates/schema/database/migration/Cargo.toml +++ b/crates/schema/database/migration/Cargo.toml @@ -23,7 +23,7 @@ workspace-build-acceleration.workspace = true # Internal bucket_paths.workspace = true cloud_storage.workspace = true -enums.workspace = true +enums_db.workspace = true errors.workspace = true jobs_common = { path = "../../../lib/jobs_common" } mysql_queries.workspace = true diff --git a/crates/schema/database/migration/src/text_to_speech/get_tts_model_for_enqueue_inference_migration.rs b/crates/schema/database/migration/src/text_to_speech/get_tts_model_for_enqueue_inference_migration.rs index a06871a163..dea2678efe 100644 --- a/crates/schema/database/migration/src/text_to_speech/get_tts_model_for_enqueue_inference_migration.rs +++ b/crates/schema/database/migration/src/text_to_speech/get_tts_model_for_enqueue_inference_migration.rs @@ -2,9 +2,9 @@ use serde_derive::{Deserialize, Serialize}; use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use mysql_queries::queries::model_weights::get::get_weight_for_legacy_tts_enqueue::{get_weight_for_legacy_tts_enqueue_with_connection, ModelWeightForLegacyTtsEnqueue}; use mysql_queries::queries::tts::tts_models::get_tts_model::{get_tts_model_by_token_using_connection, TtsModelRecord}; diff --git a/crates/schema/database/migration/src/text_to_speech/get_tts_model_for_run_inference_migration.rs b/crates/schema/database/migration/src/text_to_speech/get_tts_model_for_run_inference_migration.rs index 479eda724b..f8e4c0b22a 100644 --- a/crates/schema/database/migration/src/text_to_speech/get_tts_model_for_run_inference_migration.rs +++ b/crates/schema/database/migration/src/text_to_speech/get_tts_model_for_run_inference_migration.rs @@ -5,7 +5,7 @@ use sqlx::MySqlPool; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath; -use enums::by_table::tts_models::tts_model_type::TtsModelType; +use enums_db::by_table::tts_models::tts_model_type::TtsModelType; use mysql_queries::queries::model_weights::get::get_weight_for_legacy_tts_inference::{get_weight_for_legacy_tts_inference, ModelWeightForLegacyTtsInference}; use mysql_queries::queries::tts::tts_models::get_tts_model_for_inference_improved::{get_tts_model_for_inference_improved, CustomVocoderFields, TtsModelForInferenceError, TtsModelForInferenceRecord}; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/migration/src/text_to_speech/get_tts_model_info_migration.rs b/crates/schema/database/migration/src/text_to_speech/get_tts_model_info_migration.rs index 8e771f344a..613cefde0b 100644 --- a/crates/schema/database/migration/src/text_to_speech/get_tts_model_info_migration.rs +++ b/crates/schema/database/migration/src/text_to_speech/get_tts_model_info_migration.rs @@ -3,8 +3,8 @@ use serde_derive::{Deserialize, Serialize}; use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::by_table::tts_models::tts_model_type::TtsModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::tts_models::tts_model_type::TtsModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use mysql_queries::column_types::vocoder_type::VocoderType; use mysql_queries::queries::model_weights::get::get_weight_for_legacy_tts_info::{get_weight_for_legacy_tts_info_with_connection, ModelWeightForLegacyTtsInfo}; diff --git a/crates/schema/database/migration/src/text_to_speech/list_tts_models_for_migration.rs b/crates/schema/database/migration/src/text_to_speech/list_tts_models_for_migration.rs index baabd8df48..c7bd81502e 100644 --- a/crates/schema/database/migration/src/text_to_speech/list_tts_models_for_migration.rs +++ b/crates/schema/database/migration/src/text_to_speech/list_tts_models_for_migration.rs @@ -2,7 +2,7 @@ use chrono::{DateTime, Utc}; use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use mysql_queries::queries::model_weights::list::list_model_weights_for_text_to_speech::{list_model_weights_for_text_to_speech, ModelWeightForTts}; use mysql_queries::queries::tts::tts_models::list_tts_models::{list_tts_models_with_connection, TtsModelRecordForList}; diff --git a/crates/schema/database/migration/src/voice_conversion/list_vc_models_for_migration.rs b/crates/schema/database/migration/src/voice_conversion/list_vc_models_for_migration.rs index 043417afba..b38d093b97 100644 --- a/crates/schema/database/migration/src/voice_conversion/list_vc_models_for_migration.rs +++ b/crates/schema/database/migration/src/voice_conversion/list_vc_models_for_migration.rs @@ -2,9 +2,9 @@ use chrono::{DateTime, Utc}; use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use mysql_queries::queries::model_weights::list::list_model_weights_for_voice_conversion::{list_model_weights_for_voice_conversion, ModelWeightForVoiceConversion}; use mysql_queries::queries::voice_conversion::models::list_voice_conversion_models::{list_voice_conversion_models_with_connection, VoiceConversionModelRecordForList}; diff --git a/crates/schema/database/migration/src/voice_conversion/query_vc_model_for_migration.rs b/crates/schema/database/migration/src/voice_conversion/query_vc_model_for_migration.rs index 375ea7e24a..783af72345 100644 --- a/crates/schema/database/migration/src/voice_conversion/query_vc_model_for_migration.rs +++ b/crates/schema/database/migration/src/voice_conversion/query_vc_model_for_migration.rs @@ -4,8 +4,8 @@ use sqlx::MySqlPool; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use jobs_common::semi_persistent_cache_dir::SemiPersistentCacheDir; use mysql_queries::queries::model_weights::inference::get_model_weight_for_voice_conversion_inference::{get_model_weight_for_voice_conversion_inference, ModelWeightError, ModelWeightForVoiceConversionInference}; use mysql_queries::queries::voice_conversion::inference::get_voice_conversion_model_for_inference::{get_voice_conversion_model_for_inference, VoiceConversionModelForInference, VoiceConversionModelForInferenceError}; @@ -219,7 +219,7 @@ mod tests { use std::path::PathBuf; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; - use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; + use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use jobs_common::semi_persistent_cache_dir::SemiPersistentCacheDir; use mysql_queries::queries::voice_conversion::inference::get_voice_conversion_model_for_inference::VoiceConversionModelForInference; use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; @@ -307,7 +307,7 @@ mod tests { use std::path::PathBuf; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; - use enums::by_table::model_weights::weights_types::WeightsType; + use enums_db::by_table::model_weights::weights_types::WeightsType; use jobs_common::semi_persistent_cache_dir::SemiPersistentCacheDir; use mysql_queries::queries::model_weights::inference::get_model_weight_for_voice_conversion_inference::ModelWeightForVoiceConversionInference; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/migration/src/voice_conversion/query_vc_model_info_lite_for_migration.rs b/crates/schema/database/migration/src/voice_conversion/query_vc_model_info_lite_for_migration.rs index 031e49e72f..6688c558d6 100644 --- a/crates/schema/database/migration/src/voice_conversion/query_vc_model_info_lite_for_migration.rs +++ b/crates/schema/database/migration/src/voice_conversion/query_vc_model_info_lite_for_migration.rs @@ -1,10 +1,10 @@ use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use errors::AnyhowResult; use mysql_queries::queries::model_weights::model_weight_info_lite::get_model_weight_info_lite::get_model_weight_info_lite_with_connection; use mysql_queries::queries::model_weights::model_weight_info_lite::model_weight_info_lite::ModelWeightInfoLite; @@ -111,9 +111,9 @@ impl VcModelLite { mod tests { mod legacy_voice_conversion_models { - use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; - use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; - use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; + use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; + use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; + use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use mysql_queries::queries::voice_conversion::model_info_lite::model_info_lite::VoiceConversionModelInfoLite; use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; @@ -165,9 +165,9 @@ mod tests { } mod new_model_weights { - use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; - use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; - use enums::by_table::model_weights::weights_types::WeightsType; + use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; + use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; + use enums_db::by_table::model_weights::weights_types::WeightsType; use mysql_queries::queries::model_weights::model_weight_info_lite::model_weight_info_lite::ModelWeightInfoLite; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/mysql_queries/Cargo.toml b/crates/schema/database/mysql_queries/Cargo.toml index 6841c9dbb0..1d5e152336 100644 --- a/crates/schema/database/mysql_queries/Cargo.toml +++ b/crates/schema/database/mysql_queries/Cargo.toml @@ -22,8 +22,9 @@ workspace-build-acceleration.workspace = true # Internal bucket_paths.workspace = true composite_identifiers = { path = "../../../schema/public/composite_identifiers" } -enums = { workspace = true, features = ["database"] } +enums_db.workspace = true errors.workspace = true +strum.workspace = true uuid_utils.workspace = true reusable_types = { path = "../../../schema/public/reusable_types" } tokens = { workspace = true, features = ["database"] } diff --git a/crates/schema/database/mysql_queries/src/composite_keys/by_table/user_ratings/user_rating_entity.rs b/crates/schema/database/mysql_queries/src/composite_keys/by_table/user_ratings/user_rating_entity.rs index 305574d170..6a646c0c15 100644 --- a/crates/schema/database/mysql_queries/src/composite_keys/by_table/user_ratings/user_rating_entity.rs +++ b/crates/schema/database/mysql_queries/src/composite_keys/by_table/user_ratings/user_rating_entity.rs @@ -1,4 +1,4 @@ -use enums::by_table::user_ratings::entity_type::UserRatingEntityType; +use enums_db::by_table::user_ratings::entity_type::UserRatingEntityType; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::tts_models::TtsModelToken; diff --git a/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/gptsovits_payload.rs b/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/gptsovits_payload.rs index a6d26d90d9..f515c18d63 100644 --- a/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/gptsovits_payload.rs +++ b/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/gptsovits_payload.rs @@ -1,4 +1,4 @@ -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)] pub struct GptSovitsPayload { diff --git a/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/studio_gen2_payload.rs b/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/studio_gen2_payload.rs index ae23cf355a..383b92fd71 100644 --- a/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/studio_gen2_payload.rs +++ b/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/studio_gen2_payload.rs @@ -1,5 +1,5 @@ use crate::payloads::generic_inference_args::common::watermark_type::WatermarkType; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use std::time::Duration; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/workflow_payload.rs b/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/workflow_payload.rs index 4ab8c310ab..084cc11b65 100644 --- a/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/workflow_payload.rs +++ b/crates/schema/database/mysql_queries/src/payloads/generic_inference_args/inner_payloads/workflow_payload.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_db::common::visibility::Visibility; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/mysql_queries/src/payloads/prompt_args/encoded_style_transfer_name.rs b/crates/schema/database/mysql_queries/src/payloads/prompt_args/encoded_style_transfer_name.rs index 933579dffb..2218b7857c 100644 --- a/crates/schema/database/mysql_queries/src/payloads/prompt_args/encoded_style_transfer_name.rs +++ b/crates/schema/database/mysql_queries/src/payloads/prompt_args/encoded_style_transfer_name.rs @@ -1,4 +1,4 @@ -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; /// We encode the style name as a string so that we don't accidentally break /// forward/reverse compatibility as we remove styles. diff --git a/crates/schema/database/mysql_queries/src/payloads/prompt_args/prompt_inner_payload.rs b/crates/schema/database/mysql_queries/src/payloads/prompt_args/prompt_inner_payload.rs index 5a3320221f..ebb02b0de0 100644 --- a/crates/schema/database/mysql_queries/src/payloads/prompt_args/prompt_inner_payload.rs +++ b/crates/schema/database/mysql_queries/src/payloads/prompt_args/prompt_inner_payload.rs @@ -1,6 +1,6 @@ use chrono::Duration; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/analytics_active_users/upsert_analytics_app_active_user.rs b/crates/schema/database/mysql_queries/src/queries/analytics_active_users/upsert_analytics_app_active_user.rs index e1ac0a6218..9f43be75ad 100644 --- a/crates/schema/database/mysql_queries/src/queries/analytics_active_users/upsert_analytics_app_active_user.rs +++ b/crates/schema/database/mysql_queries/src/queries/analytics_active_users/upsert_analytics_app_active_user.rs @@ -1,6 +1,6 @@ use crate::errors::mysql_error::MysqlError; use crate::errors::subtypes::upsert_error::UpsertError; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use sqlx::mysql::MySqlArguments; use sqlx::pool::PoolConnection; use sqlx::query::Query; diff --git a/crates/schema/database/mysql_queries/src/queries/analytics_active_users/upsert_analytics_app_session.rs b/crates/schema/database/mysql_queries/src/queries/analytics_active_users/upsert_analytics_app_session.rs index ecacda881c..aac1f84670 100644 --- a/crates/schema/database/mysql_queries/src/queries/analytics_active_users/upsert_analytics_app_session.rs +++ b/crates/schema/database/mysql_queries/src/queries/analytics_active_users/upsert_analytics_app_session.rs @@ -1,6 +1,6 @@ use crate::errors::mysql_error::MysqlError; use crate::errors::subtypes::upsert_error::UpsertError; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use sqlx::mysql::MySqlArguments; use sqlx::pool::PoolConnection; use sqlx::query::Query; diff --git a/crates/schema/database/mysql_queries/src/queries/audit_logs/insert_audit_log.rs b/crates/schema/database/mysql_queries/src/queries/audit_logs/insert_audit_log.rs index 33e497ed03..e107ec4fd6 100644 --- a/crates/schema/database/mysql_queries/src/queries/audit_logs/insert_audit_log.rs +++ b/crates/schema/database/mysql_queries/src/queries/audit_logs/insert_audit_log.rs @@ -6,7 +6,7 @@ use anyhow::anyhow; use sqlx::{Executor, MySql}; use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity; -use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; +use enums_db::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::audit_logs::AuditLogToken; diff --git a/crates/schema/database/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs b/crates/schema/database/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs index 1d0c8fb282..6ff4e763b9 100644 --- a/crates/schema/database/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs +++ b/crates/schema/database/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs @@ -4,7 +4,7 @@ use anyhow::anyhow; use sqlx::{MySql, Transaction}; use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity; -use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; +use enums_db::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::audit_logs::AuditLogToken; diff --git a/crates/schema/database/mysql_queries/src/queries/beta_keys/get_beta_key_by_value.rs b/crates/schema/database/mysql_queries/src/queries/beta_keys/get_beta_key_by_value.rs index 67c3911909..a8ad78d351 100644 --- a/crates/schema/database/mysql_queries/src/queries/beta_keys/get_beta_key_by_value.rs +++ b/crates/schema/database/mysql_queries/src/queries/beta_keys/get_beta_key_by_value.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::{Executor, MySql}; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; +use enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct; use errors::AnyhowResult; use tokens::tokens::beta_keys::BetaKeyToken; use tokens::tokens::users::UserToken; @@ -41,7 +41,7 @@ pub async fn get_beta_key_by_value<'e, 'c, E>( SELECT b.token as `token: tokens::tokens::beta_keys::BetaKeyToken`, - b.product as `product: enums::by_table::beta_keys::beta_key_product::BetaKeyProduct`, + b.product as `product: enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct`, b.key_value, b.maybe_referrer_user_token as `maybe_referrer_user_token: tokens::tokens::users::UserToken`, diff --git a/crates/schema/database/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs b/crates/schema/database/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs index 6d3197d6aa..efde32a25a 100644 --- a/crates/schema/database/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs +++ b/crates/schema/database/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs @@ -3,7 +3,7 @@ use log::error; use sqlx::{MySqlPool, QueryBuilder}; use composite_identifiers::by_table::batch_generations::batch_generation_entity::BatchGenerationEntity; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; +use enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct; use errors::AnyhowResult; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::beta_keys::BetaKeyToken; diff --git a/crates/schema/database/mysql_queries/src/queries/beta_keys/list_beta_keys.rs b/crates/schema/database/mysql_queries/src/queries/beta_keys/list_beta_keys.rs index d607453239..5c5497a5db 100644 --- a/crates/schema/database/mysql_queries/src/queries/beta_keys/list_beta_keys.rs +++ b/crates/schema/database/mysql_queries/src/queries/beta_keys/list_beta_keys.rs @@ -3,8 +3,8 @@ use log::info; use sqlx::{Execute, FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct; +use enums_db::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::beta_keys::BetaKeyToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/comments/comment_entity_token.rs b/crates/schema/database/mysql_queries/src/queries/comments/comment_entity_token.rs index 9535131ed0..1913bdd24c 100644 --- a/crates/schema/database/mysql_queries/src/queries/comments/comment_entity_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/comments/comment_entity_token.rs @@ -1,4 +1,4 @@ -use enums::by_table::comments::comment_entity_type::CommentEntityType; +use enums_db::by_table::comments::comment_entity_type::CommentEntityType; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::tts_models::TtsModelToken; diff --git a/crates/schema/database/mysql_queries/src/queries/comments/get_comment.rs b/crates/schema/database/mysql_queries/src/queries/comments/get_comment.rs index 5762c460a7..881593100f 100644 --- a/crates/schema/database/mysql_queries/src/queries/comments/get_comment.rs +++ b/crates/schema/database/mysql_queries/src/queries/comments/get_comment.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::{Executor, MySql}; -use enums::by_table::comments::comment_entity_type::CommentEntityType; +use enums_db::by_table::comments::comment_entity_type::CommentEntityType; use errors::AnyhowResult; use tokens::tokens::comments::CommentToken; use tokens::tokens::users::UserToken; @@ -50,7 +50,7 @@ pub async fn get_comment<'e, 'c, E>( SELECT c.token as `token: tokens::tokens::comments::CommentToken`, - c.entity_type as `entity_type: enums::by_table::comments::comment_entity_type::CommentEntityType`, + c.entity_type as `entity_type: enums_db::by_table::comments::comment_entity_type::CommentEntityType`, c.entity_token, c.user_token as `user_token: tokens::tokens::users::UserToken`, diff --git a/crates/schema/database/mysql_queries/src/queries/email_sender_jobs/insert_email_sender_job.rs b/crates/schema/database/mysql_queries/src/queries/email_sender_jobs/insert_email_sender_job.rs index b54718b211..65d9794e73 100644 --- a/crates/schema/database/mysql_queries/src/queries/email_sender_jobs/insert_email_sender_job.rs +++ b/crates/schema/database/mysql_queries/src/queries/email_sender_jobs/insert_email_sender_job.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::email_sender_jobs::email_category::EmailCategory; +use enums_db::by_table::email_sender_jobs::email_category::EmailCategory; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::email_sender_job_token::EmailSenderJobToken; diff --git a/crates/schema/database/mysql_queries/src/queries/email_sender_jobs/list_available_email_sender_jobs.rs b/crates/schema/database/mysql_queries/src/queries/email_sender_jobs/list_available_email_sender_jobs.rs index 8420295eb5..7a43a8d1ec 100644 --- a/crates/schema/database/mysql_queries/src/queries/email_sender_jobs/list_available_email_sender_jobs.rs +++ b/crates/schema/database/mysql_queries/src/queries/email_sender_jobs/list_available_email_sender_jobs.rs @@ -2,8 +2,8 @@ use anyhow::anyhow; use chrono::Utc; use sqlx::MySqlPool; -use enums::by_table::email_sender_jobs::email_category::EmailCategory; -use enums::common::job_status_plus::JobStatusPlus; +use enums_db::by_table::email_sender_jobs::email_category::EmailCategory; +use enums_db::common::job_status_plus::JobStatusPlus; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::email_sender_job_token::EmailSenderJobToken; diff --git a/crates/schema/database/mysql_queries/src/queries/entity_stats/stats_entity_token.rs b/crates/schema/database/mysql_queries/src/queries/entity_stats/stats_entity_token.rs index 27347edbed..9976bb9d9d 100644 --- a/crates/schema/database/mysql_queries/src/queries/entity_stats/stats_entity_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/entity_stats/stats_entity_token.rs @@ -1,6 +1,6 @@ -use enums::by_table::entity_stats::stats_entity_type::StatsEntityType; -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; -use enums::by_table::user_ratings::entity_type::UserRatingEntityType; +use enums_db::by_table::entity_stats::stats_entity_type::StatsEntityType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::by_table::user_ratings::entity_type::UserRatingEntityType; use tokens::tokens::comments::CommentToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs b/crates/schema/database/mysql_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs index b836adfbc5..3144cbf908 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs @@ -1,11 +1,12 @@ use std::collections::BTreeSet; use chrono::Utc; +use strum::IntoEnumIterator; use sqlx::MySqlPool; -use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; -use enums::common::job_status::JobStatus; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; +use enums_db::common::job_status::JobStatus; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::generic_download_jobs::DownloadJobToken; use tokens::tokens::users::UserToken; @@ -44,7 +45,7 @@ pub async fn list_available_generic_download_jobs( { let download_types = maybe_scoped_download_types .map(|types| types.clone()) - .unwrap_or(GenericDownloadType::all_variants()); // NB: All model types + .unwrap_or_else(|| GenericDownloadType::iter().collect()); // NB: All model types // NB/TODO(bt,2023-07-20): Non-statically typed SQL can't do type annotations AFAIK let mut query = String::from(r#" @@ -166,7 +167,7 @@ struct AvailableDownloadJobRawInternal { mod tests { use std::collections::BTreeSet; - use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; + use enums_db::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; use crate::queries::generic_download::job::list_available_generic_download_jobs::download_type_clause; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_download/web/insert_generic_download_job.rs b/crates/schema/database/mysql_queries/src/queries/generic_download/web/insert_generic_download_job.rs index c08ac752ba..55ce36769f 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_download/web/insert_generic_download_job.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_download/web/insert_generic_download_job.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::generic_download_jobs::DownloadJobToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/get_inference_job_by_fal_id.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/get_inference_job_by_fal_id.rs index 9203d30032..738e6bfc8c 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/get_inference_job_by_fal_id.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/get_inference_job_by_fal_id.rs @@ -4,12 +4,12 @@ use log::warn; use sqlx::pool::PoolConnection; use sqlx::{MySql, MySqlPool}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; -use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; -use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; +use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; @@ -83,9 +83,9 @@ pub async fn get_inference_job_by_fal_id_from_connection(fal_id: &str, mysql_con SELECT jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`, - jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`, + jobs.status as `status: enums_db::common::job_status_plus::JobStatusPlus`, - jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`, + jobs.maybe_external_third_party as `external_third_party: enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`, jobs.maybe_external_third_party_id as `external_third_party_id`, jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`, diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue.rs index e5ff24007d..080b71a824 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue.rs @@ -1,7 +1,7 @@ use sqlx::{Executor, MySql}; use std::marker::PhantomData; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::prompts::PromptToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue_mock_failure.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue_mock_failure.rs index c199e3ab3e..e4d9994075 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue_mock_failure.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue_mock_failure.rs @@ -2,9 +2,9 @@ use uuid_utils::uuid::generate_random_uuid; use sqlx::{Executor, MySql}; use std::marker::PhantomData; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::common::job_status_plus::JobStatusPlus; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::common::visibility::Visibility; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::prompts::PromptToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue_with_apriori_job_token.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue_with_apriori_job_token.rs index 3c130fa5ab..db5fab1cb7 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue_with_apriori_job_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/insert_generic_inference_job_for_fal_queue_with_apriori_job_token.rs @@ -4,13 +4,13 @@ use sqlx::MySqlPool; use sqlx::{Executor, MySql}; use std::marker::PhantomData; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; -use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::common::job_status_plus::JobStatusPlus; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; +use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::common::visibility::Visibility; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::prompts::PromptToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/mark_fal_generic_inference_job_successfully_done.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/mark_fal_generic_inference_job_successfully_done.rs index 7a522e3102..e3b974e92d 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/mark_fal_generic_inference_job_successfully_done.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/mark_fal_generic_inference_job_successfully_done.rs @@ -2,8 +2,8 @@ use anyhow::anyhow; use sqlx::{Executor, MySql}; use std::marker::PhantomData; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -use enums::common::job_status_plus::JobStatusPlus; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::common::job_status_plus::JobStatusPlus; use errors::AnyhowResult; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/count_untried_jobs_of_type.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/count_untried_jobs_of_type.rs index 919b93d58e..6b9664f39c 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/count_untried_jobs_of_type.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/count_untried_jobs_of_type.rs @@ -4,12 +4,12 @@ use anyhow::anyhow; use chrono::Utc; use sqlx::MySqlPool; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; -use enums::common::job_status_plus::JobStatusPlus; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; @@ -157,9 +157,9 @@ fn inference_category_predicate(categories: &BTreeSet) -> Str mod tests { use std::collections::BTreeSet; - use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; - use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; - use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; + use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; + use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; + use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use crate::queries::generic_inference::job::count_untried_jobs_of_type::{inference_category_predicate, job_type_predicate, model_type_predicate}; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs index 380d53b3f1..860306cf48 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs @@ -5,12 +5,12 @@ use chrono::Utc; use log::debug; use sqlx::MySqlPool; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; -use enums::common::job_status_plus::JobStatusPlus; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; @@ -412,9 +412,9 @@ fn inference_category_predicate(categories: &BTreeSet) -> Str mod tests { use std::collections::BTreeSet; - use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; - use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; - use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; + use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; + use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; + use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use crate::queries::generic_inference::job::list_available_generic_inference_jobs::{inference_category_predicate, job_type_predicate, model_type_predicate}; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs index 1b3907ec56..b00870206b 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; use errors::AnyhowResult; use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs index 5a3ea2fb6d..2b5a184f15 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; use errors::AnyhowResult; use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs index 31f2c634b2..430e4c1f62 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs @@ -3,7 +3,7 @@ use std::time::Duration; use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use errors::AnyhowResult; use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_job_failed_by_token.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_job_failed_by_token.rs index 0e17d212e9..30a6a9c5e4 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_job_failed_by_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/mark_job_failed_by_token.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::common::job_status_plus::JobStatusPlus; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::common::job_status_plus::JobStatusPlus; use errors::AnyhowResult; use tokens::tokens::generic_inference_jobs::InferenceJobToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/seedance2pro/insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/seedance2pro/insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token.rs index fd7ae6bd20..aa0c1ca4e3 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/seedance2pro/insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/seedance2pro/insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token.rs @@ -3,12 +3,12 @@ use log::info; use sqlx::{Executor, MySql}; use std::marker::PhantomData; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; -use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::common::job_status_plus::JobStatusPlus; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; +use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::common::visibility::Visibility; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::prompts::PromptToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/seedance2pro/list_pending_seedance2pro_jobs.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/seedance2pro/list_pending_seedance2pro_jobs.rs index fdc4ae062d..4a1001b7ac 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/seedance2pro/list_pending_seedance2pro_jobs.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/seedance2pro/list_pending_seedance2pro_jobs.rs @@ -2,8 +2,8 @@ use anyhow::anyhow; use log::warn; use sqlx::MySqlPool; -use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; @@ -52,7 +52,7 @@ SELECT jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`, jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`, jobs.creator_ip_address, - jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + jobs.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`, jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken` diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/batch_get_inference_job_status.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/batch_get_inference_job_status.rs index b9852716a3..b8e021567c 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/batch_get_inference_job_status.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/batch_get_inference_job_status.rs @@ -4,11 +4,11 @@ use sqlx::mysql::MySqlRow; use sqlx::pool::PoolConnection; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; -use enums::common::job_status_plus::JobStatusPlus; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; @@ -337,8 +337,8 @@ struct RawGenericInferenceJobStatus { // cannot have type hints, eg. the following: // // m.token as `token: tokens::tokens::media_files::MediaFileToken`, -// m.origin_category as `origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`, -// m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, +// m.origin_category as `origin_category: enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`, +// m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, // // This results in the automatic mapping not being able to be found by name (for macro derive), and // in the manual case `row.try_get()` etc. won't have the correct column name (since the name is the diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs index 0ab944ad06..2a6f2ae5d1 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs @@ -4,11 +4,11 @@ use log::warn; use sqlx::pool::PoolConnection; use sqlx::{MySql, MySqlPool}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; -use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; @@ -44,21 +44,21 @@ pub async fn get_inference_job_status_from_connection(job_token: &InferenceJobTo SELECT jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`, - jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`, + jobs.status as `status: enums_db::common::job_status_plus::JobStatusPlus`, jobs.attempt_count, jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`, jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`, jobs.creator_ip_address, - jobs.product_category as `product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`, - jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`, + jobs.product_category as `product_category: enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`, + jobs.inference_category as `inference_category: enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory`, jobs.maybe_model_type, jobs.maybe_model_token, jobs.maybe_raw_inference_text, jobs.maybe_inference_args, - jobs.frontend_failure_category as `maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`, + jobs.frontend_failure_category as `maybe_frontend_failure_category: enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`, jobs.failure_reason, jobs.on_success_result_entity_type as maybe_result_entity_type, @@ -309,7 +309,7 @@ struct RawGenericInferenceJobStatus { #[cfg(test)] mod tests { - use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; + use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; use crate::queries::generic_inference::web::get_inference_job_status::{raw_record_to_public_result, RawGenericInferenceJobStatus}; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs index a55ebfeb9f..31ba0dc02b 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/insert_generic_inference_job.rs @@ -2,12 +2,12 @@ use anyhow::anyhow; use sqlx::error::DatabaseError; use sqlx::MySqlPool; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; -use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; +use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; +use enums_db::common::visibility::Visibility; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/job_status.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/job_status.rs index 72181cefa7..bfcde527dc 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/job_status.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/job_status.rs @@ -1,10 +1,10 @@ use chrono::{DateTime, Utc}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; -use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/kill_generic_inference_jobs.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/kill_generic_inference_jobs.rs index 5ac8ae9155..7b6fdb6fa5 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/kill_generic_inference_jobs.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/kill_generic_inference_jobs.rs @@ -3,9 +3,9 @@ use std::collections::HashSet; use anyhow::anyhow; use sqlx::{MySql, MySqlPool, QueryBuilder}; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; -use enums::common::job_status::JobStatus; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; +use enums_db::common::job_status::JobStatus; use errors::AnyhowResult; /// Only certain job statuses should be modified. @@ -107,8 +107,8 @@ mod tests { use regex::Regex; - use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; - use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; + use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; + use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use crate::queries::generic_inference::web::kill_generic_inference_jobs::{KillableStatus, KillableTarget, query_builder}; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_session_jobs.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_session_jobs.rs index 8dfada1e25..543dee1798 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_session_jobs.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_session_jobs.rs @@ -6,11 +6,11 @@ use sqlx::mysql::MySqlRow; use sqlx::pool::PoolConnection; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; -use enums::common::job_status_plus::JobStatusPlus; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; @@ -403,8 +403,8 @@ struct RawGenericInferenceJobStatus { // cannot have type hints, eg. the following: // // m.token as `token: tokens::tokens::media_files::MediaFileToken`, -// m.origin_category as `origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`, -// m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, +// m.origin_category as `origin_category: enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`, +// m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, // // This results in the automatic mapping not being able to be found by name (for macro derive), and // in the manual case `row.try_get()` etc. won't have the correct column name (since the name is the diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_user_jobs_for_moderation.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_user_jobs_for_moderation.rs index 6827d9592c..3c98a70db1 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_user_jobs_for_moderation.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_user_jobs_for_moderation.rs @@ -2,8 +2,8 @@ use anyhow::anyhow; use log::warn; use sqlx::MySqlPool; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; -use enums::common::job_status_plus::JobStatusPlus; +use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_db::common::job_status_plus::JobStatusPlus; use errors::AnyhowResult; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; @@ -29,14 +29,14 @@ pub async fn list_user_jobs_for_moderation( UserJobForModerationResult, r#" SELECT - j.status as `job_status: enums::common::job_status_plus::JobStatusPlus`, + j.status as `job_status: enums_db::common::job_status_plus::JobStatusPlus`, j.failure_reason as job_failure_reason, wle.credits_delta, wle.maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`, j.on_success_result_entity_token as `on_success_result_media_token: tokens::tokens::media_files::MediaFileToken`, j.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`, wle.token as `wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`, - wle.entry_type as `wallet_ledger_entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType` + wle.entry_type as `wallet_ledger_entry_type: enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType` FROM generic_inference_jobs as j LEFT OUTER JOIN users as u ON j.maybe_creator_user_token = u.token diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/mark_generic_inference_job_successfully_done_by_token.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/mark_generic_inference_job_successfully_done_by_token.rs index 3b192321f3..4babb23dbd 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/mark_generic_inference_job_successfully_done_by_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/mark_generic_inference_job_successfully_done_by_token.rs @@ -3,7 +3,7 @@ use std::time::Duration; use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use errors::AnyhowResult; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/worldlabs/insert_generic_inference_job_for_worldlabs_queue_with_apriori_job_token.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/worldlabs/insert_generic_inference_job_for_worldlabs_queue_with_apriori_job_token.rs index 25e53bab8e..d7516ced15 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/worldlabs/insert_generic_inference_job_for_worldlabs_queue_with_apriori_job_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/worldlabs/insert_generic_inference_job_for_worldlabs_queue_with_apriori_job_token.rs @@ -3,12 +3,12 @@ use log::info; use sqlx::{Executor, MySql}; use std::marker::PhantomData; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; -use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -use enums::common::job_status_plus::JobStatusPlus; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; +use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::common::visibility::Visibility; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::prompts::PromptToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/worldlabs/list_pending_worldlabs_jobs.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/worldlabs/list_pending_worldlabs_jobs.rs index e3e9899e40..b6757b3436 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/worldlabs/list_pending_worldlabs_jobs.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/worldlabs/list_pending_worldlabs_jobs.rs @@ -2,8 +2,8 @@ use anyhow::anyhow; use log::warn; use sqlx::MySqlPool; -use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; @@ -52,7 +52,7 @@ SELECT jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`, jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`, jobs.creator_ip_address, - jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + jobs.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`, jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken` diff --git a/crates/schema/database/mysql_queries/src/queries/generic_synthetic_ids/transactional_increment_generic_synthetic_id.rs b/crates/schema/database/mysql_queries/src/queries/generic_synthetic_ids/transactional_increment_generic_synthetic_id.rs index 0ccb8cdabb..866c12b55b 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_synthetic_ids/transactional_increment_generic_synthetic_id.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_synthetic_ids/transactional_increment_generic_synthetic_id.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use log::warn; use sqlx::{MySql, Transaction}; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; use errors::AnyhowResult; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic.rs index 6480534ec1..cb306546e1 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic.rs @@ -2,14 +2,14 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic_from_job.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic_from_job.rs index 60e51afbac..693fcc7e04 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic_from_job.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic_from_job.rs @@ -1,12 +1,12 @@ use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_builder/media_file_insert_builder.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_builder/media_file_insert_builder.rs index f632c2b023..b180d81640 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_builder/media_file_insert_builder.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_builder/media_file_insert_builder.rs @@ -1,13 +1,13 @@ use crate::queries::media_files::create::generic_insert::insert_media_file_generic::{insert_media_file_generic, InsertArgs}; use crate::queries::media_files::create::insert_builder::media_file_insert_builder_error::MediaFileInsertBuilderError; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use sqlx::MySqlPool; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_fusion.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_fusion.rs index 275725933b..d0763b936b 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_fusion.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_fusion.rs @@ -1,12 +1,12 @@ use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use crate::payloads::media_file_extra_info::inner_payloads::face_fusion_video_extra_info::FaceFusionVideoExtraInfo; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_gptsovits.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_gptsovits.rs index 1b9b6d5de7..ce48b523c8 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_gptsovits.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_gptsovits.rs @@ -1,11 +1,11 @@ use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_live_portrait.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_live_portrait.rs index c57376e3ba..3c23eafc29 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_live_portrait.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_live_portrait.rs @@ -1,12 +1,12 @@ use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs index 459704418a..6a0d730b70 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs @@ -1,13 +1,13 @@ use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_cli_tool.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_cli_tool.rs index e829ba53fd..687658c4df 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_cli_tool.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_cli_tool.rs @@ -3,10 +3,10 @@ use log::error; use sqlx; use sqlx::MySqlPool; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_comfy_ui.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_comfy_ui.rs index 7e5313608f..c7e016bab2 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_comfy_ui.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_comfy_ui.rs @@ -2,12 +2,12 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::prompts::PromptToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_f5_tts.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_f5_tts.rs index a3763b33b1..af6ec307e1 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_f5_tts.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_f5_tts.rs @@ -2,12 +2,12 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_face_animation.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_face_animation.rs index 4dd2a97048..53d98978a4 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_face_animation.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_face_animation.rs @@ -2,12 +2,12 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_file_upload.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_file_upload.rs index f22c32ddfb..d716d93184 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_file_upload.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_file_upload.rs @@ -2,14 +2,14 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_mocapnet.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_mocapnet.rs index f1509d40a5..031e3c4d31 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_mocapnet.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_mocapnet.rs @@ -2,11 +2,11 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_rerender.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_rerender.rs index 901e4389a1..b2f566dc46 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_rerender.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_rerender.rs @@ -2,11 +2,11 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_seed_vc.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_seed_vc.rs index 8fbae2446e..8c1f63ad4a 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_seed_vc.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_seed_vc.rs @@ -2,12 +2,12 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_studio_gen2.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_studio_gen2.rs index 4f7d76a0b5..936e3bc034 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_studio_gen2.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_studio_gen2.rs @@ -2,12 +2,12 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::prompts::PromptToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_tacotron2.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_tacotron2.rs index 2f21bcbf67..99f25b04c8 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_tacotron2.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_tacotron2.rs @@ -2,12 +2,12 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_voice_conversion.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_voice_conversion.rs index 6394be3a6f..b6e9735e4a 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_voice_conversion.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_voice_conversion.rs @@ -2,12 +2,12 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_zero_shot_tts.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_zero_shot_tts.rs index 468a30be0f..f752eea20c 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_zero_shot_tts.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_zero_shot_tts.rs @@ -2,11 +2,11 @@ use anyhow::anyhow; use sqlx; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_animation_type.rs b/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_animation_type.rs index 6f0f61c823..b78628d9d6 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_animation_type.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_animation_type.rs @@ -1,6 +1,6 @@ use sqlx::MySqlPool; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_engine_category.rs b/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_engine_category.rs index 3463db8d87..6f812ff9ba 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_engine_category.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_engine_category.rs @@ -1,6 +1,6 @@ use sqlx::MySqlPool; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_visibility.rs b/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_visibility.rs index e436eabb27..9d975f17ce 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_visibility.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_visibility.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_visibility_transactional.rs b/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_visibility_transactional.rs index 91936a677e..9ab1bbf780 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_visibility_transactional.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/edit/update_media_file_visibility_transactional.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use anyhow::anyhow; use sqlx::{Executor, MySql, MySqlPool, Transaction}; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs b/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs index 68ff9c9efd..a150c4d512 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs @@ -8,15 +8,15 @@ use chrono::{DateTime, Utc}; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_subtype::MediaFileSubtype; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_subtype::MediaFileSubtype; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; +use enums_db::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; @@ -373,8 +373,8 @@ LEFT OUTER JOIN prompts // cannot have type hints, eg. the following: // // m.token as `token: tokens::tokens::media_files::MediaFileToken`, -// m.origin_category as `origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`, -// m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, +// m.origin_category as `origin_category: enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`, +// m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, // // This results in the automatic mapping not being able to be found by name (for macro derive), and // in the manual case `row.try_get()` etc. won't have the correct column name (since the name is the diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs b/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs index c0a70ea2d4..c205bb7f41 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs @@ -2,15 +2,15 @@ use chrono::{DateTime, Utc}; use sqlx::mysql::MySqlRow; use sqlx::{Acquire, FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::pool::PoolConnection; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; +use enums_db::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; @@ -400,8 +400,8 @@ fn map_to_media_files(dataset:Vec) -> Vec String { // TODO: I haven't figured out how to get field name disambiguation and type coercion working here. - // (1) tts_results.creator_set_visibility `creator_set_visibility: crate::database::enums::record_visibility::RecordVisibility`, + // (1) tts_results.creator_set_visibility `creator_set_visibility: crate::database::enums_db::record_visibility::RecordVisibility`, // Query error: no column found for name: creator_set_visibility - // (2) creator_set_visibility `creator_set_visibility: crate::database::enums::record_visibility::RecordVisibility`, + // (2) creator_set_visibility `creator_set_visibility: crate::database::enums_db::record_visibility::RecordVisibility`, // Column 'creator_set_visibility' in field list is ambiguous // TODO/NB: Unfortunately SQLx can't statically typecheck this query diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/batch_get/batch_get_model_weights_for_elastic_search_backfill.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/batch_get/batch_get_model_weights_for_elastic_search_backfill.rs index 51276e5f0b..729806ef47 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/batch_get/batch_get_model_weights_for_elastic_search_backfill.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/batch_get/batch_get_model_weights_for_elastic_search_backfill.rs @@ -4,10 +4,10 @@ use log::warn; use sqlx::{Executor, FromRow, MySql, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; +use enums_db::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; @@ -297,8 +297,8 @@ struct RawRecord { // cannot have type hints, eg. the following: // // m.token as `token: tokens::tokens::media_files::MediaFileToken`, -// m.origin_category as `origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`, -// m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, +// m.origin_category as `origin_category: enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`, +// m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, // // This results in the automatic mapping not being able to be found by name (for macro derive), and // in the manual case `row.try_get()` etc. won't have the correct column name (since the name is the diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/create/create_model_weight_from_voice_conversion_download_job.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/create/create_model_weight_from_voice_conversion_download_job.rs index 6a1c55db6c..17d7a76c46 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/create/create_model_weight_from_voice_conversion_download_job.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/create/create_model_weight_from_voice_conversion_download_job.rs @@ -1,9 +1,9 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/create/create_weight.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/create/create_weight.rs index d77990fb24..62b0b313a9 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/create/create_weight.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/create/create_weight.rs @@ -1,11 +1,11 @@ use log::warn; use sqlx::MySqlPool; -use enums::by_table::model_weights::{ +use enums_db::by_table::model_weights::{ weights_category::WeightsCategory, weights_types::WeightsType, }; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/edit/update_weight.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/edit/update_weight.rs index cc6657d598..c41145ed10 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/edit/update_weight.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/edit/update_weight.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use sqlx::{MySql, QueryBuilder}; use crate::utils::transactor::Transactor; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight.rs index 68c4d03bda..55ab3d798b 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight.rs @@ -4,9 +4,9 @@ use log::error; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; @@ -14,7 +14,7 @@ use crate::helpers::boolean_converters::i64_to_bool; use crate::helpers::transform_optional_result::transform_optional_result; use crate::utils::transactor::Transactor; // Notes ensure that Enums have sqlx::Type -// 'weights_type: enums::by_table::model_weights::weights_types::WeightsType' use this to map +// 'weights_type: enums_db::by_table::model_weights::weights_types::WeightsType' use this to map // Retrieved Model Weight can be constrained to the fields that are needed // NB: Serialize is only for internal moderator endpoints @@ -162,8 +162,8 @@ async fn select_include_deleted( SELECT wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`, wt.title, - wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`, + wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`, wt.maybe_description_markdown, wt.maybe_description_rendered_html, @@ -176,7 +176,7 @@ async fn select_include_deleted( users.email_gravatar_hash AS creator_gravatar_hash, wt.creator_ip_address, - wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`, wt.original_download_url, wt.original_filename, @@ -250,8 +250,8 @@ async fn select_without_deleted( SELECT wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`, wt.title, - wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`, + wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`, wt.maybe_description_markdown, wt.maybe_description_rendered_html, @@ -259,7 +259,7 @@ async fn select_without_deleted( wt.maybe_ietf_primary_language_subtag, wt.creator_ip_address, - wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`, users.username as creator_username, diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_enqueue.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_enqueue.rs index 1236386ccf..cf4f063b42 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_enqueue.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_enqueue.rs @@ -4,9 +4,9 @@ use log::error; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; @@ -75,11 +75,11 @@ async fn select_include_deleted( r#" SELECT wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`, - wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`, + wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`, wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`, - wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, wt.user_deleted_at, wt.mod_deleted_at @@ -103,11 +103,11 @@ async fn select_without_deleted( r#" SELECT wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`, - wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`, + wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`, wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`, - wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, wt.user_deleted_at, wt.mod_deleted_at diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_inference.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_inference.rs index c0d26c3648..5f48729eaa 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_inference.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_inference.rs @@ -3,10 +3,10 @@ use log::error; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; -use enums::common::vocoder_type::VocoderType; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; +use enums_db::common::vocoder_type::VocoderType; use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; use crate::helpers::boolean_converters::nullable_i8_to_bool_default_false; @@ -169,8 +169,8 @@ async fn select_include_deleted( SELECT wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`, wt.title, - wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`, + wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`, wt.maybe_description_markdown, wt.maybe_description_rendered_html, @@ -180,7 +180,7 @@ async fn select_include_deleted( users.email_gravatar_hash AS creator_gravatar_hash, wt.creator_ip_address, - wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`, wt.original_download_url, wt.original_filename, @@ -208,7 +208,7 @@ async fn select_include_deleted( w_extension.maybe_custom_vocoder_token, - vocoder.vocoder_type as `maybe_custom_vocoder_type: enums::common::vocoder_type::VocoderType`, + vocoder.vocoder_type as `maybe_custom_vocoder_type: enums_db::common::vocoder_type::VocoderType`, vocoder.title as maybe_custom_vocoder_title, vocoder.private_bucket_hash as maybe_custom_vocoder_private_bucket_hash, diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info.rs index 98cd7fa187..db562cf3ae 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info.rs @@ -4,9 +4,9 @@ use log::error; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; @@ -143,8 +143,8 @@ async fn select_include_deleted( SELECT wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`, wt.title, - wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`, + wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`, wt.maybe_description_markdown, wt.maybe_description_rendered_html, @@ -154,7 +154,7 @@ async fn select_include_deleted( users.email_gravatar_hash AS creator_gravatar_hash, wt.creator_ip_address, - wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`, wt.original_download_url, wt.original_filename, @@ -208,8 +208,8 @@ async fn select_without_deleted( weight_token: &ModelWeightToken, mysql_connection: &mut PoolConnection ) -> Result { - //as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - //as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory` + //as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + //as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory` sqlx ::query_as!( RawWeight, @@ -217,12 +217,12 @@ async fn select_without_deleted( SELECT wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`, wt.title, - wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`, + wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`, wt.maybe_description_markdown, wt.maybe_description_rendered_html, wt.creator_ip_address, - wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`, users.username as creator_username, diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info_with_legacy_tts_token.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info_with_legacy_tts_token.rs index ec7b7725e1..7fc99e57e8 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info_with_legacy_tts_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/get/get_weight_for_legacy_tts_info_with_legacy_tts_token.rs @@ -4,9 +4,9 @@ use log::error; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; use tokens::tokens::tts_models::TtsModelToken; @@ -99,8 +99,8 @@ async fn select_include_deleted( SELECT wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`, wt.title, - wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`, + wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`, wt.maybe_description_markdown, wt.maybe_description_rendered_html, @@ -110,7 +110,7 @@ async fn select_include_deleted( users.email_gravatar_hash AS creator_gravatar_hash, wt.creator_ip_address, - wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`, wt.original_download_url, wt.original_filename, @@ -164,8 +164,8 @@ async fn select_without_deleted( legacy_tts_model_token: &TtsModelToken, mysql_connection: &mut PoolConnection ) -> Result { - //as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - //as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory` + //as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + //as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory` sqlx ::query_as!( RawWeight, @@ -173,12 +173,12 @@ async fn select_without_deleted( SELECT wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`, wt.title, - wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`, + wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`, wt.maybe_description_markdown, wt.maybe_description_rendered_html, wt.creator_ip_address, - wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`, users.username as creator_username, diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/inference/get_model_weight_for_voice_conversion_inference.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/inference/get_model_weight_for_voice_conversion_inference.rs index cce98142e4..262aeef080 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/inference/get_model_weight_for_voice_conversion_inference.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/inference/get_model_weight_for_voice_conversion_inference.rs @@ -3,7 +3,7 @@ use log::warn; use sqlx; use sqlx::MySqlPool; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use tokens::tokens::model_weights::ModelWeightToken; use crate::helpers::boolean_converters::i8_to_bool; @@ -60,7 +60,7 @@ pub async fn get_model_weight_for_voice_conversion_inference( r#" SELECT w.token as `token: tokens::tokens::model_weights::ModelWeightToken`, - w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, + w.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, w.title, vc.has_index_file, diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_backfill.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_backfill.rs index a1fbfd0c4a..1974a6f61b 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_backfill.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_backfill.rs @@ -1,7 +1,7 @@ use chrono::{DateTime, Utc}; use sqlx::{Executor, MySql}; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; @@ -27,7 +27,7 @@ pub async fn list_all_model_weight_tokens_for_backfill<'e, 'c, E>( r#" SELECT token as `token: tokens::tokens::model_weights::ModelWeightToken`, - weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, + weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, created_at, updated_at FROM model_weights diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_cached_usage_backfill.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_cached_usage_backfill.rs index 65d768854d..c71aa3d625 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_cached_usage_backfill.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_cached_usage_backfill.rs @@ -1,7 +1,7 @@ use chrono::{DateTime, Utc}; use sqlx::{Executor, MySql}; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs index 7ca7204bb1..49f10c7ef4 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs @@ -3,13 +3,13 @@ use chrono::{DateTime, Utc}; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::model_weights::{ +use enums_db::by_table::model_weights::{ weights_category::WeightsCategory, weights_types::WeightsType, }; -use enums::common::view_as::ViewAs; -use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums_db::common::view_as::ViewAs; +use enums_db::common::visibility::Visibility; +use enums_db::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weight_tokens_updated_since.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weight_tokens_updated_since.rs index 3a80949c3e..100eda9df2 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weight_tokens_updated_since.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weight_tokens_updated_since.rs @@ -1,7 +1,7 @@ use chrono::{DateTime, Utc}; use sqlx::{Executor, MySql}; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; @@ -26,7 +26,7 @@ pub async fn list_model_weight_tokens_updated_since<'e, 'c, E>( r#" SELECT token as `token: tokens::tokens::model_weights::ModelWeightToken`, - weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, + weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, updated_at FROM model_weights WHERE diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_elastic_search_backfill_using_cursor.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_elastic_search_backfill_using_cursor.rs index 06ab957bb7..f3d8f7116e 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_elastic_search_backfill_using_cursor.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_elastic_search_backfill_using_cursor.rs @@ -4,9 +4,9 @@ use log::warn; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; @@ -142,10 +142,10 @@ SELECT w.id, w.token as `token: tokens::tokens::model_weights::ModelWeightToken`, - w.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + w.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, - w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`, - w.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`, + w.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`, + w.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`, w.title, diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_text_to_speech.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_text_to_speech.rs index 014c2c4ba0..8e37e659a3 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_text_to_speech.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_text_to_speech.rs @@ -3,8 +3,8 @@ use chrono::{DateTime, Utc}; use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; @@ -84,7 +84,7 @@ async fn list_tts_models_for_all_creators( r#" SELECT w.token as `token: tokens::tokens::model_weights::ModelWeightToken`, - w.weights_type as `weight_type: enums::by_table::model_weights::weights_types::WeightsType`, + w.weights_type as `weight_type: enums_db::by_table::model_weights::weights_types::WeightsType`, w.title, w.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`, users.username as creator_username, @@ -92,7 +92,7 @@ SELECT users.email_gravatar_hash as creator_gravatar_hash, w_extension.ietf_language_tag, w_extension.ietf_primary_language_subtag, - w.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + w.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, w.created_at, w.updated_at FROM model_weights as w diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs index 03ce303239..33aadaf74b 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs @@ -3,8 +3,8 @@ use chrono::{DateTime, Utc}; use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; @@ -75,7 +75,7 @@ async fn list_voice_conversion_models_for_all_creators( r#" SELECT w.token as `token: tokens::tokens::model_weights::ModelWeightToken`, - w.weights_type as `weight_type: enums::by_table::model_weights::weights_types::WeightsType`, + w.weights_type as `weight_type: enums_db::by_table::model_weights::weights_types::WeightsType`, w.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`, users.username as creator_username, users.display_name as creator_display_name, @@ -83,7 +83,7 @@ SELECT w.title, w_extension.ietf_language_tag, w_extension.ietf_primary_language_subtag, - w.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + w.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, w.created_at, w.updated_at FROM model_weights as w diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_tokens.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_tokens.rs index 9ea5e2c160..329623a861 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_tokens.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_tokens.rs @@ -2,11 +2,11 @@ use chrono::{DateTime, Utc}; use sqlx::{Acquire, FromRow, MySql, MySqlConnection, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::model_weights::{ +use enums_db::by_table::model_weights::{ weights_category::WeightsCategory, weights_types::WeightsType, }; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums_db::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; @@ -257,8 +257,8 @@ struct RawWeightJoinUser { // cannot have type hints, eg. the following: // // m.token as `token: tokens::tokens::media_files::MediaFileToken`, -// m.origin_category as `origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`, -// m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, +// m.origin_category as `origin_category: enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`, +// m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, // // This results in the automatic mapping not being able to be found by name (for macro derive), and // in the manual case `row.try_get()` etc. won't have the correct column name (since the name is the diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs index 0f6e5ebd9e..210f982c40 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs @@ -2,13 +2,13 @@ use chrono::{DateTime, Utc}; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::model_weights::{ +use enums_db::by_table::model_weights::{ weights_category::WeightsCategory, weights_types::WeightsType, }; -use enums::common::view_as::ViewAs; -use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums_db::common::view_as::ViewAs; +use enums_db::common::visibility::Visibility; +use enums_db::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs index 2a359116e7..544e7d4d28 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs @@ -5,11 +5,11 @@ use chrono::{DateTime, Utc}; use sqlx::MySqlPool; -use enums::by_table::model_weights::{ +use enums_db::by_table::model_weights::{ weights_category::WeightsCategory, weights_types::WeightsType, }; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; @@ -478,7 +478,7 @@ struct RawWeightJoinUser { #[cfg(test)] mod tests { - use enums::by_table::model_weights::{ + use enums_db::by_table::model_weights::{ weights_category::WeightsCategory, weights_types::WeightsType, }; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_tts_model.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_tts_model.rs index 6791c2b013..5a9071f13c 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_tts_model.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_tts_model.rs @@ -1,8 +1,8 @@ use sqlx::{MySql, MySqlPool, Transaction}; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs index 5be3a4fbf6..d8dc84a133 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs @@ -2,9 +2,9 @@ use anyhow::anyhow; use sqlx::{MySql, MySqlPool, Transaction}; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/get_model_weight_info_lite.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/get_model_weight_info_lite.rs index 7bb4b8ed56..5f170217b2 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/get_model_weight_info_lite.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/get_model_weight_info_lite.rs @@ -3,7 +3,7 @@ use log::warn; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; @@ -27,7 +27,7 @@ pub async fn get_model_weight_info_lite_with_connection( r#" SELECT m.token as `token: tokens::tokens::model_weights::ModelWeightToken`, - m.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType` + m.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType` FROM model_weights as m WHERE m.token = ? "#, diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/list_model_weight_info_lite.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/list_model_weight_info_lite.rs index 82c79c5038..71341e53e1 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/list_model_weight_info_lite.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/list_model_weight_info_lite.rs @@ -1,7 +1,7 @@ use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; @@ -23,7 +23,7 @@ pub async fn list_model_weight_info_lite_with_connection( r#" SELECT w.token as `token: tokens::tokens::model_weights::ModelWeightToken`, - w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType` + w.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType` FROM model_weights as w "#) .fetch_all(&mut **mysql_connection) diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/model_weight_info_lite.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/model_weight_info_lite.rs index 86bff567cf..acd0e19b2d 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/model_weight_info_lite.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/model_weight_info_lite/model_weight_info_lite.rs @@ -1,4 +1,4 @@ -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use tokens::tokens::model_weights::ModelWeightToken; /// This is meant to be used for quick in-memory caches, particularly ones that diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/tests.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/tests.rs index 304696d096..f93b56cb5e 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/tests.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/tests.rs @@ -9,12 +9,12 @@ mod tests { use tokio; // common tests - use enums::by_table::model_weights::{ + use enums_db::by_table::model_weights::{ weights_category::WeightsCategory, weights_types::WeightsType, }; - use enums::common::view_as::ViewAs; - use enums::common::visibility::Visibility; + use enums_db::common::view_as::ViewAs; + use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; diff --git a/crates/schema/database/mysql_queries/src/queries/prompt_context_items/insert_batch_prompt_context_items.rs b/crates/schema/database/mysql_queries/src/queries/prompt_context_items/insert_batch_prompt_context_items.rs index c493451430..28e7b91725 100644 --- a/crates/schema/database/mysql_queries/src/queries/prompt_context_items/insert_batch_prompt_context_items.rs +++ b/crates/schema/database/mysql_queries/src/queries/prompt_context_items/insert_batch_prompt_context_items.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use log::error; use sqlx::{MySql, QueryBuilder, Transaction}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::prompts::PromptToken; diff --git a/crates/schema/database/mysql_queries/src/queries/prompt_context_items/list_prompt_context_items.rs b/crates/schema/database/mysql_queries/src/queries/prompt_context_items/list_prompt_context_items.rs index 79f626ccc8..aa38fecfb7 100644 --- a/crates/schema/database/mysql_queries/src/queries/prompt_context_items/list_prompt_context_items.rs +++ b/crates/schema/database/mysql_queries/src/queries/prompt_context_items/list_prompt_context_items.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; use errors::AnyhowResult; use log::{info, warn}; use sqlx::pool::PoolConnection; @@ -33,7 +33,7 @@ pub async fn list_prompt_context_items( r#" SELECT pci.media_token as `media_token: tokens::tokens::media_files::MediaFileToken`, - pci.context_semantic_type as `context_semantic_type: enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType`, + pci.context_semantic_type as `context_semantic_type: enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType`, m.public_bucket_directory_hash, m.maybe_public_bucket_prefix, diff --git a/crates/schema/database/mysql_queries/src/queries/prompts/get_prompt.rs b/crates/schema/database/mysql_queries/src/queries/prompts/get_prompt.rs index 917710caa8..cf73a498e9 100644 --- a/crates/schema/database/mysql_queries/src/queries/prompts/get_prompt.rs +++ b/crates/schema/database/mysql_queries/src/queries/prompts/get_prompt.rs @@ -5,9 +5,9 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; +use enums_db::by_table::prompts::prompt_type::PromptType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::common::model_type::ModelType; use errors::AnyhowResult; use sqlx::pool::PoolConnection; use sqlx::{MySql, MySqlPool}; @@ -113,10 +113,10 @@ async fn select_record( SELECT p.token as `token: tokens::tokens::prompts::PromptToken`, - p.prompt_type as `prompt_type: enums::by_table::prompts::prompt_type::PromptType`, + p.prompt_type as `prompt_type: enums_db::by_table::prompts::prompt_type::PromptType`, - p.maybe_model_type as `maybe_model_type: enums::common::model_type::ModelType`, - p.maybe_generation_provider as `maybe_generation_provider: enums::common::generation_provider::GenerationProvider`, + p.maybe_model_type as `maybe_model_type: enums_db::common::model_type::ModelType`, + p.maybe_generation_provider as `maybe_generation_provider: enums_db::common::generation::generation_provider::GenerationProvider`, p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`, diff --git a/crates/schema/database/mysql_queries/src/queries/prompts/insert_prompt.rs b/crates/schema/database/mysql_queries/src/queries/prompts/insert_prompt.rs index 06471a36fa..c4988f358f 100644 --- a/crates/schema/database/mysql_queries/src/queries/prompts/insert_prompt.rs +++ b/crates/schema/database/mysql_queries/src/queries/prompts/insert_prompt.rs @@ -5,9 +5,9 @@ use log::info; use sqlx; use sqlx::{Executor, MySql}; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; +use enums_db::by_table::prompts::prompt_type::PromptType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::common::model_type::ModelType; use errors::AnyhowResult; use tokens::tokens::prompts::PromptToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/trending_model_analytics/list_trending_tts_models.rs b/crates/schema/database/mysql_queries/src/queries/trending_model_analytics/list_trending_tts_models.rs index 5ec24e4eeb..f51036d164 100644 --- a/crates/schema/database/mysql_queries/src/queries/trending_model_analytics/list_trending_tts_models.rs +++ b/crates/schema/database/mysql_queries/src/queries/trending_model_analytics/list_trending_tts_models.rs @@ -1,8 +1,8 @@ use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::trending_model_analytics::model_type::ModelType; -use enums::by_table::trending_model_analytics::window_name::WindowName; +use enums_db::by_table::trending_model_analytics::model_type::ModelType; +use enums_db::by_table::trending_model_analytics::window_name::WindowName; use errors::AnyhowResult; use tokens::tokens::tts_models::TtsModelToken; diff --git a/crates/schema/database/mysql_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs b/crates/schema/database/mysql_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs index 4fb1374c4f..81d4ee9517 100644 --- a/crates/schema/database/mysql_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs +++ b/crates/schema/database/mysql_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs @@ -1,8 +1,8 @@ use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::by_table::trending_model_analytics::model_type::ModelType; -use enums::by_table::trending_model_analytics::window_name::WindowName; +use enums_db::by_table::trending_model_analytics::model_type::ModelType; +use enums_db::by_table::trending_model_analytics::window_name::WindowName; use errors::AnyhowResult; use tokens::tokens::tts_models::TtsModelToken; diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs index f5bd643639..6ac4caed14 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs @@ -167,9 +167,9 @@ impl ListAssignedTtsCategoriesQueryBuilder { fn build_query_string(&self) -> String { // TODO: I haven't figured out how to get field name disambiguation and type coercion working here. - // (1) tts_results.creator_set_visibility `creator_set_visibility: crate::database::enums::record_visibility::RecordVisibility`, + // (1) tts_results.creator_set_visibility `creator_set_visibility: crate::database::enums_db::record_visibility::RecordVisibility`, // Query error: no column found for name: creator_set_visibility - // (2) creator_set_visibility `creator_set_visibility: crate::database::enums::record_visibility::RecordVisibility`, + // (2) creator_set_visibility `creator_set_visibility: crate::database::enums_db::record_visibility::RecordVisibility`, // Column 'creator_set_visibility' in field list is ambiguous // TODO/NB: Unfortunately SQLx can't statically typecheck this query diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs index bc2eaab9cf..a7d0c2113b 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs @@ -6,8 +6,8 @@ use chrono::{DateTime, Utc}; use sqlx::MySqlPool; -use enums::common::job_status::JobStatus; -use enums::common::visibility::Visibility; +use enums_db::common::job_status::JobStatus; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; @@ -77,13 +77,13 @@ SELECT creator_ip_address, maybe_creator_user_token, - creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, is_from_api, is_for_twitch, is_debug_request, - status as `status: enums::common::job_status::JobStatus`, + status as `status: enums_db::common::job_status::JobStatus`, priority_level, attempt_count, failure_reason, @@ -126,13 +126,13 @@ SELECT creator_ip_address, maybe_creator_user_token, - creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, is_from_api, is_for_twitch, is_debug_request, - status as `status: enums::common::job_status::JobStatus`, + status as `status: enums_db::common::job_status::JobStatus`, priority_level, attempt_count, failure_reason, @@ -218,13 +218,13 @@ SELECT creator_ip_address, maybe_creator_user_token, - creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, is_from_api, is_for_twitch, is_debug_request, - status as `status: enums::common::job_status::JobStatus`, + status as `status: enums_db::common::job_status::JobStatus`, priority_level, attempt_count, failure_reason, diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/edit_tts_model_details.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/edit_tts_model_details.rs index 2f9efe4425..7b5b16cd3d 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/edit_tts_model_details.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/edit_tts_model_details.rs @@ -2,7 +2,7 @@ use sqlx; use sqlx::mysql::MySqlQueryResult; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use crate::column_types::vocoder_type::VocoderType; diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model.rs index 24bd280108..9aa5e16ddf 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model.rs @@ -9,8 +9,8 @@ use log::warn; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::tts_models::tts_model_type::TtsModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::tts_models::tts_model_type::TtsModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use crate::column_types::vocoder_type::VocoderType; @@ -203,7 +203,7 @@ async fn select_including_deleted( r#" SELECT tts.token as model_token, - tts.tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`, + tts.tts_model_type as `tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType`, tts.text_pipeline_type, tts.text_preprocessing_algorithm, tts.maybe_default_pretrained_vocoder, @@ -281,7 +281,7 @@ async fn select_without_deleted( r#" SELECT tts.token as model_token, - tts.tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`, + tts.tts_model_type as `tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType`, tts.text_pipeline_type, tts.text_preprocessing_algorithm, tts.maybe_default_pretrained_vocoder, diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs index 496078c866..fb32a0127f 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs @@ -8,7 +8,7 @@ use log::warn; use sqlx; use sqlx::MySqlPool; -use enums::common::vocoder_type::VocoderType; +use enums_db::common::vocoder_type::VocoderType; use crate::helpers::boolean_converters::i8_to_bool; @@ -101,7 +101,7 @@ SELECT tts.maybe_default_pretrained_vocoder, tts.maybe_custom_vocoder_token, - vocoder.vocoder_type as `maybe_custom_vocoder_type: enums::common::vocoder_type::VocoderType`, + vocoder.vocoder_type as `maybe_custom_vocoder_type: enums_db::common::vocoder_type::VocoderType`, vocoder.title as maybe_custom_vocoder_title, vocoder.private_bucket_hash as maybe_custom_vocoder_private_bucket_hash, diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference_improved.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference_improved.rs index 8906659185..46f7558ab2 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference_improved.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/get_tts_model_for_inference_improved.rs @@ -8,8 +8,8 @@ use log::warn; use sqlx; use sqlx::MySqlPool; -use enums::by_table::tts_models::tts_model_type::TtsModelType; -use enums::common::vocoder_type::VocoderType; +use enums_db::by_table::tts_models::tts_model_type::TtsModelType; +use enums_db::common::vocoder_type::VocoderType; use tokens::tokens::tts_models::TtsModelToken; use tokens::tokens::users::UserToken; @@ -94,7 +94,7 @@ pub async fn get_tts_model_for_inference_improved( r#" SELECT tts.token as `model_token: tokens::tokens::tts_models::TtsModelToken`, - tts.tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`, + tts.tts_model_type as `tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType`, tts.text_pipeline_type, tts.use_default_mel_multiply_factor, @@ -103,7 +103,7 @@ SELECT tts.maybe_default_pretrained_vocoder, tts.maybe_custom_vocoder_token, - vocoder.vocoder_type as `maybe_custom_vocoder_type: enums::common::vocoder_type::VocoderType`, + vocoder.vocoder_type as `maybe_custom_vocoder_type: enums_db::common::vocoder_type::VocoderType`, vocoder.title as maybe_custom_vocoder_title, vocoder.private_bucket_hash as maybe_custom_vocoder_private_bucket_hash, diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs index 17754c6be5..6450df8621 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs @@ -3,8 +3,8 @@ use std::path::Path; use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::tts_models::tts_model_type::TtsModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::tts_models::tts_model_type::TtsModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::tts_models::TtsModelToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs index c9ee839d9a..eb13ff67cf 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs @@ -4,7 +4,7 @@ use log::{info, warn}; use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; @@ -142,7 +142,7 @@ SELECT tts.user_ratings_positive_count, tts.user_ratings_negative_count, tts.user_ratings_total_count, - tts.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + tts.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, tts.created_at, tts.updated_at FROM tts_models as tts @@ -177,7 +177,7 @@ SELECT tts.user_ratings_positive_count, tts.user_ratings_negative_count, tts.user_ratings_total_count, - tts.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + tts.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, tts.created_at, tts.updated_at FROM tts_models as tts @@ -223,7 +223,7 @@ SELECT tts.user_ratings_positive_count, tts.user_ratings_negative_count, tts.user_ratings_total_count, - tts.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + tts.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, tts.created_at, tts.updated_at FROM tts_models as tts @@ -261,7 +261,7 @@ SELECT tts.user_ratings_positive_count, tts.user_ratings_negative_count, tts.user_ratings_total_count, - tts.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + tts.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, tts.created_at, tts.updated_at FROM tts_models as tts diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs index 90138b424a..923d1089a9 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs @@ -4,8 +4,8 @@ use log::warn; use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::tts_models::tts_model_type::TtsModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::tts_models::tts_model_type::TtsModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::tts_models::TtsModelToken; @@ -186,7 +186,7 @@ SELECT id, token as `token: tokens::tokens::tts_models::TtsModelToken`, - tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`, + tts_model_type as `tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType`, text_pipeline_type, has_self_contained_vocoder, @@ -225,7 +225,7 @@ SELECT creator_ip_address_creation, creator_ip_address_last_update, - creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, private_bucket_hash, private_bucket_object_name, diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_results/edit_tts_result.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_results/edit_tts_result.rs index b0d466b3e8..6d9cd68368 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_results/edit_tts_result.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_results/edit_tts_result.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; pub struct EditTtsResultArgs<'a> { diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs index 45660b9df6..ea0e879a0e 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs @@ -6,7 +6,7 @@ use chrono::{DateTime, Utc}; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use crate::config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; @@ -192,9 +192,9 @@ impl ListTtsResultsQueryBuilder { pub fn build_query_string(&self) -> String { // TODO: I haven't figured out how to get field name disambiguation and type coercion working here. - // (1) tts_results.creator_set_visibility `creator_set_visibility: crate::database::enums::record_visibility::RecordVisibility`, + // (1) tts_results.creator_set_visibility `creator_set_visibility: crate::database::enums_db::record_visibility::RecordVisibility`, // Query error: no column found for name: creator_set_visibility - // (2) creator_set_visibility `creator_set_visibility: crate::database::enums::record_visibility::RecordVisibility`, + // (2) creator_set_visibility `creator_set_visibility: crate::database::enums_db::record_visibility::RecordVisibility`, // Column 'creator_set_visibility' in field list is ambiguous // TODO/NB: Unfortunately SQLx can't statically typecheck this query diff --git a/crates/schema/database/mysql_queries/src/queries/tts/tts_results/query_tts_result.rs b/crates/schema/database/mysql_queries/src/queries/tts/tts_results/query_tts_result.rs index fbccdd79b6..7ee3eb6816 100644 --- a/crates/schema/database/mysql_queries/src/queries/tts/tts_results/query_tts_result.rs +++ b/crates/schema/database/mysql_queries/src/queries/tts/tts_results/query_tts_result.rs @@ -8,7 +8,7 @@ use chrono::{DateTime, Utc}; use log::warn; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_email_and_password.rs b/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_email_and_password.rs index ad408c70b7..8fa3bf215c 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_email_and_password.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_email_and_password.rs @@ -6,8 +6,8 @@ use crate::queries::users::user::create::create_account_error::CreateAccountError; use crate::queries::users::user::create::create_account_generic::{create_account_generic, GenericCreateAccountArgs}; use crate::utils::transactor::Transactor; -use enums::by_table::users::user_signup_method::UserSignupMethod; -use enums::by_table::users::user_signup_source::UserSignupSource; +use enums_db::by_table::users::user_signup_method::UserSignupMethod; +use enums_db::by_table::users::user_signup_source::UserSignupSource; use sqlx::MySqlPool; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_google_sso.rs b/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_google_sso.rs index 7b60f9d913..f101d5d8e3 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_google_sso.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_google_sso.rs @@ -6,8 +6,8 @@ use crate::queries::users::user::create::create_account_error::CreateAccountError; use crate::queries::users::user::create::create_account_generic::{create_account_generic, GenericCreateAccountArgs}; use crate::utils::transactor::Transactor; -use enums::by_table::users::user_signup_method::UserSignupMethod; -use enums::by_table::users::user_signup_source::UserSignupSource; +use enums_db::by_table::users::user_signup_method::UserSignupMethod; +use enums_db::by_table::users::user_signup_source::UserSignupSource; use tokens::tokens::users::UserToken; /// SSO accounts do not have passwords at account creation diff --git a/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_stripe_checkout.rs b/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_stripe_checkout.rs index 3b3d758fc2..e7592e3485 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_stripe_checkout.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_from_stripe_checkout.rs @@ -6,8 +6,8 @@ use crate::queries::users::user::create::create_account_error::CreateAccountError; use crate::queries::users::user::create::create_account_generic::{create_account_generic, GenericCreateAccountArgs}; use crate::utils::transactor::Transactor; -use enums::by_table::users::user_signup_method::UserSignupMethod; -use enums::by_table::users::user_signup_source::UserSignupSource; +use enums_db::by_table::users::user_signup_method::UserSignupMethod; +use enums_db::by_table::users::user_signup_source::UserSignupSource; use tokens::tokens::users::UserToken; /// Stripe checkout sessions do not have a real email address or password. diff --git a/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_generic.rs b/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_generic.rs index 9e987fceab..0090e4728d 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_generic.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user/create/create_account_generic.rs @@ -5,8 +5,8 @@ use crate::queries::users::user::create::create_account_error::CreateAccountError; use crate::utils::transactor::Transactor; -use enums::by_table::users::user_signup_method::UserSignupMethod; -use enums::by_table::users::user_signup_source::UserSignupSource; +use enums_db::by_table::users::user_signup_method::UserSignupMethod; +use enums_db::by_table::users::user_signup_source::UserSignupSource; use log::warn; use sqlx::error::Error::Database; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user/update/set_user_feature_flags.rs b/crates/schema/database/mysql_queries/src/queries/users/user/update/set_user_feature_flags.rs index 6a9699d9f5..1044bb9846 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user/update/set_user_feature_flags.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user/update/set_user_feature_flags.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use sqlx::MySqlPool; use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity; -use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; +use enums_db::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; use errors::AnyhowResult; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user/update/set_user_feature_flags_transactional.rs b/crates/schema/database/mysql_queries/src/queries/users/user/update/set_user_feature_flags_transactional.rs index f038283e95..f6a8512378 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user/update/set_user_feature_flags_transactional.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user/update/set_user_feature_flags_transactional.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use sqlx::{MySql, Transaction}; use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity; -use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; +use enums_db::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; use errors::AnyhowResult; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/batch_get_user_bookmarks.rs b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/batch_get_user_bookmarks.rs index d5ecd19078..2a1954d5c1 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/batch_get_user_bookmarks.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/batch_get_user_bookmarks.rs @@ -6,7 +6,7 @@ use log::error; use sqlx::{MySql, QueryBuilder}; use sqlx::pool::PoolConnection; -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; use errors::AnyhowResult; use tokens::tokens::user_bookmarks::UserBookmarkToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/get_user_bookmark.rs b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/get_user_bookmark.rs index efb6903070..0bdeff9683 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/get_user_bookmark.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/get_user_bookmark.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::{Executor, MySql}; -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; use errors::AnyhowResult; use tokens::tokens::user_bookmarks::UserBookmarkToken; use tokens::tokens::users::UserToken; @@ -37,7 +37,7 @@ pub async fn get_user_bookmark<'e, 'c, E>( SELECT f.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`, - f.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`, + f.entity_type as `entity_type: enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`, f.entity_token, f.user_token as `user_token: tokens::tokens::users::UserToken`, diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/get_user_bookmark_transactional_locking.rs b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/get_user_bookmark_transactional_locking.rs index bbc1490f27..3a3cbeb5b6 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/get_user_bookmark_transactional_locking.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/get_user_bookmark_transactional_locking.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::{Error, Executor, MySql}; -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; use errors::AnyhowResult; use tokens::tokens::user_bookmarks::UserBookmarkToken; use tokens::tokens::users::UserToken; @@ -74,7 +74,7 @@ async fn query_by_entity<'e, 'c, E>(mysql_executor: E, bookmark_entity_token: &U SELECT b.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`, - b.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`, + b.entity_type as `entity_type: enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`, b.entity_token, b.user_token as `user_token: tokens::tokens::users::UserToken`, @@ -115,7 +115,7 @@ async fn query_by_bookmark_token<'e, 'c, E>(mysql_executor: E, bookmark_token: & SELECT b2.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`, - b2.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`, + b2.entity_type as `entity_type: enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`, b2.entity_token, b2.user_token as `user_token: tokens::tokens::users::UserToken`, diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks.rs b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks.rs index 797a6a5a02..983a1dda79 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks.rs @@ -1,9 +1,9 @@ use sqlx::{MySql, MySqlPool, QueryBuilder}; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; use errors::AnyhowResult; use crate::queries::users::user_bookmarks::list_user_bookmarks_result::RawUserBookmarkRecord; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks_result.rs b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks_result.rs index e97b3bf2ac..a1477c1923 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks_result.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks_result.rs @@ -2,13 +2,13 @@ use chrono::{DateTime, Utc}; use sqlx::{FromRow, Row}; use sqlx::mysql::MySqlRow; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::traits::mysql_from_row::MySqlFromRow; use tokens::tokens::user_bookmarks::UserBookmarkToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/user_bookmark_entity_token.rs b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/user_bookmark_entity_token.rs index 2b192dbf5b..c29675302c 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/user_bookmark_entity_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_bookmarks/user_bookmark_entity_token.rs @@ -1,4 +1,4 @@ -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::tts_models::TtsModelToken; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_token.rs b/crates/schema/database/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_token.rs index c47221020b..50215179a4 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_token.rs @@ -4,7 +4,7 @@ use log::warn; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; @@ -113,8 +113,8 @@ SELECT profile_rendered_html, user_role_slug, disable_gravatar, - preferred_tts_result_visibility as `preferred_tts_result_visibility: enums::common::visibility::Visibility`, - preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums::common::visibility::Visibility`, + preferred_tts_result_visibility as `preferred_tts_result_visibility: enums_db::common::visibility::Visibility`, + preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums_db::common::visibility::Visibility`, discord_username, twitch_username, twitter_username, diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs b/crates/schema/database/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs index d0b489b611..a90f293f10 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs @@ -4,7 +4,7 @@ use log::warn; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; @@ -112,8 +112,8 @@ SELECT profile_rendered_html, user_role_slug, disable_gravatar, - preferred_tts_result_visibility as `preferred_tts_result_visibility: enums::common::visibility::Visibility`, - preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums::common::visibility::Visibility`, + preferred_tts_result_visibility as `preferred_tts_result_visibility: enums_db::common::visibility::Visibility`, + preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums_db::common::visibility::Visibility`, discord_username, twitch_username, twitter_username, diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_ratings/batch_get_user_rating.rs b/crates/schema/database/mysql_queries/src/queries/users/user_ratings/batch_get_user_rating.rs index 387830220d..df1018ab3d 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_ratings/batch_get_user_rating.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_ratings/batch_get_user_rating.rs @@ -5,8 +5,8 @@ use log::error; use sqlx::{MySql, QueryBuilder}; use sqlx::pool::PoolConnection; -use enums::by_table::user_ratings::entity_type::UserRatingEntityType; -use enums::by_table::user_ratings::rating_value::UserRatingValue; +use enums_db::by_table::user_ratings::entity_type::UserRatingEntityType; +use enums_db::by_table::user_ratings::rating_value::UserRatingValue; use errors::AnyhowResult; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_ratings/get_user_rating.rs b/crates/schema/database/mysql_queries/src/queries/users/user_ratings/get_user_rating.rs index f7899da7d3..c9d5bb55e7 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_ratings/get_user_rating.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_ratings/get_user_rating.rs @@ -4,7 +4,7 @@ use log::error; use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::by_table::user_ratings::rating_value::UserRatingValue; +use enums_db::by_table::user_ratings::rating_value::UserRatingValue; use errors::AnyhowResult; use tokens::tokens::users::UserToken; @@ -32,7 +32,7 @@ pub async fn get_user_rating(args: Args<'_>) -> AnyhowResult> InternalUserRatingRecord, r#" SELECT - rating_value as `rating_value: enums::by_table::user_ratings::rating_value::UserRatingValue`, + rating_value as `rating_value: enums_db::by_table::user_ratings::rating_value::UserRatingValue`, created_at, updated_at diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_ratings/get_user_rating_transactional_locking.rs b/crates/schema/database/mysql_queries/src/queries/users/user_ratings/get_user_rating_transactional_locking.rs index e93cf8c68d..5d2b5b90cc 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_ratings/get_user_rating_transactional_locking.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_ratings/get_user_rating_transactional_locking.rs @@ -3,7 +3,7 @@ use chrono::{DateTime, Utc}; use log::error; use sqlx::{Executor, MySql}; -use enums::by_table::user_ratings::rating_value::UserRatingValue; +use enums_db::by_table::user_ratings::rating_value::UserRatingValue; use errors::AnyhowResult; use tokens::tokens::users::UserToken; @@ -32,7 +32,7 @@ pub async fn get_user_rating_transactional_locking<'e, 'c, E>( InternalUserRatingRecord, r#" SELECT - r.rating_value as `rating_value: enums::by_table::user_ratings::rating_value::UserRatingValue`, + r.rating_value as `rating_value: enums_db::by_table::user_ratings::rating_value::UserRatingValue`, r.created_at, r.updated_at, diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_ratings/upsert_user_rating.rs b/crates/schema/database/mysql_queries/src/queries/users/user_ratings/upsert_user_rating.rs index 0c0c6119e7..fd6d7ee631 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_ratings/upsert_user_rating.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_ratings/upsert_user_rating.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use sqlx::{Executor, MySql}; -use enums::by_table::user_ratings::rating_value::UserRatingValue; +use enums_db::by_table::user_ratings::rating_value::UserRatingValue; use errors::AnyhowResult; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token.rs b/crates/schema/database/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token.rs index 86466fa45e..0bd82259ae 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_sessions/get_user_session_by_token.rs @@ -7,7 +7,7 @@ use log::warn; use sqlx::{Executor, MySql}; use sqlx::pool::PoolConnection; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; @@ -132,8 +132,8 @@ SELECT users.disable_gravatar, users.auto_play_audio_preference, users.auto_play_video_preference, - users.preferred_tts_result_visibility as `preferred_tts_result_visibility: enums::common::visibility::Visibility`, - users.preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums::common::visibility::Visibility`, + users.preferred_tts_result_visibility as `preferred_tts_result_visibility: enums_db::common::visibility::Visibility`, + users.preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums_db::common::visibility::Visibility`, users.user_role_slug, users.is_banned, diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_stripe_customer_links/find_user_stripe_customer_link.rs b/crates/schema/database/mysql_queries/src/queries/users/user_stripe_customer_links/find_user_stripe_customer_link.rs index 311a4aecaa..65e87f4414 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_stripe_customer_links/find_user_stripe_customer_link.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_stripe_customer_links/find_user_stripe_customer_link.rs @@ -1,6 +1,6 @@ use crate::errors::select_optional_record_error::SelectOptionalRecordError; use crate::types::query_map::QueryMap; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use sqlx; use sqlx::mysql::MySqlRow; use sqlx::pool::PoolConnection; @@ -71,7 +71,7 @@ fn query(user_token: &UserToken, namespace: PaymentsNamespace) r#" SELECT user_token as `user_token: tokens::tokens::users::UserToken`, - payments_namespace as `payments_namespace: enums::common::payments_namespace::PaymentsNamespace`, + payments_namespace as `payments_namespace: enums_db::common::payments_namespace::PaymentsNamespace`, stripe_customer_id FROM user_stripe_customer_links diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_stripe_customer_links/upsert_user_stripe_customer_link.rs b/crates/schema/database/mysql_queries/src/queries/users/user_stripe_customer_links/upsert_user_stripe_customer_link.rs index d4d642ceec..e5ea776482 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_stripe_customer_links/upsert_user_stripe_customer_link.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_stripe_customer_links/upsert_user_stripe_customer_link.rs @@ -1,5 +1,5 @@ use crate::errors::database_insert_error::DatabaseInsertError; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use sqlx::mysql::MySqlArguments; use sqlx::pool::PoolConnection; use sqlx::query::Query; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/find_possibly_inactive_first_subscription_for_owner_user.rs b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/find_possibly_inactive_first_subscription_for_owner_user.rs index 8865605087..38402c5996 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/find_possibly_inactive_first_subscription_for_owner_user.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/find_possibly_inactive_first_subscription_for_owner_user.rs @@ -1,6 +1,6 @@ use crate::errors::select_optional_record_error::SelectOptionalRecordError; use crate::types::query_map::QueryMap; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use sqlx; use sqlx::mysql::MySqlRow; use sqlx::pool::PoolConnection; @@ -119,7 +119,7 @@ fn query_only_active(user_token: &UserToken, namespace: PaymentsNamespace) SELECT token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`, user_token as `user_token: tokens::tokens::users::UserToken`, - subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`, + subscription_namespace as `subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace`, subscription_product_slug, maybe_stripe_subscription_status, maybe_stripe_customer_id, @@ -157,7 +157,7 @@ fn query_possibly_inactive(user_token: &UserToken, namespace: PaymentsNamespace) SELECT token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`, user_token as `user_token: tokens::tokens::users::UserToken`, - subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`, + subscription_namespace as `subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace`, subscription_product_slug, maybe_stripe_subscription_status, maybe_stripe_customer_id, diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/find_subscription_for_owner_user.rs b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/find_subscription_for_owner_user.rs index 372cca8000..8b0e20a466 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/find_subscription_for_owner_user.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/find_subscription_for_owner_user.rs @@ -2,12 +2,12 @@ use crate::errors::select_optional_record_error::SelectOptionalRecordError; use crate::helpers::boolean_converters::nullable_i8_to_bool_default_false; use crate::types::query_map::QueryMap; use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use sqlx; use sqlx::mysql::MySqlRow; use sqlx::pool::PoolConnection; use sqlx::MySql; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; +use enums_db::common::stripe_subscription_status::StripeSubscriptionStatus; use tokens::tokens::user_subscriptions::UserSubscriptionToken; use tokens::tokens::users::UserToken; @@ -121,12 +121,12 @@ fn query(user_token: &UserToken, namespace: PaymentsNamespace) SELECT token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`, user_token as `user_token: tokens::tokens::users::UserToken`, - subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`, + subscription_namespace as `subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace`, subscription_product_slug, maybe_stripe_customer_id, maybe_stripe_product_id, maybe_stripe_subscription_id, - maybe_stripe_subscription_status as `maybe_stripe_subscription_status: enums::common::stripe_subscription_status::StripeSubscriptionStatus`, + maybe_stripe_subscription_status as `maybe_stripe_subscription_status: enums_db::common::stripe_subscription_status::StripeSubscriptionStatus`, maybe_stripe_invoice_is_paid, subscription_start_at, subscription_expires_at, diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs index d030cf8efe..076c1b52a6 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use errors::AnyhowResult; use sqlx::pool::PoolConnection; use sqlx::MySql; @@ -32,7 +32,7 @@ pub async fn list_active_user_subscriptions( r#" SELECT user_token, - subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`, + subscription_namespace as `subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace`, subscription_product_slug, subscription_expires_at diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/lookup_users_by_stripe_customer_id.rs b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/lookup_users_by_stripe_customer_id.rs index e3a57fae54..a796e66d2f 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/lookup_users_by_stripe_customer_id.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/lookup_users_by_stripe_customer_id.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use log::warn; use sqlx::MySqlPool; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use errors::AnyhowResult; use tokens::tokens::users::UserToken; @@ -23,7 +23,7 @@ pub async fn lookup_users_by_stripe_customer_id( UserByStripeCustomerIdResult, r#" SELECT - user_subscriptions.subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`, + user_subscriptions.subscription_namespace as `subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace`, user_subscriptions.maybe_stripe_subscription_id, users.token as `user_token: tokens::tokens::users::UserToken`, users.email_address, diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs index 6383865156..240b98e1cf 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::NaiveDateTime; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use errors::AnyhowResult; use reusable_types::stripe::stripe_recurring_interval::StripeRecurringInterval; use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; diff --git a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_with_invoice_paid_status_by_stripe_id.rs b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_with_invoice_paid_status_by_stripe_id.rs index dcad3d1674..daa4edd480 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_with_invoice_paid_status_by_stripe_id.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user_subscriptions/upsert_user_subscription_with_invoice_paid_status_by_stripe_id.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::NaiveDateTime; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use errors::AnyhowResult; use reusable_types::stripe::stripe_recurring_interval::StripeRecurringInterval; use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; diff --git a/crates/schema/database/mysql_queries/src/queries/vocoder/get_vocoder_model.rs b/crates/schema/database/mysql_queries/src/queries/vocoder/get_vocoder_model.rs index 772fd7dd8d..56c06de7b9 100644 --- a/crates/schema/database/mysql_queries/src/queries/vocoder/get_vocoder_model.rs +++ b/crates/schema/database/mysql_queries/src/queries/vocoder/get_vocoder_model.rs @@ -8,8 +8,8 @@ use chrono::{DateTime, Utc}; use log::warn; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; -use enums::common::vocoder_type::VocoderType; +use enums_db::common::visibility::Visibility; +use enums_db::common::vocoder_type::VocoderType; use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; @@ -122,7 +122,7 @@ async fn select_including_deleted( r#" SELECT vocoder.token as vocoder_token, - vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`, + vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`, vocoder.creator_user_token, users.username as creator_username, @@ -139,7 +139,7 @@ SELECT vocoder.is_mod_disabled_from_author_use, vocoder.is_mod_author_editing_locked, - vocoder.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + vocoder.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, vocoder.created_at, vocoder.updated_at, @@ -170,7 +170,7 @@ async fn select_without_deleted( r#" SELECT vocoder.token as vocoder_token, - vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`, + vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`, vocoder.creator_user_token, users.username as creator_username, @@ -187,7 +187,7 @@ SELECT vocoder.is_mod_disabled_from_author_use, vocoder.is_mod_author_editing_locked, - vocoder.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + vocoder.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, vocoder.created_at, vocoder.updated_at, diff --git a/crates/schema/database/mysql_queries/src/queries/vocoder/insert_vocoder_model.rs b/crates/schema/database/mysql_queries/src/queries/vocoder/insert_vocoder_model.rs index 6b8231628d..9c2c926adf 100644 --- a/crates/schema/database/mysql_queries/src/queries/vocoder/insert_vocoder_model.rs +++ b/crates/schema/database/mysql_queries/src/queries/vocoder/insert_vocoder_model.rs @@ -8,8 +8,8 @@ use std::path::Path; use anyhow::anyhow; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; -use enums::common::vocoder_type::VocoderType; +use enums_db::common::visibility::Visibility; +use enums_db::common::vocoder_type::VocoderType; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::vocoder_models::VocoderModelToken; diff --git a/crates/schema/database/mysql_queries/src/queries/vocoder/list_vocoder_models.rs b/crates/schema/database/mysql_queries/src/queries/vocoder/list_vocoder_models.rs index 4640638537..de19d41c11 100644 --- a/crates/schema/database/mysql_queries/src/queries/vocoder/list_vocoder_models.rs +++ b/crates/schema/database/mysql_queries/src/queries/vocoder/list_vocoder_models.rs @@ -8,7 +8,7 @@ use chrono::{DateTime, Utc}; use log::{info, warn}; use sqlx::MySqlPool; -use enums::common::vocoder_type::VocoderType; +use enums_db::common::vocoder_type::VocoderType; use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; @@ -117,7 +117,7 @@ async fn list_vocoder_models_for_all_creators( r#" SELECT vocoder.token as vocoder_token, - vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`, + vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`, vocoder.creator_user_token, users.username as creator_username, users.display_name as creator_display_name, @@ -149,7 +149,7 @@ WHERE r#" SELECT vocoder.token as vocoder_token, - vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`, + vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`, vocoder.creator_user_token, users.username as creator_username, users.display_name as creator_display_name, @@ -189,7 +189,7 @@ async fn list_vocoder_models_creator_scoped( r#" SELECT vocoder.token as vocoder_token, - vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`, + vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`, vocoder.creator_user_token, users.username as creator_username, users.display_name as creator_display_name, @@ -223,7 +223,7 @@ WHERE r#" SELECT vocoder.token as vocoder_token, - vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`, + vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`, vocoder.creator_user_token, users.username as creator_username, users.display_name as creator_display_name, diff --git a/crates/schema/database/mysql_queries/src/queries/voice_conversion/inference/get_voice_conversion_model_for_inference.rs b/crates/schema/database/mysql_queries/src/queries/voice_conversion/inference/get_voice_conversion_model_for_inference.rs index 7732546093..6612dbd3db 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_conversion/inference/get_voice_conversion_model_for_inference.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_conversion/inference/get_voice_conversion_model_for_inference.rs @@ -3,7 +3,7 @@ use log::warn; use sqlx; use sqlx::MySqlPool; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; use crate::helpers::boolean_converters::i8_to_bool; @@ -57,7 +57,7 @@ pub async fn get_voice_conversion_model_for_inference( r#" SELECT vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`, - vc.model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`, + vc.model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`, vc.title, vc.has_index_file, diff --git a/crates/schema/database/mysql_queries/src/queries/voice_conversion/migration/list_whole_voice_conversion_models_using_cursor.rs b/crates/schema/database/mysql_queries/src/queries/voice_conversion/migration/list_whole_voice_conversion_models_using_cursor.rs index f690ecc34d..6ff5296e3a 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_conversion/migration/list_whole_voice_conversion_models_using_cursor.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_conversion/migration/list_whole_voice_conversion_models_using_cursor.rs @@ -4,8 +4,8 @@ use log::warn; use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; @@ -142,7 +142,7 @@ SELECT id, token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`, - model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`, + model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`, maybe_vocoder_token as `maybe_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken`, title, @@ -167,7 +167,7 @@ SELECT maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`, - creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, private_bucket_hash, private_bucket_object_name, diff --git a/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/get_voice_conversion_model_info_lite.rs b/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/get_voice_conversion_model_info_lite.rs index 070de13cac..2d119c2d7d 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/get_voice_conversion_model_info_lite.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/get_voice_conversion_model_info_lite.rs @@ -3,7 +3,7 @@ use log::warn; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use errors::AnyhowResult; use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; @@ -27,7 +27,7 @@ pub async fn get_voice_conversion_model_info_lite_with_connection( r#" SELECT vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`, - vc.model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType` + vc.model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType` FROM voice_conversion_models as vc WHERE vc.token = ? "#, diff --git a/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/list_voice_conversion_model_info_lite.rs b/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/list_voice_conversion_model_info_lite.rs index a09018e25b..621f5b6b45 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/list_voice_conversion_model_info_lite.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/list_voice_conversion_model_info_lite.rs @@ -1,7 +1,7 @@ use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use errors::AnyhowResult; use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; @@ -23,7 +23,7 @@ pub async fn list_voice_conversion_model_info_lite_with_connection( r#" SELECT vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`, - vc.model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType` + vc.model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType` FROM voice_conversion_models as vc "#) .fetch_all(&mut **mysql_connection) diff --git a/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/model_info_lite.rs b/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/model_info_lite.rs index e11e478e96..982ab3d17a 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/model_info_lite.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_conversion/model_info_lite/model_info_lite.rs @@ -1,4 +1,4 @@ -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; /// This is meant to be used for quick in-memory caches, diff --git a/crates/schema/database/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs b/crates/schema/database/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs index f5c5fe04c9..d24451de4b 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs @@ -3,8 +3,8 @@ use std::path::Path; use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs b/crates/schema/database/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs index 491833f9fd..74385d118d 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs @@ -4,8 +4,8 @@ use log::warn; use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; @@ -105,7 +105,7 @@ async fn list_voice_conversion_models_for_all_creators( r#" SELECT vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`, - vc.model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`, + vc.model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`, vc.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`, users.username as creator_username, users.display_name as creator_display_name, @@ -114,7 +114,7 @@ SELECT vc.ietf_language_tag, vc.ietf_primary_language_subtag, vc.is_front_page_featured, - vc.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + vc.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, vc.created_at, vc.updated_at FROM voice_conversion_models as vc @@ -137,7 +137,7 @@ async fn list_voice_conversion_models_creator_scoped( r#" SELECT vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`, - vc.model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`, + vc.model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`, vc.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`, users.username as creator_username, users.display_name as creator_display_name, @@ -146,7 +146,7 @@ SELECT vc.ietf_language_tag, vc.ietf_primary_language_subtag, vc.is_front_page_featured, - vc.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + vc.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, vc.created_at, vc.updated_at FROM voice_conversion_models as vc diff --git a/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result.rs b/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result.rs index 52ec355d3a..4dfa4af135 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result.rs @@ -8,7 +8,7 @@ use chrono::{DateTime, Utc}; use log::warn; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; diff --git a/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result_for_inference.rs b/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result_for_inference.rs index 8d91daedba..bcbcc104c7 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result_for_inference.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/get_voice_conversion_result_for_inference.rs @@ -8,7 +8,7 @@ use chrono::{DateTime, Utc}; use log::warn; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::voice_conversion_results::VoiceConversionResultToken; diff --git a/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs b/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs index ef075e38c7..1087a2624f 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs @@ -3,7 +3,7 @@ use log::warn; use sqlx; use sqlx::MySqlPool; -use enums::by_table::voice_conversion_results::voice_conversion_media_token_type::VoiceConversionMediaTokenType; +use enums_db::by_table::voice_conversion_results::voice_conversion_media_token_type::VoiceConversionMediaTokenType; use errors::AnyhowResult; use tokens::tokens::voice_conversion_results::VoiceConversionResultToken; diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/create_dataset.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/create_dataset.rs index ec5b961c4e..25db893231 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/create_dataset.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/create_dataset.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/get_dataset.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/get_dataset.rs index e8be94d208..76ab454864 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/get_dataset.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/get_dataset.rs @@ -4,7 +4,7 @@ use log::error; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; @@ -92,7 +92,7 @@ async fn select_include_deleted( zd.ietf_language_tag, zd.ietf_primary_language_subtag, zd.maybe_creator_user_token, - zd.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + zd.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, zd.created_at, zd.updated_at FROM zs_voice_datasets as zd @@ -117,7 +117,7 @@ async fn select_without_deleted( zd.ietf_language_tag, zd.ietf_primary_language_subtag, zd.maybe_creator_user_token, - zd.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + zd.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, zd.created_at, zd.updated_at FROM zs_voice_datasets as zd diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/list_datasets_by_username.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/list_datasets_by_username.rs index 6d4d85f0d5..a540dd6baa 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/list_datasets_by_username.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/list_datasets_by_username.rs @@ -4,7 +4,7 @@ use log::{info, warn}; use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; @@ -107,7 +107,7 @@ async fn list_datasets_by_creator_username( users.username as creator_username, users.display_name as creator_display_name, users.email_gravatar_hash as creator_email_gravatar_hash, - zd.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + zd.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, zd.created_at, zd.updated_at FROM zs_voice_datasets as zd @@ -136,7 +136,7 @@ async fn list_datasets_by_creator_username( users.username as creator_username, users.display_name as creator_display_name, users.email_gravatar_hash as creator_email_gravatar_hash, - zd.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + zd.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, zd.created_at, zd.updated_at FROM zs_voice_datasets as zd diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/update_dataset.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/update_dataset.rs index 39386242fe..c2153a478b 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/update_dataset.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/datasets/update_dataset.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/voice_samples/insert_dataset_sample_and_media_file.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/voice_samples/insert_dataset_sample_and_media_file.rs index 66a35e1a07..796baded3a 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/voice_samples/insert_dataset_sample_and_media_file.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/voice_samples/insert_dataset_sample_and_media_file.rs @@ -2,10 +2,10 @@ use anyhow::anyhow; use sqlx::MySqlPool; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_uploads::media_upload_type::MediaUploadType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_uploads::media_upload_type::MediaUploadType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/voice_samples/list_dataset_samples_for_dataset_token.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/voice_samples/list_dataset_samples_for_dataset_token.rs index 0fa541eb79..ba635a7297 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/voice_samples/list_dataset_samples_for_dataset_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/voice_samples/list_dataset_samples_for_dataset_token.rs @@ -4,7 +4,7 @@ use log::warn; use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; @@ -102,7 +102,7 @@ async fn list_samples_by_dataset_token( SELECT zds.token as `token: tokens::tokens::zs_voice_dataset_samples::ZsVoiceDatasetSampleToken`, zds.media_file_token as `media_file_token: tokens::tokens::media_files::MediaFileToken`, - m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`, + m.media_type as `media_type: enums_db::by_table::media_files::media_file_type::MediaFileType`, m.public_bucket_directory_hash, m.maybe_public_bucket_prefix, m.maybe_public_bucket_extension, @@ -125,7 +125,7 @@ async fn list_samples_by_dataset_token( SELECT zds.token as `token: tokens::tokens::zs_voice_dataset_samples::ZsVoiceDatasetSampleToken`, zds.media_file_token as `media_file_token: tokens::tokens::media_files::MediaFileToken`, - m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`, + m.media_type as `media_type: enums_db::by_table::media_files::media_file_type::MediaFileType`, m.public_bucket_directory_hash, m.maybe_public_bucket_prefix, m.maybe_public_bucket_extension, diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/create_voice.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/create_voice.rs index e95a777112..bf3ba175a6 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/create_voice.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/create_voice.rs @@ -1,11 +1,11 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::by_table::generic_synthetic_ids::id_category::IdCategory; -use enums::by_table::zs_voices::encoding_type::ZsVoiceEncodingType; -use enums::by_table::zs_voices::model_category::ZsVoiceModelCategory; -use enums::by_table::zs_voices::model_type::ZsVoiceModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums_db::by_table::zs_voices::encoding_type::ZsVoiceEncodingType; +use enums_db::by_table::zs_voices::model_category::ZsVoiceModelCategory; +use enums_db::by_table::zs_voices::model_type::ZsVoiceModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/get_voice.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/get_voice.rs index 1b29123299..c9040e8d8c 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/get_voice.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/get_voice.rs @@ -4,7 +4,7 @@ use log::error; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::zs_voices::ZsVoiceToken; @@ -99,7 +99,7 @@ async fn select_include_deleted( zv.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`, zv.bucket_hash, zv.model_version, - zv.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + zv.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, zv.created_at, zv.updated_at FROM zs_voices as zv @@ -126,7 +126,7 @@ async fn select_without_deleted( zv.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`, zv.bucket_hash, zv.model_version, - zv.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + zv.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, zv.created_at, zv.updated_at FROM zs_voices as zv diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/list_voices_by_username.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/list_voices_by_username.rs index 970e5e2124..17d1a26df7 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/list_voices_by_username.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/list_voices_by_username.rs @@ -4,7 +4,7 @@ use log::{info, warn}; use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::zs_voices::ZsVoiceToken; @@ -106,7 +106,7 @@ async fn list_voices_by_creator_username( users.username as creator_username, users.display_name as creator_display_name, users.email_gravatar_hash as creator_email_gravatar_hash, - zv.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + zv.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, zv.created_at, zv.updated_at FROM zs_voices as zv @@ -135,7 +135,7 @@ async fn list_voices_by_creator_username( users.username as creator_username, users.display_name as creator_display_name, users.email_gravatar_hash as creator_email_gravatar_hash, - zv.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + zv.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, zv.created_at, zv.updated_at FROM zs_voices as zv diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs index 18d65c0b33..31db74a0f6 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs @@ -5,7 +5,7 @@ use chrono::{DateTime, Utc}; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::zs_voices::ZsVoiceToken; diff --git a/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/update_voice.rs b/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/update_voice.rs index 9ee48af33e..f1ccf7931f 100644 --- a/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/update_voice.rs +++ b/crates/schema/database/mysql_queries/src/queries/voice_designer/voices/update_voice.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::zs_voices::ZsVoiceToken; diff --git a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job_extended.rs b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job_extended.rs index 55ea0af739..98c9295e8a 100644 --- a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job_extended.rs +++ b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job_extended.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::w2l_inference_jobs::W2lInferenceJobToken; diff --git a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs index 443b4582de..e309e86cf0 100644 --- a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs +++ b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs @@ -9,7 +9,7 @@ use chrono::{DateTime, Utc}; use log::warn; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::w2l_results::W2lResultToken; @@ -78,7 +78,7 @@ SELECT creator_ip_address, maybe_creator_user_token, - creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`, disable_end_bump, disable_watermark, diff --git a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs index 18daf27506..1cf05c5009 100644 --- a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs +++ b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/edit_w2l_result.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; pub struct EditW2lResultArgs<'a> { diff --git a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs index fb5eb5ed46..87537076d0 100644 --- a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs +++ b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs @@ -6,7 +6,7 @@ use chrono::{DateTime, Utc}; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use crate::config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; @@ -209,9 +209,9 @@ impl ListW2lResultsQueryBuilder { pub fn build_query_string(&self) -> String { // TODO: I haven't figured out how to get field name disambiguation and type coercion working here. - // (1) w2l_results.creator_set_visibility `creator_set_visibility: crate::database::enums::record_visibility::RecordVisibility`, + // (1) w2l_results.creator_set_visibility `creator_set_visibility: crate::database::enums_db::record_visibility::RecordVisibility`, // Query error: no column found for name: creator_set_visibility - // (2) creator_set_visibility `creator_set_visibility: crate::database::enums::record_visibility::RecordVisibility`, + // (2) creator_set_visibility `creator_set_visibility: crate::database::enums_db::record_visibility::RecordVisibility`, // Column 'creator_set_visibility' in field list is ambiguous // TODO/NB: Unfortunately SQLx can't statically typecheck this query diff --git a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/query_w2l_result.rs b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/query_w2l_result.rs index e8bc6e8839..e999281642 100644 --- a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/query_w2l_result.rs +++ b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_results/query_w2l_result.rs @@ -8,7 +8,7 @@ use chrono::{DateTime, Utc}; use log::warn; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use crate::helpers::boolean_converters::nullable_i8_to_bool; diff --git a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs index 20d1053183..b9b64c88ac 100644 --- a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs +++ b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_templates/edit_w2l_template.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; pub struct EditW2lTemplateArgs<'a> { diff --git a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs index 4d24b83b92..0f7e264be9 100644 --- a/crates/schema/database/mysql_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs +++ b/crates/schema/database/mysql_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs @@ -8,7 +8,7 @@ use chrono::{DateTime, Utc}; use log::warn; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; diff --git a/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/get_wallet_ledger_entry_for_moderation.rs b/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/get_wallet_ledger_entry_for_moderation.rs index 2cd816769d..7f9599e4f3 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/get_wallet_ledger_entry_for_moderation.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/get_wallet_ledger_entry_for_moderation.rs @@ -3,7 +3,7 @@ use log::warn; use sqlx::MySqlPool; use chrono::{DateTime, Utc}; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use errors::AnyhowResult; use tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken; @@ -30,7 +30,7 @@ pub async fn get_wallet_ledger_entry_for_moderation( r#" SELECT token as `token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`, - entry_type as `entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`, + entry_type as `entry_type: enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`, maybe_entity_ref, credits_delta, banked_credits_before as `banked_credits_before: u32`, diff --git a/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/internal_insert_wallet_created_ledger_entry.rs b/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/internal_insert_wallet_created_ledger_entry.rs index 1cc8cf27d6..8d21485278 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/internal_insert_wallet_created_ledger_entry.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/internal_insert_wallet_created_ledger_entry.rs @@ -1,5 +1,5 @@ use crate::queries::wallet_ledger_entries::internal_insert_wallet_ledger_entry::InsertWalletLedgerEntry; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use sqlx::MySql; use tokens::tokens::wallets::WalletToken; diff --git a/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/internal_insert_wallet_ledger_entry.rs b/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/internal_insert_wallet_ledger_entry.rs index 9e79794e2e..1c2b942e15 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/internal_insert_wallet_ledger_entry.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/internal_insert_wallet_ledger_entry.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use log::error; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use errors::AnyhowResult; use sqlx::mysql::MySqlArguments; use sqlx::pool::PoolConnection; diff --git a/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs b/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs index 75154c65d1..9ffd6a050e 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs @@ -3,7 +3,7 @@ use log::warn; use sqlx::MySqlPool; use chrono::{DateTime, Utc}; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use errors::AnyhowResult; use tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken; use tokens::tokens::wallets::WalletToken; @@ -35,7 +35,7 @@ pub async fn list_wallet_ledger_entries_by_wallet( SELECT token as `token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`, wallet_token as `wallet_token: tokens::tokens::wallets::WalletToken`, - entry_type as `entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`, + entry_type as `entry_type: enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`, maybe_entity_ref, credits_delta, banked_credits_before as `banked_credits_before: u32`, diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/add_durable_banked_balance_to_wallet.rs b/crates/schema/database/mysql_queries/src/queries/wallets/add_durable_banked_balance_to_wallet.rs index 616ed2e58f..896e84e6a5 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/add_durable_banked_balance_to_wallet.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/add_durable_banked_balance_to_wallet.rs @@ -1,7 +1,7 @@ use crate::queries::wallet_ledger_entries::internal_insert_wallet_ledger_entry::InsertWalletLedgerEntry; use crate::queries::wallets::internal_select_wallet_balance_for_update::internal_select_wallet_balance_for_update; use crate::queries::wallets::wallet_update_summary::WalletUpdateSummary; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use num_traits::ToPrimitive; use sqlx::MySql; use tokens::tokens::wallets::WalletToken; diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/create_new_artcraft_wallet_for_owner_user.rs b/crates/schema/database/mysql_queries/src/queries/wallets/create_new_artcraft_wallet_for_owner_user.rs index 5949ea76c4..c6f5fdd4fe 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/create_new_artcraft_wallet_for_owner_user.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/create_new_artcraft_wallet_for_owner_user.rs @@ -1,5 +1,5 @@ use crate::queries::wallets::create_new_wallet_for_owner_user::create_new_wallet_for_owner_user; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use sqlx::MySql; use tokens::tokens::users::UserToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/create_new_wallet_for_owner_user.rs b/crates/schema/database/mysql_queries/src/queries/wallets/create_new_wallet_for_owner_user.rs index a57609d880..ba2debc630 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/create_new_wallet_for_owner_user.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/create_new_wallet_for_owner_user.rs @@ -1,5 +1,5 @@ use crate::queries::wallet_ledger_entries::internal_insert_wallet_created_ledger_entry::internal_insert_wallet_created_ledger_entry; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::error; use sqlx::MySql; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/find_primary_wallet_for_owner.rs b/crates/schema/database/mysql_queries/src/queries/wallets/find_primary_wallet_for_owner.rs index ccb8106900..bde1c235fb 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/find_primary_wallet_for_owner.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/find_primary_wallet_for_owner.rs @@ -1,6 +1,6 @@ use crate::errors::select_optional_record_error::SelectOptionalRecordError; use crate::types::query_map::QueryMap; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use sqlx; use sqlx::mysql::MySqlRow; use sqlx::pool::PoolConnection; @@ -73,7 +73,7 @@ fn query(user_token: &UserToken, namespace: PaymentsNamespace) r#" SELECT token as `token: tokens::tokens::wallets::WalletToken`, - wallet_namespace as `namespace: enums::common::payments_namespace::PaymentsNamespace`, + wallet_namespace as `namespace: enums_db::common::payments_namespace::PaymentsNamespace`, banked_credits, monthly_credits FROM wallets diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/find_primary_wallet_token_for_owner.rs b/crates/schema/database/mysql_queries/src/queries/wallets/find_primary_wallet_token_for_owner.rs index 32d065b7ee..13c685c359 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/find_primary_wallet_token_for_owner.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/find_primary_wallet_token_for_owner.rs @@ -1,6 +1,6 @@ use crate::errors::select_optional_record_error::SelectOptionalRecordError; use crate::types::query_map::QueryMap; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use sqlx; use sqlx::mysql::MySqlRow; use sqlx::pool::PoolConnection; diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/get_wallet_for_moderation.rs b/crates/schema/database/mysql_queries/src/queries/wallets/get_wallet_for_moderation.rs index 0019edf9b3..7dc2885b60 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/get_wallet_for_moderation.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/get_wallet_for_moderation.rs @@ -3,7 +3,7 @@ use log::warn; use sqlx::MySqlPool; use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::wallets::WalletToken; @@ -28,7 +28,7 @@ pub async fn get_wallet_for_moderation( r#" SELECT w.token as `token: tokens::tokens::wallets::WalletToken`, - w.wallet_namespace as `wallet_namespace: enums::common::payments_namespace::PaymentsNamespace`, + w.wallet_namespace as `wallet_namespace: enums_db::common::payments_namespace::PaymentsNamespace`, w.owner_user_token as `owner_user_token: tokens::tokens::users::UserToken`, w.banked_credits as `banked_credits: u32`, w.monthly_credits as `monthly_credits: u32`, diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/internal_select_wallet_balance_for_update.rs b/crates/schema/database/mysql_queries/src/queries/wallets/internal_select_wallet_balance_for_update.rs index 0331b8df95..19c2eeb332 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/internal_select_wallet_balance_for_update.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/internal_select_wallet_balance_for_update.rs @@ -2,7 +2,7 @@ use crate::errors::select_exactly_one_error::SelectExactlyOneError; use crate::helpers::boolean_converters::i8_to_bool; use sqlx; use sqlx::MySql; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use tokens::tokens::users::UserToken; use tokens::tokens::wallets::WalletToken; @@ -27,7 +27,7 @@ pub (super) async fn internal_select_wallet_balance_for_update( r#" SELECT token as `token: tokens::tokens::wallets::WalletToken`, - wallet_namespace as `namespace: enums::common::payments_namespace::PaymentsNamespace`, + wallet_namespace as `namespace: enums_db::common::payments_namespace::PaymentsNamespace`, owner_user_token as `owner_user_token: tokens::tokens::users::UserToken`, banked_credits, monthly_credits diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/list_user_wallets_for_moderation.rs b/crates/schema/database/mysql_queries/src/queries/wallets/list_user_wallets_for_moderation.rs index 2a52831e28..98342175c9 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/list_user_wallets_for_moderation.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/list_user_wallets_for_moderation.rs @@ -3,7 +3,7 @@ use log::warn; use sqlx::MySqlPool; use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use errors::AnyhowResult; use tokens::tokens::users::UserToken; use tokens::tokens::wallets::WalletToken; @@ -27,7 +27,7 @@ pub async fn list_user_wallets_for_moderation( r#" SELECT w.token as `token: tokens::tokens::wallets::WalletToken`, - w.wallet_namespace as `wallet_namespace: enums::common::payments_namespace::PaymentsNamespace`, + w.wallet_namespace as `wallet_namespace: enums_db::common::payments_namespace::PaymentsNamespace`, w.banked_credits as `banked_credits: u32`, w.monthly_credits as `monthly_credits: u32`, w.version, diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/refill_monthly_credits_balance_on_wallet.rs b/crates/schema/database/mysql_queries/src/queries/wallets/refill_monthly_credits_balance_on_wallet.rs index 2172081524..4678eb8c52 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/refill_monthly_credits_balance_on_wallet.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/refill_monthly_credits_balance_on_wallet.rs @@ -1,7 +1,7 @@ use crate::queries::wallet_ledger_entries::internal_insert_wallet_ledger_entry::InsertWalletLedgerEntry; use crate::queries::wallets::internal_select_wallet_balance_for_update::internal_select_wallet_balance_for_update; use crate::queries::wallets::wallet_update_summary::WalletUpdateSummary; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use num_traits::ToPrimitive; use sqlx::MySql; use tokens::tokens::wallets::WalletToken; diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/refund/try_to_refund_ledger_entry.rs b/crates/schema/database/mysql_queries/src/queries/wallets/refund/try_to_refund_ledger_entry.rs index 3e9b5dee18..f8f6f9f901 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/refund/try_to_refund_ledger_entry.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/refund/try_to_refund_ledger_entry.rs @@ -1,7 +1,7 @@ use log::info; use sqlx::MySql; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/refund/wallet_refund_error.rs b/crates/schema/database/mysql_queries/src/queries/wallets/refund/wallet_refund_error.rs index e1ae362db2..175b9c4d95 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/refund/wallet_refund_error.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/refund/wallet_refund_error.rs @@ -1,5 +1,5 @@ use crate::errors::select_exactly_one_error::SelectExactlyOneError; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use std::error::Error; use std::fmt::{Display, Formatter}; diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/spend/try_to_spend_wallet_balance.rs b/crates/schema/database/mysql_queries/src/queries/wallets/spend/try_to_spend_wallet_balance.rs index ad16b8e609..0e05ed14f5 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/spend/try_to_spend_wallet_balance.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/spend/try_to_spend_wallet_balance.rs @@ -2,7 +2,7 @@ use crate::queries::wallet_ledger_entries::internal_insert_wallet_ledger_entry:: use crate::queries::wallets::internal_select_wallet_balance_for_update::internal_select_wallet_balance_for_update; use crate::queries::wallets::spend::wallet_spend_error::WalletSpendError; use crate::queries::wallets::wallet_update_summary::WalletUpdateSummary; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use num_traits::ToPrimitive; use sqlx::MySql; use std::ops::Neg; diff --git a/crates/schema/database/mysql_queries/src/queries/wallets/wallet_update_summary.rs b/crates/schema/database/mysql_queries/src/queries/wallets/wallet_update_summary.rs index 767381a3d1..067bceeca1 100644 --- a/crates/schema/database/mysql_queries/src/queries/wallets/wallet_update_summary.rs +++ b/crates/schema/database/mysql_queries/src/queries/wallets/wallet_update_summary.rs @@ -1,4 +1,4 @@ -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use tokens::tokens::users::UserToken; use tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/schema/database/redis_schema/Cargo.toml b/crates/schema/database/redis_schema/Cargo.toml index 1e776cee7b..3c48505ba1 100644 --- a/crates/schema/database/redis_schema/Cargo.toml +++ b/crates/schema/database/redis_schema/Cargo.toml @@ -20,7 +20,7 @@ normal = ["workspace-build-acceleration"] workspace-build-acceleration.workspace = true # Internal -enums.workspace = true +enums_db.workspace = true errors.workspace = true tokens.workspace = true diff --git a/crates/schema/database/redis_schema/src/payloads/premium/inner_state/premium_payload.rs b/crates/schema/database/redis_schema/src/payloads/premium/inner_state/premium_payload.rs index 8126e3b53a..453b79e83c 100644 --- a/crates/schema/database/redis_schema/src/payloads/premium/inner_state/premium_payload.rs +++ b/crates/schema/database/redis_schema/src/payloads/premium/inner_state/premium_payload.rs @@ -83,7 +83,7 @@ impl HkeyStoreAdapter for PremiumPayload { #[cfg(test)] mod tests { - use enums::no_table::premium_product::premium_product_name::PremiumProductName; + use enums_db::no_table::premium_product::premium_product_name::PremiumProductName; use super::*; diff --git a/crates/schema/database/redis_schema/src/payloads/premium/inner_state/product_by_week_store.rs b/crates/schema/database/redis_schema/src/payloads/premium/inner_state/product_by_week_store.rs index 81ab513e33..abb25071ab 100644 --- a/crates/schema/database/redis_schema/src/payloads/premium/inner_state/product_by_week_store.rs +++ b/crates/schema/database/redis_schema/src/payloads/premium/inner_state/product_by_week_store.rs @@ -1,5 +1,5 @@ use std::collections::HashMap; -use enums::no_table::premium_product::premium_product_name::PremiumProductName; +use enums_db::no_table::premium_product::premium_product_name::PremiumProductName; use crate::payloads::premium::inner_state::product_by_week_subkey::ProductByWeekSubkey; #[derive(Clone)] diff --git a/crates/schema/database/redis_schema/src/payloads/premium/inner_state/product_by_week_subkey.rs b/crates/schema/database/redis_schema/src/payloads/premium/inner_state/product_by_week_subkey.rs index f1a7ee2b5b..77bc817c4e 100644 --- a/crates/schema/database/redis_schema/src/payloads/premium/inner_state/product_by_week_subkey.rs +++ b/crates/schema/database/redis_schema/src/payloads/premium/inner_state/product_by_week_subkey.rs @@ -1,6 +1,6 @@ use std::num::ParseIntError; use chrono::{Datelike, Utc}; -use enums::no_table::premium_product::premium_product_name::PremiumProductName; +use enums_db::no_table::premium_product::premium_product_name::PremiumProductName; use errors::{anyhow, AnyhowResult}; #[derive(Debug, Clone, PartialEq, Eq, Hash)] diff --git a/crates/schema/database/sqlite_queries/Cargo.toml b/crates/schema/database/sqlite_queries/Cargo.toml index 8c9a59e36f..0762260146 100644 --- a/crates/schema/database/sqlite_queries/Cargo.toml +++ b/crates/schema/database/sqlite_queries/Cargo.toml @@ -17,7 +17,7 @@ path = "src/lib.rs" [dependencies] # Internal -enums = { workspace = true } +enums_db = { workspace = true } errors = { workspace = true } tokens = { workspace = true } diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/insert_news_story.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/insert_news_story.rs index 4338556c95..4c5a236691 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/insert_news_story.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/insert_news_story.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::common::sqlite::web_content_type::WebContentType; +use enums_db::common::sqlite::web_content_type::WebContentType; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_all.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_all.rs index 49e224b57d..44298b4233 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_all.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_all.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_replayable.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_replayable.rs index c2c801e0d1..b92e2bd74e 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_replayable.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_stories/list/list_news_stories_replayable.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/insert_news_story_production.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/insert_news_story_production.rs index 899b22c782..53390cb58c 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/insert_news_story_production.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/insert_news_story_production.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::web_content_type::WebContentType; +use enums_db::common::sqlite::web_content_type::WebContentType; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_final_verification.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_final_verification.rs index 8840679dfa..aec7bc6ae6 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_final_verification.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_final_verification.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; @@ -18,25 +18,25 @@ SELECT id, news_story_token as `news_story_token: tokens::tokens::news_stories::NewsStoryToken`, original_news_canonical_url, - web_content_type as `web_content_type: enums::common::sqlite::web_content_type::WebContentType`, + web_content_type as `web_content_type: enums_db::common::sqlite::web_content_type::WebContentType`, original_news_title, maybe_summary_news_title, maybe_categorization, - overall_production_status as `overall_production_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + overall_production_status as `overall_production_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - llm_rendition_status as `llm_rendition_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_rendition_status as `llm_rendition_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_rendition_attempts, - llm_title_summary_status as `llm_title_summary_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_title_summary_status as `llm_title_summary_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_title_summary_attempts, - llm_categorization_status as `llm_categorization_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_categorization_status as `llm_categorization_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_categorization_attempts, - audio_generation_status as `audio_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - image_generation_status as `image_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + audio_generation_status as `audio_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + image_generation_status as `image_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, image_generation_attempts FROM news_story_productions WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_generation.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_generation.rs index d66ba74eda..2558ae5512 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_generation.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_audio_generation.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; @@ -18,25 +18,25 @@ SELECT id, news_story_token as `news_story_token: tokens::tokens::news_stories::NewsStoryToken`, original_news_canonical_url, - web_content_type as `web_content_type: enums::common::sqlite::web_content_type::WebContentType`, + web_content_type as `web_content_type: enums_db::common::sqlite::web_content_type::WebContentType`, original_news_title, maybe_summary_news_title, maybe_categorization, - overall_production_status as `overall_production_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + overall_production_status as `overall_production_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - llm_rendition_status as `llm_rendition_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_rendition_status as `llm_rendition_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_rendition_attempts, - llm_title_summary_status as `llm_title_summary_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_title_summary_status as `llm_title_summary_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_title_summary_attempts, - llm_categorization_status as `llm_categorization_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_categorization_status as `llm_categorization_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_categorization_attempts, - audio_generation_status as `audio_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - image_generation_status as `image_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + audio_generation_status as `audio_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + image_generation_status as `image_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, image_generation_attempts FROM news_story_productions WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_greenlight.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_greenlight.rs index 5ef0bf89cb..8d46584044 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_greenlight.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_greenlight.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; @@ -18,25 +18,25 @@ SELECT id, news_story_token as `news_story_token: tokens::tokens::news_stories::NewsStoryToken`, original_news_canonical_url, - web_content_type as `web_content_type: enums::common::sqlite::web_content_type::WebContentType`, + web_content_type as `web_content_type: enums_db::common::sqlite::web_content_type::WebContentType`, original_news_title, maybe_summary_news_title, maybe_categorization, - overall_production_status as `overall_production_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + overall_production_status as `overall_production_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - llm_rendition_status as `llm_rendition_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_rendition_status as `llm_rendition_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_rendition_attempts, - llm_title_summary_status as `llm_title_summary_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_title_summary_status as `llm_title_summary_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_title_summary_attempts, - llm_categorization_status as `llm_categorization_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_categorization_status as `llm_categorization_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_categorization_attempts, - audio_generation_status as `audio_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - image_generation_status as `image_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + audio_generation_status as `audio_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + image_generation_status as `image_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, image_generation_attempts FROM news_story_productions WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_image_generation.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_image_generation.rs index 83b34c80ce..7359fd107f 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_image_generation.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_image_generation.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; @@ -23,25 +23,25 @@ SELECT id, news_story_token as `news_story_token: tokens::tokens::news_stories::NewsStoryToken`, original_news_canonical_url, - web_content_type as `web_content_type: enums::common::sqlite::web_content_type::WebContentType`, + web_content_type as `web_content_type: enums_db::common::sqlite::web_content_type::WebContentType`, original_news_title, maybe_summary_news_title, maybe_categorization, - overall_production_status as `overall_production_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + overall_production_status as `overall_production_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - llm_rendition_status as `llm_rendition_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_rendition_status as `llm_rendition_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_rendition_attempts, - llm_title_summary_status as `llm_title_summary_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_title_summary_status as `llm_title_summary_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_title_summary_attempts, - llm_categorization_status as `llm_categorization_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_categorization_status as `llm_categorization_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_categorization_attempts, - audio_generation_status as `audio_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - image_generation_status as `image_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + audio_generation_status as `audio_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + image_generation_status as `image_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, image_generation_attempts FROM news_story_productions WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_categorization.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_categorization.rs index ba8aa6f2d9..91accfc991 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_categorization.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_categorization.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; @@ -23,25 +23,25 @@ SELECT id, news_story_token as `news_story_token: tokens::tokens::news_stories::NewsStoryToken`, original_news_canonical_url, - web_content_type as `web_content_type: enums::common::sqlite::web_content_type::WebContentType`, + web_content_type as `web_content_type: enums_db::common::sqlite::web_content_type::WebContentType`, original_news_title, maybe_summary_news_title, maybe_categorization, - overall_production_status as `overall_production_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + overall_production_status as `overall_production_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - llm_rendition_status as `llm_rendition_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_rendition_status as `llm_rendition_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_rendition_attempts, - llm_title_summary_status as `llm_title_summary_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_title_summary_status as `llm_title_summary_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_title_summary_attempts, - llm_categorization_status as `llm_categorization_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_categorization_status as `llm_categorization_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_categorization_attempts, - audio_generation_status as `audio_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - image_generation_status as `image_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + audio_generation_status as `audio_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + image_generation_status as `image_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, image_generation_attempts FROM news_story_productions WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_rendition.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_rendition.rs index ff227bb7e2..0735765a1a 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_rendition.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_rendition.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; @@ -23,25 +23,25 @@ SELECT id, news_story_token as `news_story_token: tokens::tokens::news_stories::NewsStoryToken`, original_news_canonical_url, - web_content_type as `web_content_type: enums::common::sqlite::web_content_type::WebContentType`, + web_content_type as `web_content_type: enums_db::common::sqlite::web_content_type::WebContentType`, original_news_title, maybe_summary_news_title, maybe_categorization, - overall_production_status as `overall_production_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + overall_production_status as `overall_production_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - llm_rendition_status as `llm_rendition_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_rendition_status as `llm_rendition_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_rendition_attempts, - llm_title_summary_status as `llm_title_summary_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_title_summary_status as `llm_title_summary_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_title_summary_attempts, - llm_categorization_status as `llm_categorization_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_categorization_status as `llm_categorization_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_categorization_attempts, - audio_generation_status as `audio_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - image_generation_status as `image_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + audio_generation_status as `audio_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + image_generation_status as `image_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, image_generation_attempts FROM news_story_productions WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_title_summary.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_title_summary.rs index 78f4c50683..5b1edf1504 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_title_summary.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_awaiting_llm_title_summary.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; @@ -23,25 +23,25 @@ SELECT id, news_story_token as `news_story_token: tokens::tokens::news_stories::NewsStoryToken`, original_news_canonical_url, - web_content_type as `web_content_type: enums::common::sqlite::web_content_type::WebContentType`, + web_content_type as `web_content_type: enums_db::common::sqlite::web_content_type::WebContentType`, original_news_title, maybe_summary_news_title, maybe_categorization, - overall_production_status as `overall_production_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + overall_production_status as `overall_production_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - llm_rendition_status as `llm_rendition_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_rendition_status as `llm_rendition_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_rendition_attempts, - llm_title_summary_status as `llm_title_summary_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_title_summary_status as `llm_title_summary_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_title_summary_attempts, - llm_categorization_status as `llm_categorization_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_categorization_status as `llm_categorization_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_categorization_attempts, - audio_generation_status as `audio_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - image_generation_status as `image_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + audio_generation_status as `audio_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + image_generation_status as `image_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, image_generation_attempts FROM news_story_productions WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_ready_for_debut.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_ready_for_debut.rs index c5b5d592f1..8cea51e3be 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_ready_for_debut.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/list_news_story_productions_ready_for_debut.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; @@ -18,25 +18,25 @@ SELECT id, news_story_token as `news_story_token: tokens::tokens::news_stories::NewsStoryToken`, original_news_canonical_url, - web_content_type as `web_content_type: enums::common::sqlite::web_content_type::WebContentType`, + web_content_type as `web_content_type: enums_db::common::sqlite::web_content_type::WebContentType`, original_news_title, maybe_summary_news_title, maybe_categorization, - overall_production_status as `overall_production_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + overall_production_status as `overall_production_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - llm_rendition_status as `llm_rendition_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_rendition_status as `llm_rendition_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_rendition_attempts, - llm_title_summary_status as `llm_title_summary_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_title_summary_status as `llm_title_summary_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_title_summary_attempts, - llm_categorization_status as `llm_categorization_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + llm_categorization_status as `llm_categorization_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, llm_categorization_attempts, - audio_generation_status as `audio_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, - image_generation_status as `image_generation_status: enums::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + audio_generation_status as `audio_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, + image_generation_status as `image_generation_status: enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus`, image_generation_attempts FROM news_story_productions WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/news_story_production_item.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/news_story_production_item.rs index 60951d23bc..d2a6940d9b 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/news_story_production_item.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/list/news_story_production_item.rs @@ -1,5 +1,5 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; -use enums::common::sqlite::web_content_type::WebContentType; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::web_content_type::WebContentType; use tokens::tokens::news_stories::NewsStoryToken; pub struct NewsStoryProductionItem { diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_finalized_failure.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_finalized_failure.rs index c2440b2cc0..5656337335 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_finalized_failure.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_finalized_failure.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_finalized_success.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_finalized_success.rs index e3b9cf5666..06cb633c8c 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_finalized_success.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_finalized_success.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_preprocessing_status.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_preprocessing_status.rs index 1d26ffb516..a109294e0d 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_preprocessing_status.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_audio_preprocessing_status.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_image_generation_status.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_image_generation_status.rs index ac72af7d0d..48c221314e 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_image_generation_status.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_image_generation_status.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_categorization_status.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_categorization_status.rs index a851b0c539..966ea2e187 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_categorization_status.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_categorization_status.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_rendition_status.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_rendition_status.rs index d6410b797e..ec3e89de12 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_rendition_status.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_rendition_status.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_title_summary_status.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_title_summary_status.rs index 36ed54d08f..d5efc8da3a 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_title_summary_status.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_llm_title_summary_status.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_post_production_complete.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_post_production_complete.rs index 1e8f5c19c5..5dd588a027 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_post_production_complete.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_post_production_complete.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_production_greenlit_status.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_production_greenlit_status.rs index ac6ead61a5..c132e33a96 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_production_greenlit_status.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/news_story_productions/update/update_news_story_production_greenlit_status.rs @@ -1,5 +1,5 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; -use enums::common::sqlite::skip_reason::SkipReason; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::skip_reason::SkipReason; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_download.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_download.rs index 5a6921f475..ae98bf83e8 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_download.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_download.rs @@ -29,7 +29,7 @@ SELECT maybe_result_url, maybe_result_relative_filesystem_location, maybe_audio_duration_millis, - tts_render_status as `tts_render_status: enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus`, + tts_render_status as `tts_render_status: enums_db::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus`, tts_render_attempts FROM tts_render_tasks WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_render.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_render.rs index c643c75bf2..ca542b5772 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_render.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_awaiting_render.rs @@ -1,4 +1,4 @@ -use enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; +use enums_db::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::tts_models::TtsModelToken; @@ -34,7 +34,7 @@ SELECT maybe_result_url, maybe_result_relative_filesystem_location, maybe_audio_duration_millis, - tts_render_status as `tts_render_status: enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus`, + tts_render_status as `tts_render_status: enums_db::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus`, tts_render_attempts FROM tts_render_tasks WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_for_story_token.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_for_story_token.rs index 1ecfda79e2..c222ee2874 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_for_story_token.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/list_tts_render_tasks_for_story_token.rs @@ -1,4 +1,4 @@ -use enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; +use enums_db::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::tts_models::TtsModelToken; @@ -31,7 +31,7 @@ SELECT maybe_result_url, maybe_result_relative_filesystem_location, maybe_audio_duration_millis, - tts_render_status as `tts_render_status: enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus`, + tts_render_status as `tts_render_status: enums_db::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus`, tts_render_attempts FROM tts_render_tasks WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/tts_render_task.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/tts_render_task.rs index e5a11e80b2..cc0a8ada19 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/tts_render_task.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/list/tts_render_task.rs @@ -1,4 +1,4 @@ -use enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; +use enums_db::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; use tokens::tokens::tts_render_tasks::TtsRenderTaskToken; pub struct TtsRenderTask { diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_successfully_downloaded.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_successfully_downloaded.rs index 33251fdd92..d558a87830 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_successfully_downloaded.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_successfully_downloaded.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_successfully_submitted.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_successfully_submitted.rs index 37d6fc0350..774db7531a 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_successfully_submitted.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_successfully_submitted.rs @@ -1,4 +1,4 @@ -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_unsuccessfully_submitted.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_unsuccessfully_submitted.rs index c3fe1e43c2..7875782a56 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_unsuccessfully_submitted.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/tts_render_tasks/update/update_tts_render_task_unsuccessfully_submitted.rs @@ -1,5 +1,5 @@ -use enums::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; -use enums::common::sqlite::awaitable_job_status::AwaitableJobStatus; +use enums_db::by_table::tts_render_tasks::tts_render_status::TtsRenderStatus; +use enums_db::common::sqlite::awaitable_job_status::AwaitableJobStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; use tokens::tokens::news_stories::NewsStoryToken; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/insert_web_scraping_target.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/insert_web_scraping_target.rs index a3ff34c944..c4a03af0eb 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/insert_web_scraping_target.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/insert_web_scraping_target.rs @@ -1,6 +1,6 @@ -use enums::by_table::web_scraping_targets::scraping_status::ScrapingStatus; -use enums::common::sqlite::skip_reason::SkipReason; -use enums::common::sqlite::web_content_type::WebContentType; +use enums_db::by_table::web_scraping_targets::scraping_status::ScrapingStatus; +use enums_db::common::sqlite::skip_reason::SkipReason; +use enums_db::common::sqlite::web_content_type::WebContentType; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_all_web_scraping_targets.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_all_web_scraping_targets.rs index eb577fa188..3871261cd5 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_all_web_scraping_targets.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_all_web_scraping_targets.rs @@ -1,5 +1,5 @@ -use enums::by_table::web_scraping_targets::scraping_status::ScrapingStatus; -use enums::common::sqlite::web_content_type::WebContentType; +use enums_db::by_table::web_scraping_targets::scraping_status::ScrapingStatus; +use enums_db::common::sqlite::web_content_type::WebContentType; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; @@ -22,11 +22,11 @@ pub async fn list_all_web_scraping_targets( SELECT id, canonical_url, - web_content_type as `web_content_type: enums::common::sqlite::web_content_type::WebContentType`, + web_content_type as `web_content_type: enums_db::common::sqlite::web_content_type::WebContentType`, maybe_title, maybe_article_full_image_url, maybe_article_thumbnail_image_url, - scraping_status as `scraping_status: enums::by_table::web_scraping_targets::scraping_status::ScrapingStatus`, + scraping_status as `scraping_status: enums_db::by_table::web_scraping_targets::scraping_status::ScrapingStatus`, scrape_attempts FROM web_scraping_targets WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_web_scraping_targets.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_web_scraping_targets.rs index ae21b95be3..ed45f8316a 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_web_scraping_targets.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/list_web_scraping_targets.rs @@ -1,5 +1,5 @@ -use enums::by_table::web_scraping_targets::scraping_status::ScrapingStatus; -use enums::common::sqlite::web_content_type::WebContentType; +use enums_db::by_table::web_scraping_targets::scraping_status::ScrapingStatus; +use enums_db::common::sqlite::web_content_type::WebContentType; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; @@ -22,11 +22,11 @@ pub async fn list_web_scraping_targets( SELECT id, canonical_url, - web_content_type as `web_content_type: enums::common::sqlite::web_content_type::WebContentType`, + web_content_type as `web_content_type: enums_db::common::sqlite::web_content_type::WebContentType`, maybe_title, maybe_article_full_image_url, maybe_article_thumbnail_image_url, - scraping_status as `scraping_status: enums::by_table::web_scraping_targets::scraping_status::ScrapingStatus`, + scraping_status as `scraping_status: enums_db::by_table::web_scraping_targets::scraping_status::ScrapingStatus`, scrape_attempts FROM web_scraping_targets WHERE diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/web_scraping_target.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/web_scraping_target.rs index 5d4fa0400b..01859bc873 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/web_scraping_target.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/list/web_scraping_target.rs @@ -1,5 +1,5 @@ -use enums::by_table::web_scraping_targets::scraping_status::ScrapingStatus; -use enums::common::sqlite::web_content_type::WebContentType; +use enums_db::by_table::web_scraping_targets::scraping_status::ScrapingStatus; +use enums_db::common::sqlite::web_content_type::WebContentType; pub struct WebScrapingTarget { pub id: i64, diff --git a/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/update_web_scraping_target.rs b/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/update_web_scraping_target.rs index 529b5a57bd..8a67563647 100644 --- a/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/update_web_scraping_target.rs +++ b/crates/schema/database/sqlite_queries/src/queries/by_table/web_scraping_targets/update_web_scraping_target.rs @@ -1,4 +1,4 @@ -use enums::by_table::web_scraping_targets::scraping_status::ScrapingStatus; +use enums_db::by_table::web_scraping_targets::scraping_status::ScrapingStatus; use errors::{anyhow, AnyhowResult}; use sqlx::SqlitePool; diff --git a/crates/schema/database/sqlite_tasks/Cargo.toml b/crates/schema/database/sqlite_tasks/Cargo.toml index 7937087d01..79a046b19e 100644 --- a/crates/schema/database/sqlite_tasks/Cargo.toml +++ b/crates/schema/database/sqlite_tasks/Cargo.toml @@ -16,7 +16,8 @@ path = "src/lib.rs" workspace-build-acceleration.workspace = true # Internal -enums.workspace = true +enums_db.workspace = true +enums_shared.workspace = true errors.workspace = true tokens.workspace = true diff --git a/crates/schema/database/sqlite_tasks/src/error.rs b/crates/schema/database/sqlite_tasks/src/error.rs index 7224709e95..e9266a1bed 100644 --- a/crates/schema/database/sqlite_tasks/src/error.rs +++ b/crates/schema/database/sqlite_tasks/src/error.rs @@ -1,11 +1,11 @@ -use enums::error::enum_error::EnumError; +use enums_shared::error::enums_error::EnumsError; use std::error::Error; use std::fmt::{Display, Formatter}; #[derive(Debug)] pub enum SqliteTasksError { SqlxError(sqlx::Error), - EnumError(EnumError), + EnumsError(EnumsError), //TaskNotFound, //TaskAlreadyExists, //InvalidTaskStatus, @@ -19,7 +19,7 @@ impl Display for SqliteTasksError { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { match self { SqliteTasksError::SqlxError(err) => write!(f, "SQLx error: {:?}", err), - SqliteTasksError::EnumError(err) => write!(f, "Error parsing enum: {:?}", err), + SqliteTasksError::EnumsError(err) => write!(f, "Error parsing enum: {:?}", err), } } } @@ -30,8 +30,8 @@ impl From for SqliteTasksError { } } -impl From for SqliteTasksError { - fn from(err: EnumError) -> Self { - SqliteTasksError::EnumError(err) +impl From for SqliteTasksError { + fn from(err: EnumsError) -> Self { + SqliteTasksError::EnumsError(err) } } diff --git a/crates/schema/database/sqlite_tasks/src/queries/create_task.rs b/crates/schema/database/sqlite_tasks/src/queries/create_task.rs index 1d7e4385db..d9d2d8b42a 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/create_task.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/create_task.rs @@ -1,10 +1,10 @@ use crate::connection::TaskDbConnection; use crate::error::SqliteTasksError; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_model_type::TaskModelType; -use enums::tauri::tasks::task_status::TaskStatus; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_model_type::TaskModelType; +use enums_db::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use tokens::tokens::sqlite::tasks::TaskId; pub struct CreateTaskArgs<'a> { diff --git a/crates/schema/database/sqlite_tasks/src/queries/get_task_by_provider_and_provider_job_id.rs b/crates/schema/database/sqlite_tasks/src/queries/get_task_by_provider_and_provider_job_id.rs index 3d1e3aaf80..4a08603a4c 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/get_task_by_provider_and_provider_job_id.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/get_task_by_provider_and_provider_job_id.rs @@ -1,11 +1,11 @@ use crate::connection::TaskDbConnection; use crate::error::SqliteTasksError; use crate::queries::task::Task; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_model_type::TaskModelType; -use enums::tauri::tasks::task_status::TaskStatus; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_model_type::TaskModelType; +use enums_db::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use sqlx::Error; use tokens::tokens::sqlite::tasks::TaskId; diff --git a/crates/schema/database/sqlite_tasks/src/queries/list_tasks_by_provider_and_status.rs b/crates/schema/database/sqlite_tasks/src/queries/list_tasks_by_provider_and_status.rs index 20e5f2003b..cb281a32a1 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/list_tasks_by_provider_and_status.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/list_tasks_by_provider_and_status.rs @@ -1,11 +1,11 @@ use crate::connection::TaskDbConnection; use crate::error::SqliteTasksError; use crate::queries::task::{RawTask, Task}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_model_type::TaskModelType; -use enums::tauri::tasks::task_status::TaskStatus; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_model_type::TaskModelType; +use enums_db::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use sqlx::{QueryBuilder, Sqlite}; use std::collections::HashSet; use tokens::tokens::sqlite::tasks::TaskId; diff --git a/crates/schema/database/sqlite_tasks/src/queries/list_tasks_by_provider_and_tokens.rs b/crates/schema/database/sqlite_tasks/src/queries/list_tasks_by_provider_and_tokens.rs index 1aff07d89c..b086498aa0 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/list_tasks_by_provider_and_tokens.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/list_tasks_by_provider_and_tokens.rs @@ -1,11 +1,11 @@ use crate::connection::TaskDbConnection; use crate::error::SqliteTasksError; use crate::queries::task::{RawTask, Task}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_model_type::TaskModelType; -use enums::tauri::tasks::task_status::TaskStatus; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_model_type::TaskModelType; +use enums_db::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use sqlx::{QueryBuilder, Sqlite}; use tokens::tokens::sqlite::tasks::TaskId; diff --git a/crates/schema/database/sqlite_tasks/src/queries/list_tasks_for_frontend.rs b/crates/schema/database/sqlite_tasks/src/queries/list_tasks_for_frontend.rs index 6156218347..b3537c79be 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/list_tasks_for_frontend.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/list_tasks_for_frontend.rs @@ -1,13 +1,13 @@ use crate::connection::TaskDbConnection; use crate::error::SqliteTasksError; use chrono::{DateTime, Utc}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_failure_type::TaskFailureType; -use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; -use enums::tauri::tasks::task_model_type::TaskModelType; -use enums::tauri::tasks::task_status::TaskStatus; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_failure_type::TaskFailureType; +use enums_db::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_db::tauri::tasks::task_model_type::TaskModelType; +use enums_db::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::sqlite::tasks::TaskId; diff --git a/crates/schema/database/sqlite_tasks/src/queries/task.rs b/crates/schema/database/sqlite_tasks/src/queries/task.rs index 27ebe63db1..92396d6c04 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/task.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/task.rs @@ -1,8 +1,8 @@ -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_model_type::TaskModelType; -use enums::tauri::tasks::task_status::TaskStatus; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_model_type::TaskModelType; +use enums_db::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use tokens::tokens::sqlite::tasks::TaskId; #[derive(Debug, Clone)] diff --git a/crates/schema/database/sqlite_tasks/src/queries/update_successful_task_status_with_metadata.rs b/crates/schema/database/sqlite_tasks/src/queries/update_successful_task_status_with_metadata.rs index 7b46d0b690..2d4f6dd563 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/update_successful_task_status_with_metadata.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/update_successful_task_status_with_metadata.rs @@ -1,7 +1,7 @@ use crate::connection::TaskDbConnection; use crate::error::SqliteTasksError; -use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; -use enums::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_db::tauri::tasks::task_status::TaskStatus; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::sqlite::tasks::TaskId; diff --git a/crates/schema/database/sqlite_tasks/src/queries/update_successful_task_status_with_metadata_by_provider.rs b/crates/schema/database/sqlite_tasks/src/queries/update_successful_task_status_with_metadata_by_provider.rs index 12b25cc63f..273d24fe2d 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/update_successful_task_status_with_metadata_by_provider.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/update_successful_task_status_with_metadata_by_provider.rs @@ -1,8 +1,8 @@ -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; use crate::connection::TaskDbConnection; use crate::error::SqliteTasksError; -use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; -use enums::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_db::tauri::tasks::task_status::TaskStatus; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/sqlite_tasks/src/queries/update_task_status.rs b/crates/schema/database/sqlite_tasks/src/queries/update_task_status.rs index ead78ece46..a6e35e318b 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/update_task_status.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/update_task_status.rs @@ -1,6 +1,6 @@ use crate::connection::TaskDbConnection; use crate::error::SqliteTasksError; -use enums::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_status::TaskStatus; use tokens::tokens::sqlite::tasks::TaskId; pub struct UpdateTaskArgs<'a> { diff --git a/crates/schema/database/sqlite_tasks/src/queries/update_task_status_with_rich_failure.rs b/crates/schema/database/sqlite_tasks/src/queries/update_task_status_with_rich_failure.rs index 896d6c5cd4..59ad5891ab 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/update_task_status_with_rich_failure.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/update_task_status_with_rich_failure.rs @@ -1,7 +1,7 @@ -use enums::tauri::tasks::task_failure_type::TaskFailureType; +use enums_db::tauri::tasks::task_failure_type::TaskFailureType; use crate::connection::TaskDbConnection; use crate::error::SqliteTasksError; -use enums::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_status::TaskStatus; use tokens::tokens::sqlite::tasks::TaskId; pub struct UpdateTaskWithRichFailureArgs<'a> { diff --git a/crates/schema/public/composite_identifiers/Cargo.toml b/crates/schema/public/composite_identifiers/Cargo.toml index 5249c45993..3440a5328d 100644 --- a/crates/schema/public/composite_identifiers/Cargo.toml +++ b/crates/schema/public/composite_identifiers/Cargo.toml @@ -20,7 +20,7 @@ normal = ["workspace-build-acceleration"] workspace-build-acceleration = { workspace = true } # Internal -enums = { workspace = true } +enums_db = { workspace = true } tokens = { workspace = true } diff --git a/crates/schema/public/composite_identifiers/src/by_table/audit_logs/audit_log_entity.rs b/crates/schema/public/composite_identifiers/src/by_table/audit_logs/audit_log_entity.rs index 16e2f3f5ab..5b01c324aa 100644 --- a/crates/schema/public/composite_identifiers/src/by_table/audit_logs/audit_log_entity.rs +++ b/crates/schema/public/composite_identifiers/src/by_table/audit_logs/audit_log_entity.rs @@ -1,4 +1,4 @@ -use enums::by_table::audit_logs::audit_log_entity_type::AuditLogEntityType; +use enums_db::by_table::audit_logs::audit_log_entity_type::AuditLogEntityType; use tokens::tokens::comments::CommentToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/public/composite_identifiers/src/by_table/batch_generations/batch_generation_entity.rs b/crates/schema/public/composite_identifiers/src/by_table/batch_generations/batch_generation_entity.rs index 0c9a261314..4659c2d08c 100644 --- a/crates/schema/public/composite_identifiers/src/by_table/batch_generations/batch_generation_entity.rs +++ b/crates/schema/public/composite_identifiers/src/by_table/batch_generations/batch_generation_entity.rs @@ -1,4 +1,4 @@ -use enums::by_table::batch_generations::batch_generation_entity_type::BatchGenerationEntityType; +use enums_db::by_table::batch_generations::batch_generation_entity_type::BatchGenerationEntityType; use tokens::tokens::media_files::MediaFileToken; // TODO(bt, 2024-01-16): A ref type with <'a> lifetime of inner data instead of ownership? diff --git a/crates/schema/public/composite_identifiers/src/by_table/featured_items/featured_item_entity.rs b/crates/schema/public/composite_identifiers/src/by_table/featured_items/featured_item_entity.rs index cb3cd42337..9daa8d73fe 100644 --- a/crates/schema/public/composite_identifiers/src/by_table/featured_items/featured_item_entity.rs +++ b/crates/schema/public/composite_identifiers/src/by_table/featured_items/featured_item_entity.rs @@ -1,4 +1,4 @@ -use enums::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; +use enums_db::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/public/composite_identifiers/src/by_table/tag_uses/tag_use_entity.rs b/crates/schema/public/composite_identifiers/src/by_table/tag_uses/tag_use_entity.rs index e3425d2a92..a215043217 100644 --- a/crates/schema/public/composite_identifiers/src/by_table/tag_uses/tag_use_entity.rs +++ b/crates/schema/public/composite_identifiers/src/by_table/tag_uses/tag_use_entity.rs @@ -1,4 +1,4 @@ -use enums::by_table::tag_uses::tag_use_entity_type::TagUseEntityType; +use enums_db::by_table::tag_uses::tag_use_entity_type::TagUseEntityType; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/service/job/deprecated/analytics_job/Cargo.toml b/crates/service/job/deprecated/analytics_job/Cargo.toml index a673cba824..ed6df9660c 100644 --- a/crates/service/job/deprecated/analytics_job/Cargo.toml +++ b/crates/service/job/deprecated/analytics_job/Cargo.toml @@ -21,7 +21,7 @@ normal = ["workspace-build-acceleration"] config = { path = "../../../../lib/deprecated/config" } datetimes = { path = "../../../../lib/data/datetimes" } easyenv = { path = "../../../../lib/easyenv" } -enums = { workspace = true, default-features = false, features = [] } +enums_db = { workspace = true, default-features = false, features = [] } errors = { path = "../../../../lib/errors" } mysql_queries = { path = "../../../../schema/database/mysql_queries" } reusable_types = { path = "../../../../schema/public/reusable_types" } diff --git a/crates/service/job/deprecated/analytics_job/src/tasks/calculate_old_model_analytics/calculate_old_model_analytics.rs b/crates/service/job/deprecated/analytics_job/src/tasks/calculate_old_model_analytics/calculate_old_model_analytics.rs index b15b232299..b895f5634d 100644 --- a/crates/service/job/deprecated/analytics_job/src/tasks/calculate_old_model_analytics/calculate_old_model_analytics.rs +++ b/crates/service/job/deprecated/analytics_job/src/tasks/calculate_old_model_analytics/calculate_old_model_analytics.rs @@ -6,7 +6,7 @@ use rand::thread_rng; use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::by_table::trending_model_analytics::window_name::WindowName; +use enums_db::by_table::trending_model_analytics::window_name::WindowName; use errors::AnyhowResult; 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; diff --git a/crates/service/job/deprecated/es-update-job/Cargo.toml b/crates/service/job/deprecated/es-update-job/Cargo.toml index c6a714d166..f4ad04e0a2 100644 --- a/crates/service/job/deprecated/es-update-job/Cargo.toml +++ b/crates/service/job/deprecated/es-update-job/Cargo.toml @@ -22,7 +22,7 @@ bootstrap = { path = "../../../../lib/bootstrap" } config = { path = "../../../../lib/deprecated/config" } easyenv = { path = "../../../../lib/easyenv" } elasticsearch_schema = { path = "../../../../schema/database/elasticsearch_schema" } -enums = { path = "../../../../schema/public/enums" } +enums_db.workspace = true errors = { path = "../../../../lib/errors" } mysql_queries = { path = "../../../../schema/database/mysql_queries" } primitives = { path = "../../../../lib/data/primitives" } diff --git a/crates/service/job/deprecated/es-update-job/src/tasks/model_weights/util/create_model_weight_document_from_record.rs b/crates/service/job/deprecated/es-update-job/src/tasks/model_weights/util/create_model_weight_document_from_record.rs index e0a41ab586..795a11444f 100644 --- a/crates/service/job/deprecated/es-update-job/src/tasks/model_weights/util/create_model_weight_document_from_record.rs +++ b/crates/service/job/deprecated/es-update-job/src/tasks/model_weights/util/create_model_weight_document_from_record.rs @@ -5,7 +5,7 @@ use serde_json::Value; use elasticsearch_schema::documents::model_weight_document::{MODEL_WEIGHT_INDEX, ModelWeightDocument}; use elasticsearch_schema::traits::document::Document; -use enums::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; use errors::AnyhowResult; use mysql_queries::queries::model_weights::batch_get::batch_get_model_weights_for_elastic_search_backfill::ModelWeightForElasticsearchRecord; use primitives::numerics::u64_to_i32_saturating::u64_to_i32_saturating; diff --git a/crates/service/job/deprecated/es-update-job/src/tasks/update_engine_media_files/update_engine_media_files.rs b/crates/service/job/deprecated/es-update-job/src/tasks/update_engine_media_files/update_engine_media_files.rs index 17f83b9b58..5261fa0eaa 100644 --- a/crates/service/job/deprecated/es-update-job/src/tasks/update_engine_media_files/update_engine_media_files.rs +++ b/crates/service/job/deprecated/es-update-job/src/tasks/update_engine_media_files/update_engine_media_files.rs @@ -10,9 +10,9 @@ use serde_json::Value; use elasticsearch_schema::documents::media_file_document::{MEDIA_FILE_INDEX, MediaFileDocument}; use elasticsearch_schema::traits::document::Document; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use mysql_queries::queries::media_files::list::list_media_files_for_elastic_search_backfill_using_cursor::{list_media_files_for_elastic_search_backfill_using_cursor, ListArgs, MediaFileForElasticsearchRecord}; From cb6bc26a5dbcbe849fa3bc5592e409eed6d7e259 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 22 Mar 2026 13:44:36 -0400 Subject: [PATCH 4/5] codegen db --- ...f0e80472a44ea99d35f96d893cbaff8f5a31.json} | 6 +++--- ...fa016097b85ada14c508bea6c86752deff6e.json} | 6 +++--- ...50eecf512fdbafefc43809b6d5d1e9a2b01c.json} | 6 +++--- ...e0fe71e102fe20e6163d4235cd205bacd5c2.json} | 6 +++--- ...104221f8e4054a9dcbfd5662cc95acbf9405.json} | 6 +++--- ...21a35822be458270d42a282a9250cc995286.json} | 6 +++--- ...f132d0c327b0f6886f6499a02d3491707e58.json} | 6 +++--- ...d64c5978f3be57322e1b73f793b87048ec11.json} | 10 +++++----- ...74c76b70a4877db8f186098dc705013bd3dc.json} | 12 +++++------ ...b6420d8fec9cf0a93c5a2a289ae7b5fc4d6d.json} | 6 +++--- ...212b989cb86ffdee15f1393e5aec76fe5509.json} | 8 ++++---- ...245cb5682500340fead26593ca0bf54c68c8.json} | 8 ++++---- ...5f2f0ad13d2958be38193d04222e482b95e8.json} | 8 ++++---- ...f23e735bd3ad232988d12665295518fda027.json} | 6 +++--- ...b93d582329d059dedb05acf9595292821294.json} | 20 +++++++++---------- ...3c20db89a8b0002b885a924d354ac3be8dd8.json} | 8 ++++---- ...53e7fe22b3ba68b0ae2ae296bb78a6c9be86.json} | 6 +++--- ...0697bdebccc6beb00bbfeb20f45e5e651934.json} | 6 +++--- ...b7aa81b8c004114e5666d8d3742a13c05657.json} | 6 +++--- ...bb2f167a91d6dd4ed30e76b978ef02906556.json} | 6 +++--- ...1a25dc1e8d875d1c08530b84dd872996431e.json} | 8 ++++---- ...336c35b83df0b52a2cf8ea1a5b30895b1e95.json} | 6 +++--- ...daa6b3f3e256b6490c8408279e9da378ccf9.json} | 6 +++--- ...059f081fecc223abc4893f13a0e2abb40df6.json} | 6 +++--- ...920501180098289cf5bf87f8052cf6d8062a.json} | 6 +++--- ...4732ef47bc1b335d7e4fd2fd301f86de71c7.json} | 6 +++--- ...37a50e0645d0cf236d7f1975c3e0445e894e.json} | 6 +++--- ...e86547d517a614d262fd5ee9f3048b8d3604.json} | 8 ++++---- ...f7eeecefdf75c0ed756bfc38c99627b574f6.json} | 8 ++++---- ...d80227dd754a6c194e9392ceeabd37303dce.json} | 6 +++--- ...5995bb391fa240cd26356d1b4321017b0a79.json} | 6 +++--- ...592a15beb7b4af96e757dcbe0544b283ec38.json} | 6 +++--- ...c1bfaf61deeee8e4f0f34087fff310b60065.json} | 8 ++++---- ...15c9da8fbb840c0fa5d8260bfc52fe7f25f6.json} | 10 +++++----- ...9dc691e5c5d888720129c22eab79b38f372c.json} | 6 +++--- ...4d8fe743882f007c50f3fcae3c7a24c46aa5.json} | 6 +++--- ...9b7ad5181692b1402b01fcd97983ecaa0c18.json} | 10 +++++----- ...f2f44f23bf90d2c510fb50a1c2ef8e0d08c6.json} | 6 +++--- ...faf47b272a85941178f8eb6865c32a0e0407.json} | 8 ++++---- ...f6dc26d4a591ffe65c5e6de84ecdf38e2355.json} | 10 +++++----- ...64a1cbc280e27586dbde0498c485ae0c29e2.json} | 10 +++++----- ...019d3c2a89b0af0f02d48395b8d82b0416d7.json} | 8 ++++---- ...0ea31a9efae04da32915ce761cd162f68dfb.json} | 10 +++++----- ...3c907c254b99aea94973d6a12fde324ed1c3.json} | 12 +++++------ ...5a71c3f0d26aa780b6fdb27b1cc5867c6d9b.json} | 6 +++--- ...c5aa88377d54f7890f7d4a8a5547386e95c2.json} | 6 +++--- ...7a2d1f54d6f6cadd8c564f7e43e32ae1176a.json} | 6 +++--- ...6a2512dd0bb927025b809027105707efd32a.json} | 6 +++--- ...c2322127e695c9dce7b94452bf5d32258af1.json} | 8 ++++---- ...35087680a57a56fb10c4d45c735b8061ff36.json} | 6 +++--- ...c33d78c4c0d1c42886dd7e0d5e882e6ea4b2.json} | 8 ++++---- ...a11f1b58b14d7a182d778d75225768d7c889.json} | 8 ++++---- ...1227b5294ef24dfd31dbcb7a1b8313d94b47.json} | 6 +++--- ...7050285dc15e548af7af75e5993c205ae6d7.json} | 6 +++--- ...edbe0018282c07743c528ad4211cd04a094f.json} | 6 +++--- ...4674f0330082c9477bbfdde9d55bdda2f63b.json} | 6 +++--- ...8e9372a203da4e5ceb862bdfb9b94e87663f.json} | 6 +++--- ...4b65859476b999c4b5debbf7104cb7723e4c.json} | 10 +++++----- ...3d83f62b2fe5919307fd2d8b2a6ba510a2bd.json} | 8 ++++---- ...449d832edd5856e70acfbf12a5d3484f4eb8.json} | 6 +++--- ...f3f4ea13a4569337c8ae2cdf2b1441423fbf.json} | 6 +++--- ...55bd70c8a7708adbc635653a9ffabca082dd.json} | 6 +++--- ...9fca9f03c5b4b4d6f6c136807fd285acee73.json} | 8 ++++---- ...b3a0bbb8d740546a0efa0d3d12a9b2a056c3.json} | 6 +++--- ...64689f3dd70e23a05ec10647c4dd0ddd75ed.json} | 6 +++--- ...4b373fd31898333e2747b3f9e660c667353e.json} | 10 +++++----- ...966b1d4524a7ebfc2f4b364e92b03021fa46.json} | 8 ++++---- ...69d516e7bdf47eca81b13da22754374ab267.json} | 6 +++--- ...002b5b8b2f88dee08185bc836dd2506c49df.json} | 6 +++--- ...13672ebd7b8a4767531bbc8d3e207baa83dd.json} | 8 ++++---- ...64d381cb46e8a15320f885981db58cf4b005.json} | 10 +++++----- ...96ecc25023be274d52465a0c837b2515ed1b.json} | 8 ++++---- ...fa53d8e6528393b9c41855774edf1f2e6ca6.json} | 20 +++++++++---------- ...fa66ff4ca6bc0f7d414cd8926a41a8b7014e.json} | 10 +++++----- ...5a256fe551dfe153147d1d889c05929f6d08.json} | 10 +++++----- ...0b082ef6fa721b124f2846e0e1a1968f619a.json} | 6 +++--- ...274d11b44ba05222e417f2880c2b46652a12.json} | 6 +++--- ...60e2e79ba13e9884cd1fc200837550e8d352.json} | 6 +++--- ...6f6605e079901a898ca508ab3878aaee3071.json} | 6 +++--- ...a68db42ad250780212d2e35925dc734bdc8c.json} | 6 +++--- ...07740d56d7452db7705bf5610b92c1a62f41.json} | 6 +++--- ...2efd0a249a658eb1f04ba17d001d2f5d5f41.json} | 10 +++++----- ...f78405de1b2e1e8aca47620be2d67904bede.json} | 6 +++--- ...08c766c27e5125a299f77dd25bdf0aa554c8.json} | 8 ++++---- ...9836b0a2a17094b57afb6b0cb2b280724a91.json} | 8 ++++---- ...5cb1cfe8a99cde072e1943e4db76133fa1f1.json} | 8 ++++---- ...602d72f3d1017cf3b29dffbe0a3a5c1acaa7.json} | 6 +++--- ...ff8684a2908359625ec03f1a15aee08399a4.json} | 8 ++++---- ...f8741ad1a58aa6c844e2a25b9539844f31ab.json} | 6 +++--- 89 files changed, 333 insertions(+), 333 deletions(-) rename .sqlx/{query-f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2.json => query-00683c06e84fea5031d47aed99b5f0e80472a44ea99d35f96d893cbaff8f5a31.json} (73%) rename .sqlx/{query-4c2a71386362fb54f38bd6633f8aebe75e0bd8edf1b1b8773c6298c1f6018332.json => query-01de2f77b2249a2a3ce34eec7133fa016097b85ada14c508bea6c86752deff6e.json} (78%) rename .sqlx/{query-99434f1e829c772003ee5649297072763fd5a1ba9862ca888cc989cac0d5b57d.json => query-067ab713270c30c56679e983489f50eecf512fdbafefc43809b6d5d1e9a2b01c.json} (77%) rename .sqlx/{query-771ebd8c236cc3bfeee2df7168c05f639b666e5d67a46593332ce02a0316b4f9.json => query-0ec0b220cfe8b3952e5826e61671e0fe71e102fe20e6163d4235cd205bacd5c2.json} (73%) rename .sqlx/{query-441dc17210c4662decb557b96f9985741db86adc013e1cafbe45d3005c3adb3e.json => query-13110a33551e9325d6817265d2f8104221f8e4054a9dcbfd5662cc95acbf9405.json} (92%) rename .sqlx/{query-b23033e8dcc1139aca1ea14f7c8c5769c285e0d1bc682cb6de2c0569aeb0ccfe.json => query-155dee26be86ff2dff2082e2b81e21a35822be458270d42a282a9250cc995286.json} (89%) rename .sqlx/{query-74b401958826a7e640540f248114f57a941324787d023783f84251e8dd56eeb7.json => query-23face277cecb9cb56f1eb552f13f132d0c327b0f6886f6499a02d3491707e58.json} (76%) rename .sqlx/{query-b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630.json => query-24197cea26eade28ad393da23c87d64c5978f3be57322e1b73f793b87048ec11.json} (73%) rename .sqlx/{query-a2c9e2f61eba666254f8432b3c50a0a7738ee3b3faa77c5281bc8e4af96159b9.json => query-2648bcdea5e7d870d9430e2d7dda74c76b70a4877db8f186098dc705013bd3dc.json} (72%) rename .sqlx/{query-f0f0c5f4d36464696a81adb5293b2d7b45d98428ebfeb20445d24e657d0ee374.json => query-298be260cdb08b49fa7738b50e40b6420d8fec9cf0a93c5a2a289ae7b5fc4d6d.json} (92%) rename .sqlx/{query-45ec7d47b09e0605e7ca2ed0dc7c2833bcfdbb5db97787004b8c6597aad93b56.json => query-2b1af6b9672681210ba39b78a3e1212b989cb86ffdee15f1393e5aec76fe5509.json} (81%) rename .sqlx/{query-c16ceef6967d2af394da3c5786656fc4fd62bcacdbd9878f99e98208ae285588.json => query-323730333973d5d154e1245d6f8e245cb5682500340fead26593ca0bf54c68c8.json} (86%) rename .sqlx/{query-4d45f5ce213627465e991eaec9b509100e22c614367b67ab026b5edd70927ea5.json => query-334079d841a853c3d1323b45d1f25f2f0ad13d2958be38193d04222e482b95e8.json} (75%) rename .sqlx/{query-9c28e9f8f163407755acaca1fb4a72849679b6bf98b8c87e1761200300111232.json => query-343be7c524d87bcee72c95e09b23f23e735bd3ad232988d12665295518fda027.json} (77%) rename .sqlx/{query-57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2.json => query-3526bc5ae8f3bd683ac1baf8633cb93d582329d059dedb05acf9595292821294.json} (68%) rename .sqlx/{query-7ebf5c2b58866413d964a137bce9027289fdc6c84fafc0c773cdedd536c6bf4c.json => query-36062cb07585009974d36fbc73943c20db89a8b0002b885a924d354ac3be8dd8.json} (87%) rename .sqlx/{query-4bfa96682bd1e7576c26c89e3d1a17162193f7df3c1530122ca8e715afc5f385.json => query-3bcd084acfa8a90f624cccbaf91e53e7fe22b3ba68b0ae2ae296bb78a6c9be86.json} (75%) rename .sqlx/{query-470e480110a875b3d28912cf1576cdbba8c53aaf9631a3d3c363a46e5d4513a4.json => query-3c82ce54b590a1ec5d52d824df9d0697bdebccc6beb00bbfeb20f45e5e651934.json} (93%) rename .sqlx/{query-799a88505077c6c286906087ee79141dd4aaa1d68df764c9a43b315e561d7291.json => query-3ca11e661a471da59e9926483194b7aa81b8c004114e5666d8d3742a13c05657.json} (75%) rename .sqlx/{query-7f874f4ac43d8c66e3ea8cb2fb56f57b93047355dd9faee4df48799f6d1be00a.json => query-3df3ce2eb45d6a9a04ab726d3e12bb2f167a91d6dd4ed30e76b978ef02906556.json} (79%) rename .sqlx/{query-dbf85f29c614d243a50e4259218f21c446c6ab17de35c8a8da08fe02822e8f58.json => query-3ee84c3f77b20b789b24976a8d8b1a25dc1e8d875d1c08530b84dd872996431e.json} (76%) rename .sqlx/{query-094eb099cde85835db0662c2700c6b82644b51bf9b3609391ed4d2945fe5e98f.json => query-419124f0fef3e9196daace36996e336c35b83df0b52a2cf8ea1a5b30895b1e95.json} (71%) rename .sqlx/{query-d621645f30cf671e3e9d83bc702878f73b1c4a2516985872a126600740aabf7a.json => query-41d3389805ea843f4fc524af7983daa6b3f3e256b6490c8408279e9da378ccf9.json} (86%) rename .sqlx/{query-05829f0117166608489ceb409d9bfd3cb3c71e58f29202e53a5a4372c0575dec.json => query-425dd6aacf01c64c8e60fcfb6d80059f081fecc223abc4893f13a0e2abb40df6.json} (82%) rename .sqlx/{query-def6fa246ef212fd0677697faa6aaf683461126031cf353f71e156dc1e607991.json => query-4260740578e769a0564f38698979920501180098289cf5bf87f8052cf6d8062a.json} (69%) rename .sqlx/{query-aa0de341dc212d4c020d2e3a655aa116d4e213004ee14fdebdd89e88f88f64ed.json => query-428a09ba93bc63b8666702677a214732ef47bc1b335d7e4fd2fd301f86de71c7.json} (86%) rename .sqlx/{query-cb33fd483f0fef7ec2a1f5950218f312a19e38c7971b88db949ccaa05bf7b7c4.json => query-4300398ca29f05f6a479aeb93df437a50e0645d0cf236d7f1975c3e0445e894e.json} (81%) rename .sqlx/{query-521945dd4271b04e4607b30d5bee3b82b8e030405f48a320d0ee2827ddd59e4b.json => query-45b9ca47da0da8565bbb662167abe86547d517a614d262fd5ee9f3048b8d3604.json} (80%) rename .sqlx/{query-eb47461f68a64712137cc99b79cae6969d0137907f4f7e4828e4051ad580ad3e.json => query-4c7453133fdc89fa097578e6835bf7eeecefdf75c0ed756bfc38c99627b574f6.json} (87%) rename .sqlx/{query-706f0fd898ec367a7e2851e51c4d00dc63c89521238e55281737758ac87cfb01.json => query-51729d37aaa6de2ded7e58ca562cd80227dd754a6c194e9392ceeabd37303dce.json} (73%) rename .sqlx/{query-db7951e49ea6c5b4547871ce7b7e3993a865d655051c8be4a197cde56c51fabf.json => query-531518a882bba47890abd0a1026a5995bb391fa240cd26356d1b4321017b0a79.json} (85%) rename .sqlx/{query-fa724ca3644d7cba26e503c1a2c900bea00e10250c703019363fe9cf855a5a69.json => query-56f14cfc5a16bc88fb8fdef05c1f592a15beb7b4af96e757dcbe0544b283ec38.json} (66%) rename .sqlx/{query-34afe8ddbf0fb5d746ec82827166348ae1a0734ca5986a7d696860efd90128ce.json => query-57efaab67451250b4afc3033f4dcc1bfaf61deeee8e4f0f34087fff310b60065.json} (73%) rename .sqlx/{query-7fe0ebaab55fdbfd4ab447e872e95a4def5888a0bb9f237d8a13bac8336a534b.json => query-5a914d59f09287f4708b87546a3b15c9da8fbb840c0fa5d8260bfc52fe7f25f6.json} (75%) rename .sqlx/{query-295ac99103e49c817d545d5a7b8a819a839885245c60f8ce2c13a73155917942.json => query-5ab6138d977a089eff185cc0d2b09dc691e5c5d888720129c22eab79b38f372c.json} (82%) rename .sqlx/{query-5c67010afd0bb8aa3cd8f6c2407c4c314ace016f816eca51991720a276340d41.json => query-5ba6cde0a61d0fdaec421f235df84d8fe743882f007c50f3fcae3c7a24c46aa5.json} (76%) rename .sqlx/{query-f75fedb86a93ac2542315ddb7ef0d46aa42ecc25a3cf9856219114064183337a.json => query-5bbc34904f8729aa94714bf7e31e9b7ad5181692b1402b01fcd97983ecaa0c18.json} (75%) rename .sqlx/{query-43753c8a8a35756059f6642908ec72e20244c06c92facee8cb7fc556009992a1.json => query-5f45c1ae38ccc8f77f6a02684c45f2f44f23bf90d2c510fb50a1c2ef8e0d08c6.json} (92%) rename .sqlx/{query-57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908.json => query-638e946f41e778bf6034b7702e43faf47b272a85941178f8eb6865c32a0e0407.json} (75%) rename .sqlx/{query-d243270734f48fce2f5072ddbde224abf24858c6484995949c98382aa58840a7.json => query-63b09aef13ce41446a594d904719f6dc26d4a591ffe65c5e6de84ecdf38e2355.json} (67%) rename .sqlx/{query-971471f349bcd22364b16b5d6c68e807ed897101eec1e8a62a7b8fab3359fa0c.json => query-654c980065ce2b39c73cad1cc0cd64a1cbc280e27586dbde0498c485ae0c29e2.json} (75%) rename .sqlx/{query-6d61619c29f59a487a258ab2a4814197b39015c5c6bc0e54db43923c7f283475.json => query-67af6a671a425afb65388f1ab94a019d3c2a89b0af0f02d48395b8d82b0416d7.json} (87%) rename .sqlx/{query-53c90f5230aa202aead37a224ec70e350172bc0ec4eeaebde22878ca4aa0f695.json => query-68f66e68dae336e102c9e31a4fb50ea31a9efae04da32915ce761cd162f68dfb.json} (76%) rename .sqlx/{query-6c0a2cb31a3241fc6cd0b6738901a31bd91298f131d3b87744c698e92eaec34b.json => query-699953d16eb9c60d8f91a91d6f833c907c254b99aea94973d6a12fde324ed1c3.json} (75%) rename .sqlx/{query-359be6ce263afd62fc748c14c06c62ded5ed59fc0a9d1186967028af400d7d61.json => query-6ba78379f2da84371f0e2857fd3f5a71c3f0d26aa780b6fdb27b1cc5867c6d9b.json} (79%) rename .sqlx/{query-e21825a48319819fc506b3e914625806ebde1ced4f48786174568e70028bd75b.json => query-6c09fd83db142bed334fc2da38e9c5aa88377d54f7890f7d4a8a5547386e95c2.json} (86%) rename .sqlx/{query-680d60fcda0f6fdf269f3525a3fe582db847e56ca7380c0ff5696cbd6efb7db3.json => query-6feaeea53c67e63ed996886d09227a2d1f54d6f6cadd8c564f7e43e32ae1176a.json} (73%) rename .sqlx/{query-81151fbc8a93723bfd6e06ca788c1d93ee391afde2ec3cf1a4a721f1cf1c9f2d.json => query-734e37c19df6c71b7c31bb28646e6a2512dd0bb927025b809027105707efd32a.json} (67%) rename .sqlx/{query-a32030db3502c091d443a0be522829e54eeda581faeb81639aa1b4b1fc19cdf8.json => query-75991874b6768df665f2d331ce51c2322127e695c9dce7b94452bf5d32258af1.json} (76%) rename .sqlx/{query-ac8e3bc9f4e0722ec2f805dbb52b8e43ec8f7a1aa923b9f8f5f6c0770a315ee6.json => query-7c864df2ea10d9569df58288868235087680a57a56fb10c4d45c735b8061ff36.json} (75%) rename .sqlx/{query-a44c637e84152864a00f0ba58838c2f3888e3061fc8b44291541840fdb706e44.json => query-86727fc74483ed1ade025dc8b2a3c33d78c4c0d1c42886dd7e0d5e882e6ea4b2.json} (85%) rename .sqlx/{query-fbe482c8987231c3b5d75f2e792d0fdd033de8a7eb821428fa034752c73edfb7.json => query-8bcdc3f2360fb6b81b2e2c0462eea11f1b58b14d7a182d778d75225768d7c889.json} (71%) rename .sqlx/{query-ffa85bac1e92386a908dfa656b6672ccc2b8ba417afcc489e4670a2287992b02.json => query-8c8901926b94e1f913532d73126c1227b5294ef24dfd31dbcb7a1b8313d94b47.json} (83%) rename .sqlx/{query-219165c1412716d2df3b791a81757180232c5f266384ad7e3e68ded4aa836d47.json => query-8f6c337b72acf22631db621f0bfd7050285dc15e548af7af75e5993c205ae6d7.json} (82%) rename .sqlx/{query-0cad9a0df1167ae1dfb7847b5ab8a09a7b1e1f7bf0d7a06beddab1098cb285f6.json => query-91e35cbe3be5c1c46bc237a60839edbe0018282c07743c528ad4211cd04a094f.json} (75%) rename .sqlx/{query-450714d30eada676f800bc61750f7a4aa0c800c48af920dba73f31bae7862fee.json => query-951e3cf8afdcf4c280a2c94790824674f0330082c9477bbfdde9d55bdda2f63b.json} (79%) rename .sqlx/{query-35b09082ebb923c8c3191eaee8553b7c3badbd9152ee43999f7c8ff1a6410fe9.json => query-99b6f277c93b10c9f0b5cd4a34eb8e9372a203da4e5ceb862bdfb9b94e87663f.json} (80%) rename .sqlx/{query-a3cf13dd4272af3b8fbcddba1f1ea711e64f57fb114886d60d4ae2937c56841d.json => query-9b098306416f4258808e069c00054b65859476b999c4b5debbf7104cb7723e4c.json} (74%) rename .sqlx/{query-fa623775c448be494778f73466d45d368e9cb575cb11dcdfc5d3128962f0e60d.json => query-9d0fbf8d459e00b7192f6aae88a43d83f62b2fe5919307fd2d8b2a6ba510a2bd.json} (79%) rename .sqlx/{query-f68d01ee1339c0a1ea8301fcc74359e981c20abebd7024844bea6e1b9486b458.json => query-b26531db300d3dd40d2038001806449d832edd5856e70acfbf12a5d3484f4eb8.json} (78%) rename .sqlx/{query-d220a1ea63e301deed98e4b3029dfc531e28196ec02ed4cf076646582b81099c.json => query-b859a486280799c2b5d89e0fa897f3f4ea13a4569337c8ae2cdf2b1441423fbf.json} (83%) rename .sqlx/{query-2be78dc9fada8cda24df59ee9911118aa6f40247b10c6a76e07cfa74fd7f1412.json => query-b8de2634dd2aa4b33741cbb5ef6355bd70c8a7708adbc635653a9ffabca082dd.json} (77%) rename .sqlx/{query-46662ffe56827f98f43968681bfaab2eaa6a73f017a92c3289777f49c115f839.json => query-bd0ed4704049c5e0b82a581abef99fca9f03c5b4b4d6f6c136807fd285acee73.json} (75%) rename .sqlx/{query-69b6e933ad400bc574204de301dde6748d2a1723f47c12e86afc05033a60d3a2.json => query-bd998428a51f61375608c59069fcb3a0bbb8d740546a0efa0d3d12a9b2a056c3.json} (79%) rename .sqlx/{query-ad0dfcca42406d0fe109056f2238ff2a48e2b0f287f86dbaf36363e3a9624ba2.json => query-c10672e9c9f5adb6d0ff7c60156e64689f3dd70e23a05ec10647c4dd0ddd75ed.json} (66%) rename .sqlx/{query-8bd7ddec0966c742754a278000902c7d5059237ef312c638817a465dcb1979de.json => query-c67b783665c157cd702c824ff8604b373fd31898333e2747b3f9e660c667353e.json} (75%) rename .sqlx/{query-366bc2a90afff0e0ff6b15d39c6815bf50f116ebdf99485aa909a647d52809dd.json => query-c6ca8d9375f234bb4df75da1d703966b1d4524a7ebfc2f4b364e92b03021fa46.json} (77%) rename .sqlx/{query-d56a26a7300495fac9741e77e390f16402e2273dbab9a15d7c17eb1f0da7a1b1.json => query-ccef29747718614db793f4d97e4069d516e7bdf47eca81b13da22754374ab267.json} (81%) rename .sqlx/{query-98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb.json => query-cdff8dd5b25c56b94884360dea2a002b5b8b2f88dee08185bc836dd2506c49df.json} (74%) rename .sqlx/{query-8deae5674403372e52eeaf29cb23fe92e562832530eab1e5c7684a10e35c5f36.json => query-ced0f360e1e5333837d46d32129013672ebd7b8a4767531bbc8d3e207baa83dd.json} (77%) rename .sqlx/{query-d0f9d2cf4176c3f7f8fbff66eb6ff9415d989afc2b5944629a7bcea4b5a822f3.json => query-d45d857eee353b5f3c35f1f6dda264d381cb46e8a15320f885981db58cf4b005.json} (73%) rename .sqlx/{query-58625c07952f5c9cd9590a5af6953edab58a35a95814ba89ce740a7aebc37557.json => query-d91d775fac7ca30c99abac34ba2596ecc25023be274d52465a0c837b2515ed1b.json} (77%) rename .sqlx/{query-f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6.json => query-d96a500d4d1ecf3fb8b75f6ffe60fa53d8e6528393b9c41855774edf1f2e6ca6.json} (69%) rename .sqlx/{query-bde5d2fed3508fb2c289fe583f35b0d6e6bb38d15da0271aaed761cbc342dac3.json => query-d9b2d521be0db5b5c007e332335ffa66ff4ca6bc0f7d414cd8926a41a8b7014e.json} (74%) rename .sqlx/{query-29fe7f8464257537840d7f095ec01f850d79f970109549d14978fc3bed7cef32.json => query-e382bc973741615d33d8684905475a256fe551dfe153147d1d889c05929f6d08.json} (75%) rename .sqlx/{query-3390084f700ef2444691a02c691a59ccdd66bc8b096547e89c68b58b04dd44e4.json => query-e3f5b62c77ccb985d9c4536c3d6b0b082ef6fa721b124f2846e0e1a1968f619a.json} (69%) rename .sqlx/{query-b83f7487976aa3100a783daa503b80e5bc58453d90579fe700d8a18ab66dab54.json => query-e627d2f757bcc48fe1b1894c41c3274d11b44ba05222e417f2880c2b46652a12.json} (88%) rename .sqlx/{query-02136088e16742de2154cd9e84eeebbdb76045ad26aeb1c517a54c296bf31087.json => query-e836c11eb2265c7476762cdb523160e2e79ba13e9884cd1fc200837550e8d352.json} (81%) rename .sqlx/{query-1bcb79b19d2e894bdbda7d9f717a8f22d580cfbb8294f0702b9ffaf7f3602145.json => query-ea3c8bdd7279ed4855031e93e35b6f6605e079901a898ca508ab3878aaee3071.json} (86%) rename .sqlx/{query-8b75503d61af6b4f799f775249cdaecec0250efea77a69bb84e618e3ea972b09.json => query-eb0e388a4e62f472da82ecc4d160a68db42ad250780212d2e35925dc734bdc8c.json} (87%) rename .sqlx/{query-82ce02cf9e0bb85932772e5c90dba7fd5782e7b68d6b8061e32624a3ee7e31c1.json => query-ed83023f1a62a8c0b97e9ccdfc1a07740d56d7452db7705bf5610b92c1a62f41.json} (88%) rename .sqlx/{query-be70e3bd4a946da7bd66a29a94e659b25f40a33ef5973a8ff34bfabe08db4051.json => query-efec57631af71ccde28be07a40582efd0a249a658eb1f04ba17d001d2f5d5f41.json} (69%) rename .sqlx/{query-d2d05678aa1c4c3b2d95bbb2ed563c2fc8b587c0480354a42f11409d9671afbe.json => query-f78fda5c12eb000a405e11e6ad4ef78405de1b2e1e8aca47620be2d67904bede.json} (83%) rename .sqlx/{query-0757d81ba153b2ad2df25df3dd92b655ef08b95f5f83251bf3573f9be3a9f8d1.json => query-f87ddc1a58613e0401e12f0acec608c766c27e5125a299f77dd25bdf0aa554c8.json} (63%) rename .sqlx/{query-3ca99449c071cb0a8d90a735e1a767a94be224a02e0d16e81997d569af8d4cbb.json => query-fb155632dd72ac2918041c80f8ca9836b0a2a17094b57afb6b0cb2b280724a91.json} (85%) rename .sqlx/{query-a0e1091c0deaf0265640d0c6d0a862d74172e7adf29c4c8e08e12a3662e323d5.json => query-fc3a47c90335e3912d03d53f9c4d5cb1cfe8a99cde072e1943e4db76133fa1f1.json} (86%) rename .sqlx/{query-ae34c2ce11250786962be50f167f15f6d2d023afe2bb31994d21a1007d81e0a0.json => query-fc42151ac09db6d655f27d83c589602d72f3d1017cf3b29dffbe0a3a5c1acaa7.json} (83%) rename .sqlx/{query-d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c.json => query-ff01a066883a22dfe8e78f814659ff8684a2908359625ec03f1a15aee08399a4.json} (83%) rename .sqlx/{query-ce8560e2ff8c879647c7b9f154a8987765272c53f95b9e6a8b8ee5c4ad7b1f17.json => query-ff105bceaac793f44d21d0a140daf8741ad1a58aa6c844e2a25b9539844f31ab.json} (91%) diff --git a/.sqlx/query-f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2.json b/.sqlx/query-00683c06e84fea5031d47aed99b5f0e80472a44ea99d35f96d893cbaff8f5a31.json similarity index 73% rename from .sqlx/query-f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2.json rename to .sqlx/query-00683c06e84fea5031d47aed99b5f0e80472a44ea99d35f96d893cbaff8f5a31.json index 70e69f269b..d3caef1e8d 100644 --- a/.sqlx/query-f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2.json +++ b/.sqlx/query-00683c06e84fea5031d47aed99b5f0e80472a44ea99d35f96d893cbaff8f5a31.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n m.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n m.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`\nFROM model_weights as m\nWHERE m.token = ?\n ", + "query": "\nSELECT\n m.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n m.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`\nFROM model_weights as m\nWHERE m.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -32,5 +32,5 @@ false ] }, - "hash": "f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2" + "hash": "00683c06e84fea5031d47aed99b5f0e80472a44ea99d35f96d893cbaff8f5a31" } diff --git a/.sqlx/query-4c2a71386362fb54f38bd6633f8aebe75e0bd8edf1b1b8773c6298c1f6018332.json b/.sqlx/query-01de2f77b2249a2a3ce34eec7133fa016097b85ada14c508bea6c86752deff6e.json similarity index 78% rename from .sqlx/query-4c2a71386362fb54f38bd6633f8aebe75e0bd8edf1b1b8773c6298c1f6018332.json rename to .sqlx/query-01de2f77b2249a2a3ce34eec7133fa016097b85ada14c508bea6c86752deff6e.json index e83aa3b989..673b07ae0a 100644 --- a/.sqlx/query-4c2a71386362fb54f38bd6633f8aebe75e0bd8edf1b1b8773c6298c1f6018332.json +++ b/.sqlx/query-01de2f77b2249a2a3ce34eec7133fa016097b85ada14c508bea6c86752deff6e.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`,\n user_token as `user_token: tokens::tokens::users::UserToken`,\n subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n subscription_product_slug,\n maybe_stripe_subscription_status,\n maybe_stripe_customer_id,\n maybe_stripe_product_id,\n maybe_stripe_subscription_id\n\nFROM user_subscriptions\n\nWHERE\n user_token = ?\n AND subscription_namespace = ?\n AND maybe_stripe_customer_id IS NOT NULL\n AND maybe_stripe_subscription_id IS NOT NULL\n AND maybe_stripe_subscription_status IS NOT NULL\n ORDER BY id ASC\n LIMIT 1\n ", + "query": "\nSELECT\n token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`,\n user_token as `user_token: tokens::tokens::users::UserToken`,\n subscription_namespace as `subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace`,\n subscription_product_slug,\n maybe_stripe_subscription_status,\n maybe_stripe_customer_id,\n maybe_stripe_product_id,\n maybe_stripe_subscription_id\n\nFROM user_subscriptions\n\nWHERE\n user_token = ?\n AND subscription_namespace = ?\n AND maybe_stripe_customer_id IS NOT NULL\n AND maybe_stripe_subscription_id IS NOT NULL\n AND maybe_stripe_subscription_status IS NOT NULL\n ORDER BY id ASC\n LIMIT 1\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace", + "name": "subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -98,5 +98,5 @@ true ] }, - "hash": "4c2a71386362fb54f38bd6633f8aebe75e0bd8edf1b1b8773c6298c1f6018332" + "hash": "01de2f77b2249a2a3ce34eec7133fa016097b85ada14c508bea6c86752deff6e" } diff --git a/.sqlx/query-99434f1e829c772003ee5649297072763fd5a1ba9862ca888cc989cac0d5b57d.json b/.sqlx/query-067ab713270c30c56679e983489f50eecf512fdbafefc43809b6d5d1e9a2b01c.json similarity index 77% rename from .sqlx/query-99434f1e829c772003ee5649297072763fd5a1ba9862ca888cc989cac0d5b57d.json rename to .sqlx/query-067ab713270c30c56679e983489f50eecf512fdbafefc43809b6d5d1e9a2b01c.json index 5b7466eb6b..beb2b364ef 100644 --- a/.sqlx/query-99434f1e829c772003ee5649297072763fd5a1ba9862ca888cc989cac0d5b57d.json +++ b/.sqlx/query-067ab713270c30c56679e983489f50eecf512fdbafefc43809b6d5d1e9a2b01c.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n zds.token as `token: tokens::tokens::zs_voice_dataset_samples::ZsVoiceDatasetSampleToken`,\n zds.media_file_token as `media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n zds.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n zds.created_at,\n zds.updated_at\n FROM zs_voice_dataset_samples as zds\n JOIN media_files as m\n ON zds.media_file_token = m.token\n WHERE zds.dataset_token = ?\n ", + "query": "\n SELECT\n zds.token as `token: tokens::tokens::zs_voice_dataset_samples::ZsVoiceDatasetSampleToken`,\n zds.media_file_token as `media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.media_type as `media_type: enums_db::by_table::media_files::media_file_type::MediaFileType`,\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n zds.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n zds.created_at,\n zds.updated_at\n FROM zs_voice_dataset_samples as zds\n JOIN media_files as m\n ON zds.media_file_token = m.token\n WHERE zds.dataset_token = ?\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType", + "name": "media_type: enums_db::by_table::media_files::media_file_type::MediaFileType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -109,5 +109,5 @@ false ] }, - "hash": "99434f1e829c772003ee5649297072763fd5a1ba9862ca888cc989cac0d5b57d" + "hash": "067ab713270c30c56679e983489f50eecf512fdbafefc43809b6d5d1e9a2b01c" } diff --git a/.sqlx/query-771ebd8c236cc3bfeee2df7168c05f639b666e5d67a46593332ce02a0316b4f9.json b/.sqlx/query-0ec0b220cfe8b3952e5826e61671e0fe71e102fe20e6163d4235cd205bacd5c2.json similarity index 73% rename from .sqlx/query-771ebd8c236cc3bfeee2df7168c05f639b666e5d67a46593332ce02a0316b4f9.json rename to .sqlx/query-0ec0b220cfe8b3952e5826e61671e0fe71e102fe20e6163d4235cd205bacd5c2.json index ed4199c7be..88e24fb629 100644 --- a/.sqlx/query-771ebd8c236cc3bfeee2df7168c05f639b666e5d67a46593332ce02a0316b4f9.json +++ b/.sqlx/query-0ec0b220cfe8b3952e5826e61671e0fe71e102fe20e6163d4235cd205bacd5c2.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n user_token as `user_token: tokens::tokens::users::UserToken`,\n payments_namespace as `payments_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n stripe_customer_id\n\nFROM user_stripe_customer_links\n\nWHERE\n user_token = ?\n AND payments_namespace = ?\n ORDER BY id ASC\n LIMIT 1\n ", + "query": "\nSELECT\n user_token as `user_token: tokens::tokens::users::UserToken`,\n payments_namespace as `payments_namespace: enums_db::common::payments_namespace::PaymentsNamespace`,\n stripe_customer_id\n\nFROM user_stripe_customer_links\n\nWHERE\n user_token = ?\n AND payments_namespace = ?\n ORDER BY id ASC\n LIMIT 1\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "payments_namespace: enums::common::payments_namespace::PaymentsNamespace", + "name": "payments_namespace: enums_db::common::payments_namespace::PaymentsNamespace", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -43,5 +43,5 @@ false ] }, - "hash": "771ebd8c236cc3bfeee2df7168c05f639b666e5d67a46593332ce02a0316b4f9" + "hash": "0ec0b220cfe8b3952e5826e61671e0fe71e102fe20e6163d4235cd205bacd5c2" } diff --git a/.sqlx/query-441dc17210c4662decb557b96f9985741db86adc013e1cafbe45d3005c3adb3e.json b/.sqlx/query-13110a33551e9325d6817265d2f8104221f8e4054a9dcbfd5662cc95acbf9405.json similarity index 92% rename from .sqlx/query-441dc17210c4662decb557b96f9985741db86adc013e1cafbe45d3005c3adb3e.json rename to .sqlx/query-13110a33551e9325d6817265d2f8104221f8e4054a9dcbfd5662cc95acbf9405.json index 0e4c5c7e85..dafe5720e9 100644 --- a/.sqlx/query-441dc17210c4662decb557b96f9985741db86adc013e1cafbe45d3005c3adb3e.json +++ b/.sqlx/query-13110a33551e9325d6817265d2f8104221f8e4054a9dcbfd5662cc95acbf9405.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type,\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n tts.title,\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n tts.is_locked_from_use,\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n tts.maybe_suggested_unique_bot_command,\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n tts.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n tts.created_at,\n tts.updated_at\nFROM tts_models as tts\nJOIN users\nON\n users.token = tts.creator_user_token\nWHERE\n users.username = ?\n AND tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type,\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n tts.title,\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n tts.is_locked_from_use,\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n tts.maybe_suggested_unique_bot_command,\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n tts.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n tts.created_at,\n tts.updated_at\nFROM tts_models as tts\nJOIN users\nON\n users.token = tts.creator_user_token\nWHERE\n users.username = ?\n AND tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -165,7 +165,7 @@ }, { "ordinal": 16, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -219,5 +219,5 @@ false ] }, - "hash": "441dc17210c4662decb557b96f9985741db86adc013e1cafbe45d3005c3adb3e" + "hash": "13110a33551e9325d6817265d2f8104221f8e4054a9dcbfd5662cc95acbf9405" } diff --git a/.sqlx/query-b23033e8dcc1139aca1ea14f7c8c5769c285e0d1bc682cb6de2c0569aeb0ccfe.json b/.sqlx/query-155dee26be86ff2dff2082e2b81e21a35822be458270d42a282a9250cc995286.json similarity index 89% rename from .sqlx/query-b23033e8dcc1139aca1ea14f7c8c5769c285e0d1bc682cb6de2c0569aeb0ccfe.json rename to .sqlx/query-155dee26be86ff2dff2082e2b81e21a35822be458270d42a282a9250cc995286.json index 2f12c155b7..0e632b9d91 100644 --- a/.sqlx/query-b23033e8dcc1139aca1ea14f7c8c5769c285e0d1bc682cb6de2c0569aeb0ccfe.json +++ b/.sqlx/query-155dee26be86ff2dff2082e2b81e21a35822be458270d42a282a9250cc995286.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n zv.token as `token: tokens::tokens::zs_voices::ZsVoiceToken`,\n zv.title,\n zv.ietf_language_tag,\n zv.ietf_primary_language_subtag,\n zv.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n zv.bucket_hash,\n zv.model_version,\n zv.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n zv.created_at,\n zv.updated_at\n FROM zs_voices as zv\n WHERE\n zv.token = ?\n ", + "query": "\n SELECT\n zv.token as `token: tokens::tokens::zs_voices::ZsVoiceToken`,\n zv.title,\n zv.ietf_language_tag,\n zv.ietf_primary_language_subtag,\n zv.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n zv.bucket_hash,\n zv.model_version,\n zv.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n zv.created_at,\n zv.updated_at\n FROM zs_voices as zv\n WHERE\n zv.token = ?\n ", "describe": { "columns": [ { @@ -75,7 +75,7 @@ }, { "ordinal": 7, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -120,5 +120,5 @@ false ] }, - "hash": "b23033e8dcc1139aca1ea14f7c8c5769c285e0d1bc682cb6de2c0569aeb0ccfe" + "hash": "155dee26be86ff2dff2082e2b81e21a35822be458270d42a282a9250cc995286" } diff --git a/.sqlx/query-74b401958826a7e640540f248114f57a941324787d023783f84251e8dd56eeb7.json b/.sqlx/query-23face277cecb9cb56f1eb552f13f132d0c327b0f6886f6499a02d3491707e58.json similarity index 76% rename from .sqlx/query-74b401958826a7e640540f248114f57a941324787d023783f84251e8dd56eeb7.json rename to .sqlx/query-23face277cecb9cb56f1eb552f13f132d0c327b0f6886f6499a02d3491707e58.json index 7288bf6a16..8ded735062 100644 --- a/.sqlx/query-74b401958826a7e640540f248114f57a941324787d023783f84251e8dd56eeb7.json +++ b/.sqlx/query-23face277cecb9cb56f1eb552f13f132d0c327b0f6886f6499a02d3491707e58.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n b.token as `token: tokens::tokens::beta_keys::BetaKeyToken`,\n\n b.product as `product: enums::by_table::beta_keys::beta_key_product::BetaKeyProduct`,\n b.key_value,\n\n b.maybe_referrer_user_token as `maybe_referrer_user_token: tokens::tokens::users::UserToken`,\n referrer.username as maybe_referrer_username,\n referrer.display_name as maybe_referrer_display_name,\n referrer.email_gravatar_hash as maybe_referrer_gravatar_hash,\n\n b.maybe_redeemer_user_token as `maybe_redeemer_user_token: tokens::tokens::users::UserToken`,\n redeemer.username as maybe_redeemer_username,\n redeemer.display_name as maybe_redeemer_display_name,\n redeemer.email_gravatar_hash as maybe_redeemer_gravatar_hash,\n\n b.created_at,\n b.maybe_redeemed_at\n\nFROM beta_keys AS b\n\nLEFT OUTER JOIN users AS referrer\n ON b.maybe_referrer_user_token = referrer.token\n\nLEFT OUTER JOIN users AS redeemer\n ON b.maybe_redeemer_user_token = redeemer.token\n\nWHERE\n b.key_value = ?\n ", + "query": "\nSELECT\n b.token as `token: tokens::tokens::beta_keys::BetaKeyToken`,\n\n b.product as `product: enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct`,\n b.key_value,\n\n b.maybe_referrer_user_token as `maybe_referrer_user_token: tokens::tokens::users::UserToken`,\n referrer.username as maybe_referrer_username,\n referrer.display_name as maybe_referrer_display_name,\n referrer.email_gravatar_hash as maybe_referrer_gravatar_hash,\n\n b.maybe_redeemer_user_token as `maybe_redeemer_user_token: tokens::tokens::users::UserToken`,\n redeemer.username as maybe_redeemer_username,\n redeemer.display_name as maybe_redeemer_display_name,\n redeemer.email_gravatar_hash as maybe_redeemer_gravatar_hash,\n\n b.created_at,\n b.maybe_redeemed_at\n\nFROM beta_keys AS b\n\nLEFT OUTER JOIN users AS referrer\n ON b.maybe_referrer_user_token = referrer.token\n\nLEFT OUTER JOIN users AS redeemer\n ON b.maybe_redeemer_user_token = redeemer.token\n\nWHERE\n b.key_value = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "product: enums::by_table::beta_keys::beta_key_product::BetaKeyProduct", + "name": "product: enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -153,5 +153,5 @@ true ] }, - "hash": "74b401958826a7e640540f248114f57a941324787d023783f84251e8dd56eeb7" + "hash": "23face277cecb9cb56f1eb552f13f132d0c327b0f6886f6499a02d3491707e58" } diff --git a/.sqlx/query-b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630.json b/.sqlx/query-24197cea26eade28ad393da23c87d64c5978f3be57322e1b73f793b87048ec11.json similarity index 73% rename from .sqlx/query-b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630.json rename to .sqlx/query-24197cea26eade28ad393da23c87d64c5978f3be57322e1b73f793b87048ec11.json index 7fbde3b112..7316a4e3f5 100644 --- a/.sqlx/query-b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630.json +++ b/.sqlx/query-24197cea26eade28ad393da23c87d64c5978f3be57322e1b73f793b87048ec11.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n p.token as `token: tokens::tokens::prompts::PromptToken`,\n\n p.prompt_type as `prompt_type: enums::by_table::prompts::prompt_type::PromptType`,\n\n p.maybe_model_type as `maybe_model_type: enums::common::model_type::ModelType`,\n p.maybe_generation_provider as `maybe_generation_provider: enums::common::generation_provider::GenerationProvider`,\n\n p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n\n p.maybe_positive_prompt,\n p.maybe_negative_prompt,\n p.maybe_other_args,\n\n p.creator_ip_address,\n p.created_at\n\nFROM prompts as p\nWHERE\n p.token = ?\n ", + "query": "\nSELECT\n p.token as `token: tokens::tokens::prompts::PromptToken`,\n\n p.prompt_type as `prompt_type: enums_db::by_table::prompts::prompt_type::PromptType`,\n\n p.maybe_model_type as `maybe_model_type: enums_db::common::model_type::ModelType`,\n p.maybe_generation_provider as `maybe_generation_provider: enums_db::common::generation::generation_provider::GenerationProvider`,\n\n p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n\n p.maybe_positive_prompt,\n p.maybe_negative_prompt,\n p.maybe_other_args,\n\n p.creator_ip_address,\n p.created_at\n\nFROM prompts as p\nWHERE\n p.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "prompt_type: enums::by_table::prompts::prompt_type::PromptType", + "name": "prompt_type: enums_db::by_table::prompts::prompt_type::PromptType", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "maybe_model_type: enums::common::model_type::ModelType", + "name": "maybe_model_type: enums_db::common::model_type::ModelType", "type_info": { "type": "VarString", "flags": "BINARY", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "maybe_generation_provider: enums::common::generation_provider::GenerationProvider", + "name": "maybe_generation_provider: enums_db::common::generation::generation_provider::GenerationProvider", "type_info": { "type": "VarString", "flags": "BINARY", @@ -120,5 +120,5 @@ false ] }, - "hash": "b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630" + "hash": "24197cea26eade28ad393da23c87d64c5978f3be57322e1b73f793b87048ec11" } diff --git a/.sqlx/query-a2c9e2f61eba666254f8432b3c50a0a7738ee3b3faa77c5281bc8e4af96159b9.json b/.sqlx/query-2648bcdea5e7d870d9430e2d7dda74c76b70a4877db8f186098dc705013bd3dc.json similarity index 72% rename from .sqlx/query-a2c9e2f61eba666254f8432b3c50a0a7738ee3b3faa77c5281bc8e4af96159b9.json rename to .sqlx/query-2648bcdea5e7d870d9430e2d7dda74c76b70a4877db8f186098dc705013bd3dc.json index f355814c5f..fc8c822efa 100644 --- a/.sqlx/query-a2c9e2f61eba666254f8432b3c50a0a7738ee3b3faa77c5281bc8e4af96159b9.json +++ b/.sqlx/query-2648bcdea5e7d870d9430e2d7dda74c76b70a4877db8f186098dc705013bd3dc.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n jobs.attempt_count,\n\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n\n jobs.product_category as `product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,\n jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`,\n jobs.maybe_model_type,\n jobs.maybe_model_token,\n jobs.maybe_raw_inference_text,\n jobs.maybe_inference_args,\n\n jobs.frontend_failure_category as `maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`,\n jobs.failure_reason,\n\n jobs.on_success_result_entity_type as maybe_result_entity_type,\n jobs.on_success_result_entity_token as maybe_result_entity_token,\n jobs.on_success_result_batch_token as maybe_result_batch_token,\n\n model_weights.title as maybe_model_weights_title,\n tts_models.title as maybe_tts_model_title,\n voice_conversion_models.title as maybe_voice_conversion_model_title,\n\n tts_results.public_bucket_wav_audio_path as maybe_tts_public_bucket_path,\n voice_conversion_results.public_bucket_hash as maybe_voice_conversion_public_bucket_hash,\n\n media_files.public_bucket_directory_hash as maybe_media_file_public_bucket_directory_hash,\n media_files.maybe_public_bucket_prefix as maybe_media_file_public_bucket_prefix,\n media_files.maybe_public_bucket_extension as maybe_media_file_public_bucket_extension,\n\n jobs.assigned_worker as maybe_assigned_worker,\n jobs.assigned_cluster as maybe_assigned_cluster,\n\n jobs.is_keepalive_required,\n\n jobs.created_at,\n jobs.updated_at,\n\n jobs.first_started_at as maybe_first_started_at,\n jobs.successfully_completed_at as maybe_successfully_completed_at,\n\n NOW() as database_clock\n\nFROM generic_inference_jobs as jobs\n\nLEFT OUTER JOIN model_weights ON jobs.maybe_model_token = model_weights.token\nLEFT OUTER JOIN tts_models ON jobs.maybe_model_token = tts_models.token\nLEFT OUTER JOIN voice_conversion_models ON jobs.maybe_model_token = voice_conversion_models.token\n\nLEFT OUTER JOIN tts_results ON jobs.on_success_result_entity_token = tts_results.token\nLEFT OUTER JOIN voice_conversion_results ON jobs.on_success_result_entity_token = voice_conversion_results.token\nLEFT OUTER JOIN media_files ON jobs.on_success_result_entity_token = media_files.token\n\nWHERE jobs.token = ?\n ", + "query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n jobs.status as `status: enums_db::common::job_status_plus::JobStatusPlus`,\n jobs.attempt_count,\n\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n\n jobs.product_category as `product_category: enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,\n jobs.inference_category as `inference_category: enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory`,\n jobs.maybe_model_type,\n jobs.maybe_model_token,\n jobs.maybe_raw_inference_text,\n jobs.maybe_inference_args,\n\n jobs.frontend_failure_category as `maybe_frontend_failure_category: enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`,\n jobs.failure_reason,\n\n jobs.on_success_result_entity_type as maybe_result_entity_type,\n jobs.on_success_result_entity_token as maybe_result_entity_token,\n jobs.on_success_result_batch_token as maybe_result_batch_token,\n\n model_weights.title as maybe_model_weights_title,\n tts_models.title as maybe_tts_model_title,\n voice_conversion_models.title as maybe_voice_conversion_model_title,\n\n tts_results.public_bucket_wav_audio_path as maybe_tts_public_bucket_path,\n voice_conversion_results.public_bucket_hash as maybe_voice_conversion_public_bucket_hash,\n\n media_files.public_bucket_directory_hash as maybe_media_file_public_bucket_directory_hash,\n media_files.maybe_public_bucket_prefix as maybe_media_file_public_bucket_prefix,\n media_files.maybe_public_bucket_extension as maybe_media_file_public_bucket_extension,\n\n jobs.assigned_worker as maybe_assigned_worker,\n jobs.assigned_cluster as maybe_assigned_cluster,\n\n jobs.is_keepalive_required,\n\n jobs.created_at,\n jobs.updated_at,\n\n jobs.first_started_at as maybe_first_started_at,\n jobs.successfully_completed_at as maybe_successfully_completed_at,\n\n NOW() as database_clock\n\nFROM generic_inference_jobs as jobs\n\nLEFT OUTER JOIN model_weights ON jobs.maybe_model_token = model_weights.token\nLEFT OUTER JOIN tts_models ON jobs.maybe_model_token = tts_models.token\nLEFT OUTER JOIN voice_conversion_models ON jobs.maybe_model_token = voice_conversion_models.token\n\nLEFT OUTER JOIN tts_results ON jobs.on_success_result_entity_token = tts_results.token\nLEFT OUTER JOIN voice_conversion_results ON jobs.on_success_result_entity_token = voice_conversion_results.token\nLEFT OUTER JOIN media_files ON jobs.on_success_result_entity_token = media_files.token\n\nWHERE jobs.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "status: enums::common::job_status_plus::JobStatusPlus", + "name": "status: enums_db::common::job_status_plus::JobStatusPlus", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -65,7 +65,7 @@ }, { "ordinal": 6, - "name": "product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory", + "name": "product_category: enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory", "type_info": { "type": "VarString", "flags": "MULTIPLE_KEY | BINARY", @@ -75,7 +75,7 @@ }, { "ordinal": 7, - "name": "inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory", + "name": "inference_category: enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -125,7 +125,7 @@ }, { "ordinal": 12, - "name": "maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory", + "name": "maybe_frontend_failure_category: enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory", "type_info": { "type": "VarString", "flags": "BINARY", @@ -373,5 +373,5 @@ false ] }, - "hash": "a2c9e2f61eba666254f8432b3c50a0a7738ee3b3faa77c5281bc8e4af96159b9" + "hash": "2648bcdea5e7d870d9430e2d7dda74c76b70a4877db8f186098dc705013bd3dc" } diff --git a/.sqlx/query-f0f0c5f4d36464696a81adb5293b2d7b45d98428ebfeb20445d24e657d0ee374.json b/.sqlx/query-298be260cdb08b49fa7738b50e40b6420d8fec9cf0a93c5a2a289ae7b5fc4d6d.json similarity index 92% rename from .sqlx/query-f0f0c5f4d36464696a81adb5293b2d7b45d98428ebfeb20445d24e657d0ee374.json rename to .sqlx/query-298be260cdb08b49fa7738b50e40b6420d8fec9cf0a93c5a2a289ae7b5fc4d6d.json index fd65977242..7649c91eb8 100644 --- a/.sqlx/query-f0f0c5f4d36464696a81adb5293b2d7b45d98428ebfeb20445d24e657d0ee374.json +++ b/.sqlx/query-298be260cdb08b49fa7738b50e40b6420d8fec9cf0a93c5a2a289ae7b5fc4d6d.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type,\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n tts.title,\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n tts.is_locked_from_use,\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n tts.maybe_suggested_unique_bot_command,\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n tts.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n tts.created_at,\n tts.updated_at\nFROM tts_models as tts\nJOIN users\nON\n users.token = tts.creator_user_token\nWHERE\n users.username = ?\n AND tts.is_locked_from_use IS FALSE\n AND tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type,\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n tts.title,\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n tts.is_locked_from_use,\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n tts.maybe_suggested_unique_bot_command,\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n tts.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n tts.created_at,\n tts.updated_at\nFROM tts_models as tts\nJOIN users\nON\n users.token = tts.creator_user_token\nWHERE\n users.username = ?\n AND tts.is_locked_from_use IS FALSE\n AND tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -165,7 +165,7 @@ }, { "ordinal": 16, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -219,5 +219,5 @@ false ] }, - "hash": "f0f0c5f4d36464696a81adb5293b2d7b45d98428ebfeb20445d24e657d0ee374" + "hash": "298be260cdb08b49fa7738b50e40b6420d8fec9cf0a93c5a2a289ae7b5fc4d6d" } diff --git a/.sqlx/query-45ec7d47b09e0605e7ca2ed0dc7c2833bcfdbb5db97787004b8c6597aad93b56.json b/.sqlx/query-2b1af6b9672681210ba39b78a3e1212b989cb86ffdee15f1393e5aec76fe5509.json similarity index 81% rename from .sqlx/query-45ec7d47b09e0605e7ca2ed0dc7c2833bcfdbb5db97787004b8c6597aad93b56.json rename to .sqlx/query-2b1af6b9672681210ba39b78a3e1212b989cb86ffdee15f1393e5aec76fe5509.json index 3cdd479d33..46e0e4e09c 100644 --- a/.sqlx/query-45ec7d47b09e0605e7ca2ed0dc7c2833bcfdbb5db97787004b8c6597aad93b56.json +++ b/.sqlx/query-2b1af6b9672681210ba39b78a3e1212b989cb86ffdee15f1393e5aec76fe5509.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`,\n\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n vocoder.title,\n vocoder.description_markdown,\n vocoder.description_rendered_html,\n vocoder.is_staff_recommended,\n\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n\n vocoder.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n vocoder.created_at,\n vocoder.updated_at,\n\n vocoder.creator_ip_address_creation,\n vocoder.creator_ip_address_last_update,\n vocoder.mod_deleted_at,\n vocoder.user_deleted_at\n\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\nWHERE\n vocoder.token = ?\n ", + "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`,\n\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n vocoder.title,\n vocoder.description_markdown,\n vocoder.description_rendered_html,\n vocoder.is_staff_recommended,\n\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n\n vocoder.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n vocoder.created_at,\n vocoder.updated_at,\n\n vocoder.creator_ip_address_creation,\n vocoder.creator_ip_address_last_update,\n vocoder.mod_deleted_at,\n vocoder.user_deleted_at\n\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\nWHERE\n vocoder.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "vocoder_type: enums::common::vocoder_type::VocoderType", + "name": "vocoder_type: enums_db::common::vocoder_type::VocoderType", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -145,7 +145,7 @@ }, { "ordinal": 14, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -241,5 +241,5 @@ true ] }, - "hash": "45ec7d47b09e0605e7ca2ed0dc7c2833bcfdbb5db97787004b8c6597aad93b56" + "hash": "2b1af6b9672681210ba39b78a3e1212b989cb86ffdee15f1393e5aec76fe5509" } diff --git a/.sqlx/query-c16ceef6967d2af394da3c5786656fc4fd62bcacdbd9878f99e98208ae285588.json b/.sqlx/query-323730333973d5d154e1245d6f8e245cb5682500340fead26593ca0bf54c68c8.json similarity index 86% rename from .sqlx/query-c16ceef6967d2af394da3c5786656fc4fd62bcacdbd9878f99e98208ae285588.json rename to .sqlx/query-323730333973d5d154e1245d6f8e245cb5682500340fead26593ca0bf54c68c8.json index 3cecfed593..f11205f3a8 100644 --- a/.sqlx/query-c16ceef6967d2af394da3c5786656fc4fd62bcacdbd9878f99e98208ae285588.json +++ b/.sqlx/query-323730333973d5d154e1245d6f8e245cb5682500340fead26593ca0bf54c68c8.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n id,\n token AS inference_job_token,\n uuid_idempotency_token,\n\n model_token,\n raw_inference_text,\n\n max_duration_seconds,\n\n creator_ip_address,\n maybe_creator_user_token,\n creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n is_from_api,\n is_for_twitch,\n is_debug_request,\n\n status as `status: enums::common::job_status::JobStatus`,\n priority_level,\n attempt_count,\n failure_reason,\n\n created_at,\n updated_at,\n retry_at\nFROM tts_inference_jobs\nWHERE\n is_debug_request = ?\n AND\n (\n status IN (\"pending\", \"attempt_failed\")\n )\n AND\n (\n retry_at IS NULL\n OR\n retry_at < CURRENT_TIMESTAMP\n )\n ORDER BY priority_level DESC, id ASC\n LIMIT ?\n ", + "query": "\nSELECT\n id,\n token AS inference_job_token,\n uuid_idempotency_token,\n\n model_token,\n raw_inference_text,\n\n max_duration_seconds,\n\n creator_ip_address,\n maybe_creator_user_token,\n creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n is_from_api,\n is_for_twitch,\n is_debug_request,\n\n status as `status: enums_db::common::job_status::JobStatus`,\n priority_level,\n attempt_count,\n failure_reason,\n\n created_at,\n updated_at,\n retry_at\nFROM tts_inference_jobs\nWHERE\n is_debug_request = ?\n AND\n (\n status IN (\"pending\", \"attempt_failed\")\n )\n AND\n (\n retry_at IS NULL\n OR\n retry_at < CURRENT_TIMESTAMP\n )\n ORDER BY priority_level DESC, id ASC\n LIMIT ?\n ", "describe": { "columns": [ { @@ -85,7 +85,7 @@ }, { "ordinal": 8, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -125,7 +125,7 @@ }, { "ordinal": 12, - "name": "status: enums::common::job_status::JobStatus", + "name": "status: enums_db::common::job_status::JobStatus", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -219,5 +219,5 @@ true ] }, - "hash": "c16ceef6967d2af394da3c5786656fc4fd62bcacdbd9878f99e98208ae285588" + "hash": "323730333973d5d154e1245d6f8e245cb5682500340fead26593ca0bf54c68c8" } diff --git a/.sqlx/query-4d45f5ce213627465e991eaec9b509100e22c614367b67ab026b5edd70927ea5.json b/.sqlx/query-334079d841a853c3d1323b45d1f25f2f0ad13d2958be38193d04222e482b95e8.json similarity index 75% rename from .sqlx/query-4d45f5ce213627465e991eaec9b509100e22c614367b67ab026b5edd70927ea5.json rename to .sqlx/query-334079d841a853c3d1323b45d1f25f2f0ad13d2958be38193d04222e482b95e8.json index 193ff50676..e66678eee1 100644 --- a/.sqlx/query-4d45f5ce213627465e991eaec9b509100e22c614367b67ab026b5edd70927ea5.json +++ b/.sqlx/query-334079d841a853c3d1323b45d1f25f2f0ad13d2958be38193d04222e482b95e8.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weight_type: enums::by_table::model_weights::weights_types::WeightsType`,\n w.title,\n w.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n w_extension.ietf_language_tag,\n w_extension.ietf_primary_language_subtag,\n w.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n w.created_at,\n w.updated_at\nFROM model_weights as w\nLEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = w.token\nJOIN users\n ON users.token = w.creator_user_token\nWHERE\n w.weights_type IN (\"tt2\")\n AND w.user_deleted_at IS NULL\n AND w.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weight_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n w.title,\n w.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n w_extension.ietf_language_tag,\n w_extension.ietf_primary_language_subtag,\n w.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n w.created_at,\n w.updated_at\nFROM model_weights as w\nLEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = w.token\nJOIN users\n ON users.token = w.creator_user_token\nWHERE\n w.weights_type IN (\"tt2\")\n AND w.user_deleted_at IS NULL\n AND w.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "weight_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weight_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -95,7 +95,7 @@ }, { "ordinal": 9, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -142,5 +142,5 @@ false ] }, - "hash": "4d45f5ce213627465e991eaec9b509100e22c614367b67ab026b5edd70927ea5" + "hash": "334079d841a853c3d1323b45d1f25f2f0ad13d2958be38193d04222e482b95e8" } diff --git a/.sqlx/query-9c28e9f8f163407755acaca1fb4a72849679b6bf98b8c87e1761200300111232.json b/.sqlx/query-343be7c524d87bcee72c95e09b23f23e735bd3ad232988d12665295518fda027.json similarity index 77% rename from .sqlx/query-9c28e9f8f163407755acaca1fb4a72849679b6bf98b8c87e1761200300111232.json rename to .sqlx/query-343be7c524d87bcee72c95e09b23f23e735bd3ad232988d12665295518fda027.json index e51167efd5..572ff57b0d 100644 --- a/.sqlx/query-9c28e9f8f163407755acaca1fb4a72849679b6bf98b8c87e1761200300111232.json +++ b/.sqlx/query-343be7c524d87bcee72c95e09b23f23e735bd3ad232988d12665295518fda027.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n token as `token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n entry_type as `entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`,\n maybe_entity_ref,\n credits_delta,\n banked_credits_before as `banked_credits_before: u32`,\n banked_credits_after as `banked_credits_after: u32`,\n monthly_credits_before as `monthly_credits_before: u32`,\n monthly_credits_after as `monthly_credits_after: u32`,\n is_refunded as `is_refunded: bool`,\n maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n created_at as `created_at: DateTime`\nFROM wallet_ledger_entries\nWHERE token = ?\nLIMIT 1\n ", + "query": "\nSELECT\n token as `token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n entry_type as `entry_type: enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`,\n maybe_entity_ref,\n credits_delta,\n banked_credits_before as `banked_credits_before: u32`,\n banked_credits_after as `banked_credits_after: u32`,\n monthly_credits_before as `monthly_credits_before: u32`,\n monthly_credits_after as `monthly_credits_after: u32`,\n is_refunded as `is_refunded: bool`,\n maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n created_at as `created_at: DateTime`\nFROM wallet_ledger_entries\nWHERE token = ?\nLIMIT 1\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType", + "name": "entry_type: enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -131,5 +131,5 @@ false ] }, - "hash": "9c28e9f8f163407755acaca1fb4a72849679b6bf98b8c87e1761200300111232" + "hash": "343be7c524d87bcee72c95e09b23f23e735bd3ad232988d12665295518fda027" } diff --git a/.sqlx/query-57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2.json b/.sqlx/query-3526bc5ae8f3bd683ac1baf8633cb93d582329d059dedb05acf9595292821294.json similarity index 68% rename from .sqlx/query-57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2.json rename to .sqlx/query-3526bc5ae8f3bd683ac1baf8633cb93d582329d059dedb05acf9595292821294.json index 5690c5a3a9..e7f640734e 100644 --- a/.sqlx/query-57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2.json +++ b/.sqlx/query-3526bc5ae8f3bd683ac1baf8633cb93d582329d059dedb05acf9595292821294.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_engine_category as `maybe_engine_category: enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory`,\n m.maybe_animation_type as `maybe_animation_type: enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType`,\n\n m.maybe_media_subtype as `maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_style_transfer_source_media_file_token as `maybe_style_transfer_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.maybe_scene_source_media_file_token as `maybe_scene_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n m.is_user_upload,\n m.is_intermediate_system_file,\n\n model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n model_weights.title as maybe_model_weights_title,\n model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n model_weight_cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n model_weight_cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n model_weight_cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n model_weight_creator.username as maybe_model_weight_creator_username,\n model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n m.extra_file_modification_info,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN media_files as model_weight_cover_image\n ON model_weight_cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"media_file\"\n AND entity_stats.entity_token = m.token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nLEFT OUTER JOIN featured_items\n ON featured_items.entity_type = 'media_file'\n AND featured_items.entity_token = m.token\n AND featured_items.deleted_at IS NULL\nWHERE\n m.token = ?\n AND m.user_deleted_at IS NULL\n AND m.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums_db::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums_db::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_engine_category as `maybe_engine_category: enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory`,\n m.maybe_animation_type as `maybe_animation_type: enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType`,\n\n m.maybe_media_subtype as `maybe_media_subtype: enums_db::by_table::media_files::media_file_subtype::MediaFileSubtype`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_style_transfer_source_media_file_token as `maybe_style_transfer_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.maybe_scene_source_media_file_token as `maybe_scene_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n m.is_user_upload,\n m.is_intermediate_system_file,\n\n model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n model_weights.title as maybe_model_weights_title,\n model_weights.weights_type as `maybe_model_weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n model_weights.weights_category as `maybe_model_weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n\n model_weight_cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n model_weight_cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n model_weight_cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n model_weight_creator.username as maybe_model_weight_creator_username,\n model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n m.extra_file_modification_info,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN media_files as model_weight_cover_image\n ON model_weight_cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"media_file\"\n AND entity_stats.entity_token = m.token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nLEFT OUTER JOIN featured_items\n ON featured_items.entity_type = 'media_file'\n AND featured_items.entity_token = m.token\n AND featured_items.deleted_at IS NULL\nWHERE\n m.token = ?\n AND m.user_deleted_at IS NULL\n AND m.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "media_class: enums::by_table::media_files::media_file_class::MediaFileClass", + "name": "media_class: enums_db::by_table::media_files::media_file_class::MediaFileClass", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY", @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType", + "name": "media_type: enums_db::by_table::media_files::media_file_type::MediaFileType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "maybe_engine_category: enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory", + "name": "maybe_engine_category: enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory", "type_info": { "type": "VarString", "flags": "MULTIPLE_KEY | BINARY", @@ -45,7 +45,7 @@ }, { "ordinal": 4, - "name": "maybe_animation_type: enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType", + "name": "maybe_animation_type: enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType", "type_info": { "type": "VarString", "flags": "BINARY", @@ -55,7 +55,7 @@ }, { "ordinal": 5, - "name": "maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype", + "name": "maybe_media_subtype: enums_db::by_table::media_files::media_file_subtype::MediaFileSubtype", "type_info": { "type": "VarString", "flags": "BINARY", @@ -245,7 +245,7 @@ }, { "ordinal": 24, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -295,7 +295,7 @@ }, { "ordinal": 29, - "name": "maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "maybe_model_weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -305,7 +305,7 @@ }, { "ordinal": 30, - "name": "maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "maybe_model_weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -538,5 +538,5 @@ false ] }, - "hash": "57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2" + "hash": "3526bc5ae8f3bd683ac1baf8633cb93d582329d059dedb05acf9595292821294" } diff --git a/.sqlx/query-7ebf5c2b58866413d964a137bce9027289fdc6c84fafc0c773cdedd536c6bf4c.json b/.sqlx/query-36062cb07585009974d36fbc73943c20db89a8b0002b885a924d354ac3be8dd8.json similarity index 87% rename from .sqlx/query-7ebf5c2b58866413d964a137bce9027289fdc6c84fafc0c773cdedd536c6bf4c.json rename to .sqlx/query-36062cb07585009974d36fbc73943c20db89a8b0002b885a924d354ac3be8dd8.json index e877998115..4cb1b882f7 100644 --- a/.sqlx/query-7ebf5c2b58866413d964a137bce9027289fdc6c84fafc0c773cdedd536c6bf4c.json +++ b/.sqlx/query-36062cb07585009974d36fbc73943c20db89a8b0002b885a924d354ac3be8dd8.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n id,\n token AS inference_job_token,\n uuid_idempotency_token,\n\n model_token,\n raw_inference_text,\n\n max_duration_seconds,\n\n creator_ip_address,\n maybe_creator_user_token,\n creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n is_from_api,\n is_for_twitch,\n is_debug_request,\n\n status as `status: enums::common::job_status::JobStatus`,\n priority_level,\n attempt_count,\n failure_reason,\n\n created_at,\n updated_at,\n retry_at\nFROM tts_inference_jobs\nWHERE\n is_debug_request = ?\n AND\n (\n status IN (\"pending\", \"attempt_failed\")\n )\n AND\n (\n retry_at IS NULL\n OR\n retry_at < CURRENT_TIMESTAMP\n )\n LIMIT ?\n ", + "query": "\nSELECT\n id,\n token AS inference_job_token,\n uuid_idempotency_token,\n\n model_token,\n raw_inference_text,\n\n max_duration_seconds,\n\n creator_ip_address,\n maybe_creator_user_token,\n creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n is_from_api,\n is_for_twitch,\n is_debug_request,\n\n status as `status: enums_db::common::job_status::JobStatus`,\n priority_level,\n attempt_count,\n failure_reason,\n\n created_at,\n updated_at,\n retry_at\nFROM tts_inference_jobs\nWHERE\n is_debug_request = ?\n AND\n (\n status IN (\"pending\", \"attempt_failed\")\n )\n AND\n (\n retry_at IS NULL\n OR\n retry_at < CURRENT_TIMESTAMP\n )\n LIMIT ?\n ", "describe": { "columns": [ { @@ -85,7 +85,7 @@ }, { "ordinal": 8, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -125,7 +125,7 @@ }, { "ordinal": 12, - "name": "status: enums::common::job_status::JobStatus", + "name": "status: enums_db::common::job_status::JobStatus", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -219,5 +219,5 @@ true ] }, - "hash": "7ebf5c2b58866413d964a137bce9027289fdc6c84fafc0c773cdedd536c6bf4c" + "hash": "36062cb07585009974d36fbc73943c20db89a8b0002b885a924d354ac3be8dd8" } diff --git a/.sqlx/query-4bfa96682bd1e7576c26c89e3d1a17162193f7df3c1530122ca8e715afc5f385.json b/.sqlx/query-3bcd084acfa8a90f624cccbaf91e53e7fe22b3ba68b0ae2ae296bb78a6c9be86.json similarity index 75% rename from .sqlx/query-4bfa96682bd1e7576c26c89e3d1a17162193f7df3c1530122ca8e715afc5f385.json rename to .sqlx/query-3bcd084acfa8a90f624cccbaf91e53e7fe22b3ba68b0ae2ae296bb78a6c9be86.json index 4093536504..b9bb2644b6 100644 --- a/.sqlx/query-4bfa96682bd1e7576c26c89e3d1a17162193f7df3c1530122ca8e715afc5f385.json +++ b/.sqlx/query-3bcd084acfa8a90f624cccbaf91e53e7fe22b3ba68b0ae2ae296bb78a6c9be86.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`,\n user_token as `user_token: tokens::tokens::users::UserToken`,\n subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n subscription_product_slug,\n maybe_stripe_subscription_status,\n maybe_stripe_customer_id,\n maybe_stripe_product_id,\n maybe_stripe_subscription_id\n\nFROM user_subscriptions\n\nWHERE\n user_token = ?\n AND subscription_namespace = ?\n AND maybe_stripe_customer_id IS NOT NULL\n AND maybe_stripe_subscription_id IS NOT NULL\n AND maybe_stripe_subscription_status IS NOT NULL\n AND maybe_stripe_subscription_status NOT IN ('canceled', 'incomplete_expired')\n AND subscription_expires_at > CURRENT_TIMESTAMP\n ORDER BY id ASC\n LIMIT 1\n ", + "query": "\nSELECT\n token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`,\n user_token as `user_token: tokens::tokens::users::UserToken`,\n subscription_namespace as `subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace`,\n subscription_product_slug,\n maybe_stripe_subscription_status,\n maybe_stripe_customer_id,\n maybe_stripe_product_id,\n maybe_stripe_subscription_id\n\nFROM user_subscriptions\n\nWHERE\n user_token = ?\n AND subscription_namespace = ?\n AND maybe_stripe_customer_id IS NOT NULL\n AND maybe_stripe_subscription_id IS NOT NULL\n AND maybe_stripe_subscription_status IS NOT NULL\n AND maybe_stripe_subscription_status NOT IN ('canceled', 'incomplete_expired')\n AND subscription_expires_at > CURRENT_TIMESTAMP\n ORDER BY id ASC\n LIMIT 1\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace", + "name": "subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -98,5 +98,5 @@ true ] }, - "hash": "4bfa96682bd1e7576c26c89e3d1a17162193f7df3c1530122ca8e715afc5f385" + "hash": "3bcd084acfa8a90f624cccbaf91e53e7fe22b3ba68b0ae2ae296bb78a6c9be86" } diff --git a/.sqlx/query-470e480110a875b3d28912cf1576cdbba8c53aaf9631a3d3c363a46e5d4513a4.json b/.sqlx/query-3c82ce54b590a1ec5d52d824df9d0697bdebccc6beb00bbfeb20f45e5e651934.json similarity index 93% rename from .sqlx/query-470e480110a875b3d28912cf1576cdbba8c53aaf9631a3d3c363a46e5d4513a4.json rename to .sqlx/query-3c82ce54b590a1ec5d52d824df9d0697bdebccc6beb00bbfeb20f45e5e651934.json index 81ffbd7c7d..cc115f532e 100644 --- a/.sqlx/query-470e480110a875b3d28912cf1576cdbba8c53aaf9631a3d3c363a46e5d4513a4.json +++ b/.sqlx/query-3c82ce54b590a1ec5d52d824df9d0697bdebccc6beb00bbfeb20f45e5e651934.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type,\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n tts.title,\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n tts.is_locked_from_use,\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n tts.maybe_suggested_unique_bot_command,\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n tts.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n tts.created_at,\n tts.updated_at\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\nWHERE\n tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type,\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n tts.title,\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n tts.is_locked_from_use,\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n tts.maybe_suggested_unique_bot_command,\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n tts.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n tts.created_at,\n tts.updated_at\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\nWHERE\n tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -165,7 +165,7 @@ }, { "ordinal": 16, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -219,5 +219,5 @@ false ] }, - "hash": "470e480110a875b3d28912cf1576cdbba8c53aaf9631a3d3c363a46e5d4513a4" + "hash": "3c82ce54b590a1ec5d52d824df9d0697bdebccc6beb00bbfeb20f45e5e651934" } diff --git a/.sqlx/query-799a88505077c6c286906087ee79141dd4aaa1d68df764c9a43b315e561d7291.json b/.sqlx/query-3ca11e661a471da59e9926483194b7aa81b8c004114e5666d8d3742a13c05657.json similarity index 75% rename from .sqlx/query-799a88505077c6c286906087ee79141dd4aaa1d68df764c9a43b315e561d7291.json rename to .sqlx/query-3ca11e661a471da59e9926483194b7aa81b8c004114e5666d8d3742a13c05657.json index f7b3314c9b..03b959bbc2 100644 --- a/.sqlx/query-799a88505077c6c286906087ee79141dd4aaa1d68df764c9a43b315e561d7291.json +++ b/.sqlx/query-3ca11e661a471da59e9926483194b7aa81b8c004114e5666d8d3742a13c05657.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n b.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n\n b.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n b.entity_token,\n\n b.user_token as `user_token: tokens::tokens::users::UserToken`,\n\n es.bookmark_count as unused_bookmark_count,\n\n b.created_at,\n b.updated_at,\n b.deleted_at\n\n FROM\n user_bookmarks AS b\n\n LEFT OUTER JOIN entity_stats AS es\n ON b.entity_type = es.entity_type\n AND b.entity_token = es.entity_token\n WHERE\n b.entity_type = ?\n AND b.entity_token = ?\n FOR UPDATE\n ", + "query": "\n SELECT\n b.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n\n b.entity_type as `entity_type: enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n b.entity_token,\n\n b.user_token as `user_token: tokens::tokens::users::UserToken`,\n\n es.bookmark_count as unused_bookmark_count,\n\n b.created_at,\n b.updated_at,\n b.deleted_at\n\n FROM\n user_bookmarks AS b\n\n LEFT OUTER JOIN entity_stats AS es\n ON b.entity_type = es.entity_type\n AND b.entity_token = es.entity_token\n WHERE\n b.entity_type = ?\n AND b.entity_token = ?\n FOR UPDATE\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType", + "name": "entity_type: enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -98,5 +98,5 @@ true ] }, - "hash": "799a88505077c6c286906087ee79141dd4aaa1d68df764c9a43b315e561d7291" + "hash": "3ca11e661a471da59e9926483194b7aa81b8c004114e5666d8d3742a13c05657" } diff --git a/.sqlx/query-7f874f4ac43d8c66e3ea8cb2fb56f57b93047355dd9faee4df48799f6d1be00a.json b/.sqlx/query-3df3ce2eb45d6a9a04ab726d3e12bb2f167a91d6dd4ed30e76b978ef02906556.json similarity index 79% rename from .sqlx/query-7f874f4ac43d8c66e3ea8cb2fb56f57b93047355dd9faee4df48799f6d1be00a.json rename to .sqlx/query-3df3ce2eb45d6a9a04ab726d3e12bb2f167a91d6dd4ed30e76b978ef02906556.json index e627babe38..587177045f 100644 --- a/.sqlx/query-7f874f4ac43d8c66e3ea8cb2fb56f57b93047355dd9faee4df48799f6d1be00a.json +++ b/.sqlx/query-3df3ce2eb45d6a9a04ab726d3e12bb2f167a91d6dd4ed30e76b978ef02906556.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n token as `token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n wallet_token as `wallet_token: tokens::tokens::wallets::WalletToken`,\n entry_type as `entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`,\n maybe_entity_ref,\n credits_delta,\n banked_credits_before as `banked_credits_before: u32`,\n banked_credits_after as `banked_credits_after: u32`,\n monthly_credits_before as `monthly_credits_before: u32`,\n monthly_credits_after as `monthly_credits_after: u32`,\n created_at as `created_at: DateTime`,\n is_refunded as `is_refunded: bool`,\n maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\nFROM wallet_ledger_entries\nWHERE wallet_token = ?\nORDER BY id DESC\n ", + "query": "\nSELECT\n token as `token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n wallet_token as `wallet_token: tokens::tokens::wallets::WalletToken`,\n entry_type as `entry_type: enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`,\n maybe_entity_ref,\n credits_delta,\n banked_credits_before as `banked_credits_before: u32`,\n banked_credits_after as `banked_credits_after: u32`,\n monthly_credits_before as `monthly_credits_before: u32`,\n monthly_credits_after as `monthly_credits_after: u32`,\n created_at as `created_at: DateTime`,\n is_refunded as `is_refunded: bool`,\n maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\nFROM wallet_ledger_entries\nWHERE wallet_token = ?\nORDER BY id DESC\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType", + "name": "entry_type: enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -142,5 +142,5 @@ true ] }, - "hash": "7f874f4ac43d8c66e3ea8cb2fb56f57b93047355dd9faee4df48799f6d1be00a" + "hash": "3df3ce2eb45d6a9a04ab726d3e12bb2f167a91d6dd4ed30e76b978ef02906556" } diff --git a/.sqlx/query-dbf85f29c614d243a50e4259218f21c446c6ab17de35c8a8da08fe02822e8f58.json b/.sqlx/query-3ee84c3f77b20b789b24976a8d8b1a25dc1e8d875d1c08530b84dd872996431e.json similarity index 76% rename from .sqlx/query-dbf85f29c614d243a50e4259218f21c446c6ab17de35c8a8da08fe02822e8f58.json rename to .sqlx/query-3ee84c3f77b20b789b24976a8d8b1a25dc1e8d875d1c08530b84dd872996431e.json index ddc6560b0f..4a4439fd6a 100644 --- a/.sqlx/query-dbf85f29c614d243a50e4259218f21c446c6ab17de35c8a8da08fe02822e8f58.json +++ b/.sqlx/query-3ee84c3f77b20b789b24976a8d8b1a25dc1e8d875d1c08530b84dd872996431e.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`,\n user_token as `user_token: tokens::tokens::users::UserToken`,\n subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n subscription_product_slug,\n maybe_stripe_customer_id,\n maybe_stripe_product_id,\n maybe_stripe_subscription_id,\n maybe_stripe_subscription_status as `maybe_stripe_subscription_status: enums::common::stripe_subscription_status::StripeSubscriptionStatus`,\n maybe_stripe_invoice_is_paid,\n subscription_start_at,\n subscription_expires_at,\n current_billing_period_end_at,\n maybe_cancel_at,\n maybe_canceled_at\n\nFROM user_subscriptions\n\nWHERE\n user_token = ?\n AND subscription_namespace = ?\n AND maybe_stripe_customer_id IS NOT NULL\n AND maybe_stripe_subscription_id IS NOT NULL\n AND maybe_stripe_subscription_status IS NOT NULL\n AND maybe_stripe_subscription_status NOT IN ('canceled', 'incomplete_expired')\n AND subscription_expires_at > CURRENT_TIMESTAMP\n ORDER BY id ASC\n LIMIT 1\n ", + "query": "\nSELECT\n token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`,\n user_token as `user_token: tokens::tokens::users::UserToken`,\n subscription_namespace as `subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace`,\n subscription_product_slug,\n maybe_stripe_customer_id,\n maybe_stripe_product_id,\n maybe_stripe_subscription_id,\n maybe_stripe_subscription_status as `maybe_stripe_subscription_status: enums_db::common::stripe_subscription_status::StripeSubscriptionStatus`,\n maybe_stripe_invoice_is_paid,\n subscription_start_at,\n subscription_expires_at,\n current_billing_period_end_at,\n maybe_cancel_at,\n maybe_canceled_at\n\nFROM user_subscriptions\n\nWHERE\n user_token = ?\n AND subscription_namespace = ?\n AND maybe_stripe_customer_id IS NOT NULL\n AND maybe_stripe_subscription_id IS NOT NULL\n AND maybe_stripe_subscription_status IS NOT NULL\n AND maybe_stripe_subscription_status NOT IN ('canceled', 'incomplete_expired')\n AND subscription_expires_at > CURRENT_TIMESTAMP\n ORDER BY id ASC\n LIMIT 1\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace", + "name": "subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -75,7 +75,7 @@ }, { "ordinal": 7, - "name": "maybe_stripe_subscription_status: enums::common::stripe_subscription_status::StripeSubscriptionStatus", + "name": "maybe_stripe_subscription_status: enums_db::common::stripe_subscription_status::StripeSubscriptionStatus", "type_info": { "type": "VarString", "flags": "MULTIPLE_KEY | BINARY", @@ -164,5 +164,5 @@ true ] }, - "hash": "dbf85f29c614d243a50e4259218f21c446c6ab17de35c8a8da08fe02822e8f58" + "hash": "3ee84c3f77b20b789b24976a8d8b1a25dc1e8d875d1c08530b84dd872996431e" } diff --git a/.sqlx/query-094eb099cde85835db0662c2700c6b82644b51bf9b3609391ed4d2945fe5e98f.json b/.sqlx/query-419124f0fef3e9196daace36996e336c35b83df0b52a2cf8ea1a5b30895b1e95.json similarity index 71% rename from .sqlx/query-094eb099cde85835db0662c2700c6b82644b51bf9b3609391ed4d2945fe5e98f.json rename to .sqlx/query-419124f0fef3e9196daace36996e336c35b83df0b52a2cf8ea1a5b30895b1e95.json index 1963d96f9f..b21726741e 100644 --- a/.sqlx/query-094eb099cde85835db0662c2700c6b82644b51bf9b3609391ed4d2945fe5e98f.json +++ b/.sqlx/query-419124f0fef3e9196daace36996e336c35b83df0b52a2cf8ea1a5b30895b1e95.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n pci.media_token as `media_token: tokens::tokens::media_files::MediaFileToken`,\n pci.context_semantic_type as `context_semantic_type: enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType`,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension\n\nFROM prompt_context_items pci\nJOIN media_files m\nON\n pci.media_token = m.token\nWHERE\n pci.prompt_token = ?\nORDER BY pci.id ASC\n ", + "query": "\nSELECT\n pci.media_token as `media_token: tokens::tokens::media_files::MediaFileToken`,\n pci.context_semantic_type as `context_semantic_type: enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType`,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension\n\nFROM prompt_context_items pci\nJOIN media_files m\nON\n pci.media_token = m.token\nWHERE\n pci.prompt_token = ?\nORDER BY pci.id ASC\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "context_semantic_type: enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType", + "name": "context_semantic_type: enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -65,5 +65,5 @@ true ] }, - "hash": "094eb099cde85835db0662c2700c6b82644b51bf9b3609391ed4d2945fe5e98f" + "hash": "419124f0fef3e9196daace36996e336c35b83df0b52a2cf8ea1a5b30895b1e95" } diff --git a/.sqlx/query-d621645f30cf671e3e9d83bc702878f73b1c4a2516985872a126600740aabf7a.json b/.sqlx/query-41d3389805ea843f4fc524af7983daa6b3f3e256b6490c8408279e9da378ccf9.json similarity index 86% rename from .sqlx/query-d621645f30cf671e3e9d83bc702878f73b1c4a2516985872a126600740aabf7a.json rename to .sqlx/query-41d3389805ea843f4fc524af7983daa6b3f3e256b6490c8408279e9da378ccf9.json index 53cbedc60d..6c9ef026b1 100644 --- a/.sqlx/query-d621645f30cf671e3e9d83bc702878f73b1c4a2516985872a126600740aabf7a.json +++ b/.sqlx/query-41d3389805ea843f4fc524af7983daa6b3f3e256b6490c8408279e9da378ccf9.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n zv.token as `token: tokens::tokens::zs_voices::ZsVoiceToken`,\n zv.title,\n zv.ietf_language_tag,\n zv.ietf_primary_language_subtag,\n users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_email_gravatar_hash,\n zv.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n zv.created_at,\n zv.updated_at\n FROM zs_voices as zv\n JOIN users\n ON users.token = zv.maybe_creator_user_token\n WHERE\n users.username = ?\n AND zv.user_deleted_at IS NULL\n AND zv.mod_deleted_at IS NULL\n ", + "query": "\n SELECT\n zv.token as `token: tokens::tokens::zs_voices::ZsVoiceToken`,\n zv.title,\n zv.ietf_language_tag,\n zv.ietf_primary_language_subtag,\n users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_email_gravatar_hash,\n zv.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n zv.created_at,\n zv.updated_at\n FROM zs_voices as zv\n JOIN users\n ON users.token = zv.maybe_creator_user_token\n WHERE\n users.username = ?\n AND zv.user_deleted_at IS NULL\n AND zv.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -85,7 +85,7 @@ }, { "ordinal": 8, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -131,5 +131,5 @@ false ] }, - "hash": "d621645f30cf671e3e9d83bc702878f73b1c4a2516985872a126600740aabf7a" + "hash": "41d3389805ea843f4fc524af7983daa6b3f3e256b6490c8408279e9da378ccf9" } diff --git a/.sqlx/query-05829f0117166608489ceb409d9bfd3cb3c71e58f29202e53a5a4372c0575dec.json b/.sqlx/query-425dd6aacf01c64c8e60fcfb6d80059f081fecc223abc4893f13a0e2abb40df6.json similarity index 82% rename from .sqlx/query-05829f0117166608489ceb409d9bfd3cb3c71e58f29202e53a5a4372c0575dec.json rename to .sqlx/query-425dd6aacf01c64c8e60fcfb6d80059f081fecc223abc4893f13a0e2abb40df6.json index 20be1543ad..308a649431 100644 --- a/.sqlx/query-05829f0117166608489ceb409d9bfd3cb3c71e58f29202e53a5a4372c0575dec.json +++ b/.sqlx/query-425dd6aacf01c64c8e60fcfb6d80059f081fecc223abc4893f13a0e2abb40df6.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n vc.model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`,\n\n vc.title,\n vc.has_index_file,\n vc.private_bucket_hash,\n\n vc.created_at,\n vc.updated_at,\n vc.user_deleted_at,\n vc.mod_deleted_at\n\nFROM voice_conversion_models as vc\n\nWHERE vc.token = ?\n ", + "query": "\nSELECT\n vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n vc.model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`,\n\n vc.title,\n vc.has_index_file,\n vc.private_bucket_hash,\n\n vc.created_at,\n vc.updated_at,\n vc.user_deleted_at,\n vc.mod_deleted_at\n\nFROM voice_conversion_models as vc\n\nWHERE vc.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", + "name": "model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -109,5 +109,5 @@ true ] }, - "hash": "05829f0117166608489ceb409d9bfd3cb3c71e58f29202e53a5a4372c0575dec" + "hash": "425dd6aacf01c64c8e60fcfb6d80059f081fecc223abc4893f13a0e2abb40df6" } diff --git a/.sqlx/query-def6fa246ef212fd0677697faa6aaf683461126031cf353f71e156dc1e607991.json b/.sqlx/query-4260740578e769a0564f38698979920501180098289cf5bf87f8052cf6d8062a.json similarity index 69% rename from .sqlx/query-def6fa246ef212fd0677697faa6aaf683461126031cf353f71e156dc1e607991.json rename to .sqlx/query-4260740578e769a0564f38698979920501180098289cf5bf87f8052cf6d8062a.json index 69d4cbd755..d06c4d9e73 100644 --- a/.sqlx/query-def6fa246ef212fd0677697faa6aaf683461126031cf353f71e156dc1e607991.json +++ b/.sqlx/query-4260740578e769a0564f38698979920501180098289cf5bf87f8052cf6d8062a.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n vc.model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`\nFROM voice_conversion_models as vc\n ", + "query": "\nSELECT\n vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n vc.model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`\nFROM voice_conversion_models as vc\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", + "name": "model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -32,5 +32,5 @@ false ] }, - "hash": "def6fa246ef212fd0677697faa6aaf683461126031cf353f71e156dc1e607991" + "hash": "4260740578e769a0564f38698979920501180098289cf5bf87f8052cf6d8062a" } diff --git a/.sqlx/query-aa0de341dc212d4c020d2e3a655aa116d4e213004ee14fdebdd89e88f88f64ed.json b/.sqlx/query-428a09ba93bc63b8666702677a214732ef47bc1b335d7e4fd2fd301f86de71c7.json similarity index 86% rename from .sqlx/query-aa0de341dc212d4c020d2e3a655aa116d4e213004ee14fdebdd89e88f88f64ed.json rename to .sqlx/query-428a09ba93bc63b8666702677a214732ef47bc1b335d7e4fd2fd301f86de71c7.json index 56f19299b3..0f1a59ee9a 100644 --- a/.sqlx/query-aa0de341dc212d4c020d2e3a655aa116d4e213004ee14fdebdd89e88f88f64ed.json +++ b/.sqlx/query-428a09ba93bc63b8666702677a214732ef47bc1b335d7e4fd2fd301f86de71c7.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n zd.token as `token: tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken`,\n zd.title,\n zd.ietf_language_tag,\n zd.ietf_primary_language_subtag,\n zd.maybe_creator_user_token,\n zd.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n zd.created_at,\n zd.updated_at\n FROM zs_voice_datasets as zd\n WHERE\n zd.token = ?\n ", + "query": "\n SELECT\n zd.token as `token: tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken`,\n zd.title,\n zd.ietf_language_tag,\n zd.ietf_primary_language_subtag,\n zd.maybe_creator_user_token,\n zd.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n zd.created_at,\n zd.updated_at\n FROM zs_voice_datasets as zd\n WHERE\n zd.token = ?\n ", "describe": { "columns": [ { @@ -55,7 +55,7 @@ }, { "ordinal": 5, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -98,5 +98,5 @@ false ] }, - "hash": "aa0de341dc212d4c020d2e3a655aa116d4e213004ee14fdebdd89e88f88f64ed" + "hash": "428a09ba93bc63b8666702677a214732ef47bc1b335d7e4fd2fd301f86de71c7" } diff --git a/.sqlx/query-cb33fd483f0fef7ec2a1f5950218f312a19e38c7971b88db949ccaa05bf7b7c4.json b/.sqlx/query-4300398ca29f05f6a479aeb93df437a50e0645d0cf236d7f1975c3e0445e894e.json similarity index 81% rename from .sqlx/query-cb33fd483f0fef7ec2a1f5950218f312a19e38c7971b88db949ccaa05bf7b7c4.json rename to .sqlx/query-4300398ca29f05f6a479aeb93df437a50e0645d0cf236d7f1975c3e0445e894e.json index 730894ad4e..e127546871 100644 --- a/.sqlx/query-cb33fd483f0fef7ec2a1f5950218f312a19e38c7971b88db949ccaa05bf7b7c4.json +++ b/.sqlx/query-4300398ca29f05f6a479aeb93df437a50e0645d0cf236d7f1975c3e0445e894e.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n jobs.maybe_external_third_party_id as `order_id`,\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n AND jobs.status NOT IN ('complete_success', 'complete_failure')\n AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n ", + "query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n jobs.maybe_external_third_party_id as `order_id`,\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n jobs.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n AND jobs.status NOT IN ('complete_success', 'complete_failure')\n AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n ", "describe": { "columns": [ { @@ -55,7 +55,7 @@ }, { "ordinal": 5, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -98,5 +98,5 @@ true ] }, - "hash": "cb33fd483f0fef7ec2a1f5950218f312a19e38c7971b88db949ccaa05bf7b7c4" + "hash": "4300398ca29f05f6a479aeb93df437a50e0645d0cf236d7f1975c3e0445e894e" } diff --git a/.sqlx/query-521945dd4271b04e4607b30d5bee3b82b8e030405f48a320d0ee2827ddd59e4b.json b/.sqlx/query-45b9ca47da0da8565bbb662167abe86547d517a614d262fd5ee9f3048b8d3604.json similarity index 80% rename from .sqlx/query-521945dd4271b04e4607b30d5bee3b82b8e030405f48a320d0ee2827ddd59e4b.json rename to .sqlx/query-45b9ca47da0da8565bbb662167abe86547d517a614d262fd5ee9f3048b8d3604.json index 8e1d71fe8f..aaf4222dc3 100644 --- a/.sqlx/query-521945dd4271b04e4607b30d5bee3b82b8e030405f48a320d0ee2827ddd59e4b.json +++ b/.sqlx/query-45b9ca47da0da8565bbb662167abe86547d517a614d262fd5ee9f3048b8d3604.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`,\n\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n vocoder.title,\n vocoder.description_markdown,\n vocoder.description_rendered_html,\n vocoder.is_staff_recommended,\n\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n\n vocoder.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n vocoder.created_at,\n vocoder.updated_at,\n\n vocoder.creator_ip_address_creation,\n vocoder.creator_ip_address_last_update,\n vocoder.mod_deleted_at,\n vocoder.user_deleted_at\n\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\nWHERE\n vocoder.token = ?\n AND vocoder.user_deleted_at IS NULL\n AND vocoder.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`,\n\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n vocoder.title,\n vocoder.description_markdown,\n vocoder.description_rendered_html,\n vocoder.is_staff_recommended,\n\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n\n vocoder.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n vocoder.created_at,\n vocoder.updated_at,\n\n vocoder.creator_ip_address_creation,\n vocoder.creator_ip_address_last_update,\n vocoder.mod_deleted_at,\n vocoder.user_deleted_at\n\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\nWHERE\n vocoder.token = ?\n AND vocoder.user_deleted_at IS NULL\n AND vocoder.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "vocoder_type: enums::common::vocoder_type::VocoderType", + "name": "vocoder_type: enums_db::common::vocoder_type::VocoderType", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -145,7 +145,7 @@ }, { "ordinal": 14, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -241,5 +241,5 @@ true ] }, - "hash": "521945dd4271b04e4607b30d5bee3b82b8e030405f48a320d0ee2827ddd59e4b" + "hash": "45b9ca47da0da8565bbb662167abe86547d517a614d262fd5ee9f3048b8d3604" } diff --git a/.sqlx/query-eb47461f68a64712137cc99b79cae6969d0137907f4f7e4828e4051ad580ad3e.json b/.sqlx/query-4c7453133fdc89fa097578e6835bf7eeecefdf75c0ed756bfc38c99627b574f6.json similarity index 87% rename from .sqlx/query-eb47461f68a64712137cc99b79cae6969d0137907f4f7e4828e4051ad580ad3e.json rename to .sqlx/query-4c7453133fdc89fa097578e6835bf7eeecefdf75c0ed756bfc38c99627b574f6.json index 82f35a9579..101f868940 100644 --- a/.sqlx/query-eb47461f68a64712137cc99b79cae6969d0137907f4f7e4828e4051ad580ad3e.json +++ b/.sqlx/query-4c7453133fdc89fa097578e6835bf7eeecefdf75c0ed756bfc38c99627b574f6.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n users.token as `user_token: tokens::tokens::users::UserToken`,\n username,\n display_name,\n email_gravatar_hash,\n profile_markdown,\n profile_rendered_html,\n user_role_slug,\n disable_gravatar,\n preferred_tts_result_visibility as `preferred_tts_result_visibility: enums::common::visibility::Visibility`,\n preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums::common::visibility::Visibility`,\n discord_username,\n twitch_username,\n twitter_username,\n patreon_username,\n github_username,\n cashapp_username,\n website_url,\n maybe_feature_flags,\n is_banned,\n maybe_mod_comments,\n maybe_mod_user_token,\n created_at\nFROM users\nWHERE\n users.token = ?\n AND users.user_deleted_at IS NULL\n AND users.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n users.token as `user_token: tokens::tokens::users::UserToken`,\n username,\n display_name,\n email_gravatar_hash,\n profile_markdown,\n profile_rendered_html,\n user_role_slug,\n disable_gravatar,\n preferred_tts_result_visibility as `preferred_tts_result_visibility: enums_db::common::visibility::Visibility`,\n preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums_db::common::visibility::Visibility`,\n discord_username,\n twitch_username,\n twitter_username,\n patreon_username,\n github_username,\n cashapp_username,\n website_url,\n maybe_feature_flags,\n is_banned,\n maybe_mod_comments,\n maybe_mod_user_token,\n created_at\nFROM users\nWHERE\n users.token = ?\n AND users.user_deleted_at IS NULL\n AND users.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -85,7 +85,7 @@ }, { "ordinal": 8, - "name": "preferred_tts_result_visibility: enums::common::visibility::Visibility", + "name": "preferred_tts_result_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -95,7 +95,7 @@ }, { "ordinal": 9, - "name": "preferred_w2l_result_visibility: enums::common::visibility::Visibility", + "name": "preferred_w2l_result_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -252,5 +252,5 @@ false ] }, - "hash": "eb47461f68a64712137cc99b79cae6969d0137907f4f7e4828e4051ad580ad3e" + "hash": "4c7453133fdc89fa097578e6835bf7eeecefdf75c0ed756bfc38c99627b574f6" } diff --git a/.sqlx/query-706f0fd898ec367a7e2851e51c4d00dc63c89521238e55281737758ac87cfb01.json b/.sqlx/query-51729d37aaa6de2ded7e58ca562cd80227dd754a6c194e9392ceeabd37303dce.json similarity index 73% rename from .sqlx/query-706f0fd898ec367a7e2851e51c4d00dc63c89521238e55281737758ac87cfb01.json rename to .sqlx/query-51729d37aaa6de2ded7e58ca562cd80227dd754a6c194e9392ceeabd37303dce.json index a83b2b980f..77fcf9335b 100644 --- a/.sqlx/query-706f0fd898ec367a7e2851e51c4d00dc63c89521238e55281737758ac87cfb01.json +++ b/.sqlx/query-51729d37aaa6de2ded7e58ca562cd80227dd754a6c194e9392ceeabd37303dce.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n b2.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n\n b2.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n b2.entity_token,\n\n b2.user_token as `user_token: tokens::tokens::users::UserToken`,\n\n es.bookmark_count as unused_bookmark_count,\n\n b2.created_at,\n b2.updated_at,\n b2.deleted_at\n\n FROM\n user_bookmarks AS b1\n\n JOIN user_bookmarks as b2\n ON b1.entity_type = b2.entity_type\n AND b1.entity_token = b2.entity_token\n\n LEFT OUTER JOIN entity_stats AS es\n ON b1.entity_type = es.entity_type\n AND b1.entity_token = es.entity_token\n\n WHERE\n b1.token = ?\n\n FOR UPDATE\n ", + "query": "\n SELECT\n b2.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n\n b2.entity_type as `entity_type: enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n b2.entity_token,\n\n b2.user_token as `user_token: tokens::tokens::users::UserToken`,\n\n es.bookmark_count as unused_bookmark_count,\n\n b2.created_at,\n b2.updated_at,\n b2.deleted_at\n\n FROM\n user_bookmarks AS b1\n\n JOIN user_bookmarks as b2\n ON b1.entity_type = b2.entity_type\n AND b1.entity_token = b2.entity_token\n\n LEFT OUTER JOIN entity_stats AS es\n ON b1.entity_type = es.entity_type\n AND b1.entity_token = es.entity_token\n\n WHERE\n b1.token = ?\n\n FOR UPDATE\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType", + "name": "entity_type: enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -98,5 +98,5 @@ true ] }, - "hash": "706f0fd898ec367a7e2851e51c4d00dc63c89521238e55281737758ac87cfb01" + "hash": "51729d37aaa6de2ded7e58ca562cd80227dd754a6c194e9392ceeabd37303dce" } diff --git a/.sqlx/query-db7951e49ea6c5b4547871ce7b7e3993a865d655051c8be4a197cde56c51fabf.json b/.sqlx/query-531518a882bba47890abd0a1026a5995bb391fa240cd26356d1b4321017b0a79.json similarity index 85% rename from .sqlx/query-db7951e49ea6c5b4547871ce7b7e3993a865d655051c8be4a197cde56c51fabf.json rename to .sqlx/query-531518a882bba47890abd0a1026a5995bb391fa240cd26356d1b4321017b0a79.json index af57ab8803..63e98792c6 100644 --- a/.sqlx/query-db7951e49ea6c5b4547871ce7b7e3993a865d655051c8be4a197cde56c51fabf.json +++ b/.sqlx/query-531518a882bba47890abd0a1026a5995bb391fa240cd26356d1b4321017b0a79.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n c.token as `token: tokens::tokens::comments::CommentToken`,\n\n c.entity_type as `entity_type: enums::by_table::comments::comment_entity_type::CommentEntityType`,\n c.entity_token,\n\n c.user_token as `user_token: tokens::tokens::users::UserToken`,\n u.username,\n u.display_name as user_display_name,\n u.email_gravatar_hash as user_gravatar_hash,\n\n c.comment_markdown,\n c.comment_rendered_html,\n\n c.creator_ip_address,\n c.editor_ip_address,\n\n c.created_at,\n c.updated_at,\n c.edited_at,\n c.user_deleted_at,\n c.mod_deleted_at,\n c.object_owner_deleted_at\n\nFROM\n comments AS c\nJOIN users AS u\n ON c.user_token = u.token\nWHERE\n c.token = ?\n ", + "query": "\nSELECT\n c.token as `token: tokens::tokens::comments::CommentToken`,\n\n c.entity_type as `entity_type: enums_db::by_table::comments::comment_entity_type::CommentEntityType`,\n c.entity_token,\n\n c.user_token as `user_token: tokens::tokens::users::UserToken`,\n u.username,\n u.display_name as user_display_name,\n u.email_gravatar_hash as user_gravatar_hash,\n\n c.comment_markdown,\n c.comment_rendered_html,\n\n c.creator_ip_address,\n c.editor_ip_address,\n\n c.created_at,\n c.updated_at,\n c.edited_at,\n c.user_deleted_at,\n c.mod_deleted_at,\n c.object_owner_deleted_at\n\nFROM\n comments AS c\nJOIN users AS u\n ON c.user_token = u.token\nWHERE\n c.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "entity_type: enums::by_table::comments::comment_entity_type::CommentEntityType", + "name": "entity_type: enums_db::by_table::comments::comment_entity_type::CommentEntityType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -197,5 +197,5 @@ true ] }, - "hash": "db7951e49ea6c5b4547871ce7b7e3993a865d655051c8be4a197cde56c51fabf" + "hash": "531518a882bba47890abd0a1026a5995bb391fa240cd26356d1b4321017b0a79" } diff --git a/.sqlx/query-fa724ca3644d7cba26e503c1a2c900bea00e10250c703019363fe9cf855a5a69.json b/.sqlx/query-56f14cfc5a16bc88fb8fdef05c1f592a15beb7b4af96e757dcbe0544b283ec38.json similarity index 66% rename from .sqlx/query-fa724ca3644d7cba26e503c1a2c900bea00e10250c703019363fe9cf855a5a69.json rename to .sqlx/query-56f14cfc5a16bc88fb8fdef05c1f592a15beb7b4af96e757dcbe0544b283ec38.json index c1a252ff42..15b584f332 100644 --- a/.sqlx/query-fa724ca3644d7cba26e503c1a2c900bea00e10250c703019363fe9cf855a5a69.json +++ b/.sqlx/query-56f14cfc5a16bc88fb8fdef05c1f592a15beb7b4af96e757dcbe0544b283ec38.json @@ -1,11 +1,11 @@ { "db_name": "MySQL", - "query": "\nSELECT\n r.rating_value as `rating_value: enums::by_table::user_ratings::rating_value::UserRatingValue`,\n r.created_at,\n r.updated_at,\n\n es.ratings_positive_count as unused_ratings_positive_count\n\nFROM user_ratings AS r\n\nLEFT OUTER JOIN entity_stats AS es\n ON r.entity_type = es.entity_type\n AND r.entity_token = es.entity_token\n\nWHERE r.user_token = ?\n AND r.entity_type = ?\n AND r.entity_token = ?\n\nLIMIT 1\n\nFOR UPDATE\n ", + "query": "\nSELECT\n r.rating_value as `rating_value: enums_db::by_table::user_ratings::rating_value::UserRatingValue`,\n r.created_at,\n r.updated_at,\n\n es.ratings_positive_count as unused_ratings_positive_count\n\nFROM user_ratings AS r\n\nLEFT OUTER JOIN entity_stats AS es\n ON r.entity_type = es.entity_type\n AND r.entity_token = es.entity_token\n\nWHERE r.user_token = ?\n AND r.entity_type = ?\n AND r.entity_token = ?\n\nLIMIT 1\n\nFOR UPDATE\n ", "describe": { "columns": [ { "ordinal": 0, - "name": "rating_value: enums::by_table::user_ratings::rating_value::UserRatingValue", + "name": "rating_value: enums_db::by_table::user_ratings::rating_value::UserRatingValue", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -54,5 +54,5 @@ true ] }, - "hash": "fa724ca3644d7cba26e503c1a2c900bea00e10250c703019363fe9cf855a5a69" + "hash": "56f14cfc5a16bc88fb8fdef05c1f592a15beb7b4af96e757dcbe0544b283ec38" } diff --git a/.sqlx/query-34afe8ddbf0fb5d746ec82827166348ae1a0734ca5986a7d696860efd90128ce.json b/.sqlx/query-57efaab67451250b4afc3033f4dcc1bfaf61deeee8e4f0f34087fff310b60065.json similarity index 73% rename from .sqlx/query-34afe8ddbf0fb5d746ec82827166348ae1a0734ca5986a7d696860efd90128ce.json rename to .sqlx/query-57efaab67451250b4afc3033f4dcc1bfaf61deeee8e4f0f34087fff310b60065.json index 5d1b1a8c28..370e67026c 100644 --- a/.sqlx/query-34afe8ddbf0fb5d746ec82827166348ae1a0734ca5986a7d696860efd90128ce.json +++ b/.sqlx/query-57efaab67451250b4afc3033f4dcc1bfaf61deeee8e4f0f34087fff310b60065.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n mu.token as `token: tokens::tokens::media_uploads::MediaUploadToken`,\n mu.media_type as `media_type: enums::by_table::media_uploads::media_upload_type::MediaUploadType`,\n mu.maybe_original_filename,\n mu.original_file_size_bytes,\n mu.original_duration_millis,\n mu.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n mu.created_at,\n mu.updated_at\nFROM media_uploads as mu\nWHERE\n mu.maybe_creator_user_token = ?\n AND mu.maybe_creator_user_token IS NOT NULL\n AND mu.media_type = ?\n AND mu.user_deleted_at IS NULL\n AND mu.mod_deleted_at IS NULL\nORDER BY id DESC\nLIMIT 25\n ", + "query": "\nSELECT\n mu.token as `token: tokens::tokens::media_uploads::MediaUploadToken`,\n mu.media_type as `media_type: enums_db::by_table::media_uploads::media_upload_type::MediaUploadType`,\n mu.maybe_original_filename,\n mu.original_file_size_bytes,\n mu.original_duration_millis,\n mu.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n mu.created_at,\n mu.updated_at\nFROM media_uploads as mu\nWHERE\n mu.maybe_creator_user_token = ?\n AND mu.maybe_creator_user_token IS NOT NULL\n AND mu.media_type = ?\n AND mu.user_deleted_at IS NULL\n AND mu.mod_deleted_at IS NULL\nORDER BY id DESC\nLIMIT 25\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "media_type: enums::by_table::media_uploads::media_upload_type::MediaUploadType", + "name": "media_type: enums_db::by_table::media_uploads::media_upload_type::MediaUploadType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -55,7 +55,7 @@ }, { "ordinal": 5, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -98,5 +98,5 @@ false ] }, - "hash": "34afe8ddbf0fb5d746ec82827166348ae1a0734ca5986a7d696860efd90128ce" + "hash": "57efaab67451250b4afc3033f4dcc1bfaf61deeee8e4f0f34087fff310b60065" } diff --git a/.sqlx/query-7fe0ebaab55fdbfd4ab447e872e95a4def5888a0bb9f237d8a13bac8336a534b.json b/.sqlx/query-5a914d59f09287f4708b87546a3b15c9da8fbb840c0fa5d8260bfc52fe7f25f6.json similarity index 75% rename from .sqlx/query-7fe0ebaab55fdbfd4ab447e872e95a4def5888a0bb9f237d8a13bac8336a534b.json rename to .sqlx/query-5a914d59f09287f4708b87546a3b15c9da8fbb840c0fa5d8260bfc52fe7f25f6.json index 914baebcd7..76d4e9ebdd 100644 --- a/.sqlx/query-7fe0ebaab55fdbfd4ab447e872e95a4def5888a0bb9f237d8a13bac8336a534b.json +++ b/.sqlx/query-5a914d59f09287f4708b87546a3b15c9da8fbb840c0fa5d8260bfc52fe7f25f6.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w_extension.ietf_language_tag as maybe_ietf_language_tag,\n w_extension.ietf_primary_language_subtag as maybe_ietf_primary_language_subtag,\n w_extension.maybe_default_pretrained_vocoder as `maybe_default_pretrained_vocoder: crate::column_types::vocoder_type::VocoderType`,\n w_extension.text_pipeline_type as maybe_text_pipeline_type,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n\n LEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = wt.token\n\n WHERE\n wt.maybe_migration_old_model_token = ?\n ", + "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w_extension.ietf_language_tag as maybe_ietf_language_tag,\n w_extension.ietf_primary_language_subtag as maybe_ietf_primary_language_subtag,\n w_extension.maybe_default_pretrained_vocoder as `maybe_default_pretrained_vocoder: crate::column_types::vocoder_type::VocoderType`,\n w_extension.text_pipeline_type as maybe_text_pipeline_type,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n\n LEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = wt.token\n\n WHERE\n wt.maybe_migration_old_model_token = ?\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -115,7 +115,7 @@ }, { "ordinal": 11, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -395,5 +395,5 @@ true ] }, - "hash": "7fe0ebaab55fdbfd4ab447e872e95a4def5888a0bb9f237d8a13bac8336a534b" + "hash": "5a914d59f09287f4708b87546a3b15c9da8fbb840c0fa5d8260bfc52fe7f25f6" } diff --git a/.sqlx/query-295ac99103e49c817d545d5a7b8a819a839885245c60f8ce2c13a73155917942.json b/.sqlx/query-5ab6138d977a089eff185cc0d2b09dc691e5c5d888720129c22eab79b38f372c.json similarity index 82% rename from .sqlx/query-295ac99103e49c817d545d5a7b8a819a839885245c60f8ce2c13a73155917942.json rename to .sqlx/query-5ab6138d977a089eff185cc0d2b09dc691e5c5d888720129c22eab79b38f372c.json index fc20fc974f..51988e6123 100644 --- a/.sqlx/query-295ac99103e49c817d545d5a7b8a819a839885245c60f8ce2c13a73155917942.json +++ b/.sqlx/query-5ab6138d977a089eff185cc0d2b09dc691e5c5d888720129c22eab79b38f372c.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,\n tts.text_pipeline_type,\n tts.text_preprocessing_algorithm,\n tts.maybe_default_pretrained_vocoder,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n tts.title,\n tts.description_markdown,\n tts.description_rendered_html,\n\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n\n tts.maybe_suggested_unique_bot_command,\n\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n\n tts.creator_set_visibility,\n\n tts.is_locked_from_use,\n tts.is_locked_from_user_modification,\n\n tts.maybe_migration_new_model_weights_token,\n\n tts.maybe_custom_vocoder_token,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder_user.token as maybe_custom_vocoder_creator_user_token,\n vocoder_user.username as maybe_custom_vocoder_creator_username,\n vocoder_user.display_name as maybe_custom_vocoder_creator_display_name,\n vocoder_user.email_gravatar_hash as maybe_custom_vocoder_creator_gravatar_hash,\n\n tts.created_at,\n tts.updated_at,\n\n tts.creator_ip_address_creation,\n tts.creator_ip_address_last_update,\n tts.mod_deleted_at,\n tts.user_deleted_at\n\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\nLEFT OUTER JOIN users AS vocoder_user\n ON vocoder_user.token = vocoder.creator_user_token\n\nWHERE\n tts.token = ?\n AND tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type as `tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType`,\n tts.text_pipeline_type,\n tts.text_preprocessing_algorithm,\n tts.maybe_default_pretrained_vocoder,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n tts.title,\n tts.description_markdown,\n tts.description_rendered_html,\n\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n\n tts.maybe_suggested_unique_bot_command,\n\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n\n tts.creator_set_visibility,\n\n tts.is_locked_from_use,\n tts.is_locked_from_user_modification,\n\n tts.maybe_migration_new_model_weights_token,\n\n tts.maybe_custom_vocoder_token,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder_user.token as maybe_custom_vocoder_creator_user_token,\n vocoder_user.username as maybe_custom_vocoder_creator_username,\n vocoder_user.display_name as maybe_custom_vocoder_creator_display_name,\n vocoder_user.email_gravatar_hash as maybe_custom_vocoder_creator_gravatar_hash,\n\n tts.created_at,\n tts.updated_at,\n\n tts.creator_ip_address_creation,\n tts.creator_ip_address_last_update,\n tts.mod_deleted_at,\n tts.user_deleted_at\n\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\nLEFT OUTER JOIN users AS vocoder_user\n ON vocoder_user.token = vocoder.creator_user_token\n\nWHERE\n tts.token = ?\n AND tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType", + "name": "tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -439,5 +439,5 @@ true ] }, - "hash": "295ac99103e49c817d545d5a7b8a819a839885245c60f8ce2c13a73155917942" + "hash": "5ab6138d977a089eff185cc0d2b09dc691e5c5d888720129c22eab79b38f372c" } diff --git a/.sqlx/query-5c67010afd0bb8aa3cd8f6c2407c4c314ace016f816eca51991720a276340d41.json b/.sqlx/query-5ba6cde0a61d0fdaec421f235df84d8fe743882f007c50f3fcae3c7a24c46aa5.json similarity index 76% rename from .sqlx/query-5c67010afd0bb8aa3cd8f6c2407c4c314ace016f816eca51991720a276340d41.json rename to .sqlx/query-5ba6cde0a61d0fdaec421f235df84d8fe743882f007c50f3fcae3c7a24c46aa5.json index f907d6343c..9e83c516f8 100644 --- a/.sqlx/query-5c67010afd0bb8aa3cd8f6c2407c4c314ace016f816eca51991720a276340d41.json +++ b/.sqlx/query-5ba6cde0a61d0fdaec421f235df84d8fe743882f007c50f3fcae3c7a24c46aa5.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n updated_at\n FROM model_weights\n WHERE\n updated_at > ?\n ", + "query": "\n SELECT\n token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n updated_at\n FROM model_weights\n WHERE\n updated_at > ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -43,5 +43,5 @@ false ] }, - "hash": "5c67010afd0bb8aa3cd8f6c2407c4c314ace016f816eca51991720a276340d41" + "hash": "5ba6cde0a61d0fdaec421f235df84d8fe743882f007c50f3fcae3c7a24c46aa5" } diff --git a/.sqlx/query-f75fedb86a93ac2542315ddb7ef0d46aa42ecc25a3cf9856219114064183337a.json b/.sqlx/query-5bbc34904f8729aa94714bf7e31e9b7ad5181692b1402b01fcd97983ecaa0c18.json similarity index 75% rename from .sqlx/query-f75fedb86a93ac2542315ddb7ef0d46aa42ecc25a3cf9856219114064183337a.json rename to .sqlx/query-5bbc34904f8729aa94714bf7e31e9b7ad5181692b1402b01fcd97983ecaa0c18.json index 44b598756c..55f18754b9 100644 --- a/.sqlx/query-f75fedb86a93ac2542315ddb7ef0d46aa42ecc25a3cf9856219114064183337a.json +++ b/.sqlx/query-5bbc34904f8729aa94714bf7e31e9b7ad5181692b1402b01fcd97983ecaa0c18.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n m.is_user_upload,\n m.is_intermediate_system_file,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nWHERE\n m.maybe_batch_token = ?\n AND m.user_deleted_at IS NULL\n AND m.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums_db::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums_db::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n m.is_user_upload,\n m.is_intermediate_system_file,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nWHERE\n m.maybe_batch_token = ?\n AND m.user_deleted_at IS NULL\n AND m.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "media_class: enums::by_table::media_files::media_file_class::MediaFileClass", + "name": "media_class: enums_db::by_table::media_files::media_file_class::MediaFileClass", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY", @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType", + "name": "media_type: enums_db::by_table::media_files::media_file_type::MediaFileType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -195,7 +195,7 @@ }, { "ordinal": 19, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -307,5 +307,5 @@ false ] }, - "hash": "f75fedb86a93ac2542315ddb7ef0d46aa42ecc25a3cf9856219114064183337a" + "hash": "5bbc34904f8729aa94714bf7e31e9b7ad5181692b1402b01fcd97983ecaa0c18" } diff --git a/.sqlx/query-43753c8a8a35756059f6642908ec72e20244c06c92facee8cb7fc556009992a1.json b/.sqlx/query-5f45c1ae38ccc8f77f6a02684c45f2f44f23bf90d2c510fb50a1c2ef8e0d08c6.json similarity index 92% rename from .sqlx/query-43753c8a8a35756059f6642908ec72e20244c06c92facee8cb7fc556009992a1.json rename to .sqlx/query-5f45c1ae38ccc8f77f6a02684c45f2f44f23bf90d2c510fb50a1c2ef8e0d08c6.json index 8b79ff7a91..04239df65c 100644 --- a/.sqlx/query-43753c8a8a35756059f6642908ec72e20244c06c92facee8cb7fc556009992a1.json +++ b/.sqlx/query-5f45c1ae38ccc8f77f6a02684c45f2f44f23bf90d2c510fb50a1c2ef8e0d08c6.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type,\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n tts.title,\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n tts.is_locked_from_use,\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n tts.maybe_suggested_unique_bot_command,\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n tts.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n tts.created_at,\n tts.updated_at\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\nWHERE\n tts.is_locked_from_use IS FALSE\n AND tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type,\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n tts.title,\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n tts.is_locked_from_use,\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n tts.maybe_suggested_unique_bot_command,\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n tts.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n tts.created_at,\n tts.updated_at\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\nWHERE\n tts.is_locked_from_use IS FALSE\n AND tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -165,7 +165,7 @@ }, { "ordinal": 16, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -219,5 +219,5 @@ false ] }, - "hash": "43753c8a8a35756059f6642908ec72e20244c06c92facee8cb7fc556009992a1" + "hash": "5f45c1ae38ccc8f77f6a02684c45f2f44f23bf90d2c510fb50a1c2ef8e0d08c6" } diff --git a/.sqlx/query-57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908.json b/.sqlx/query-638e946f41e778bf6034b7702e43faf47b272a85941178f8eb6865c32a0e0407.json similarity index 75% rename from .sqlx/query-57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908.json rename to .sqlx/query-638e946f41e778bf6034b7702e43faf47b272a85941178f8eb6865c32a0e0407.json index 32458e2609..76b721e17b 100644 --- a/.sqlx/query-57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908.json +++ b/.sqlx/query-638e946f41e778bf6034b7702e43faf47b272a85941178f8eb6865c32a0e0407.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weight_type: enums::by_table::model_weights::weights_types::WeightsType`,\n w.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n w.title,\n w_extension.ietf_language_tag,\n w_extension.ietf_primary_language_subtag,\n w.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n w.created_at,\n w.updated_at\nFROM model_weights as w\nLEFT OUTER JOIN model_weights_extension_voice_conversion_details as w_extension\n ON w_extension.model_weights_token = w.token\nJOIN users\n ON users.token = w.creator_user_token\nWHERE\n w.weights_type IN (\"rvc_v2\", \"so_vits_svc\")\n AND w.user_deleted_at IS NULL\n AND w.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weight_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n w.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n w.title,\n w_extension.ietf_language_tag,\n w_extension.ietf_primary_language_subtag,\n w.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n w.created_at,\n w.updated_at\nFROM model_weights as w\nLEFT OUTER JOIN model_weights_extension_voice_conversion_details as w_extension\n ON w_extension.model_weights_token = w.token\nJOIN users\n ON users.token = w.creator_user_token\nWHERE\n w.weights_type IN (\"rvc_v2\", \"so_vits_svc\")\n AND w.user_deleted_at IS NULL\n AND w.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "weight_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weight_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -95,7 +95,7 @@ }, { "ordinal": 9, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -142,5 +142,5 @@ false ] }, - "hash": "57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908" + "hash": "638e946f41e778bf6034b7702e43faf47b272a85941178f8eb6865c32a0e0407" } diff --git a/.sqlx/query-d243270734f48fce2f5072ddbde224abf24858c6484995949c98382aa58840a7.json b/.sqlx/query-63b09aef13ce41446a594d904719f6dc26d4a591ffe65c5e6de84ecdf38e2355.json similarity index 67% rename from .sqlx/query-d243270734f48fce2f5072ddbde224abf24858c6484995949c98382aa58840a7.json rename to .sqlx/query-63b09aef13ce41446a594d904719f6dc26d4a591ffe65c5e6de84ecdf38e2355.json index 737fb28707..3d6b7b3a8e 100644 --- a/.sqlx/query-d243270734f48fce2f5072ddbde224abf24858c6484995949c98382aa58840a7.json +++ b/.sqlx/query-63b09aef13ce41446a594d904719f6dc26d4a591ffe65c5e6de84ecdf38e2355.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n WHERE\n wt.token = ?\n AND wt.user_deleted_at IS NULL\n AND wt.mod_deleted_at IS NULL\n ", + "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n WHERE\n wt.token = ?\n AND wt.user_deleted_at IS NULL\n AND wt.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -45,7 +45,7 @@ }, { "ordinal": 4, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -87,5 +87,5 @@ true ] }, - "hash": "d243270734f48fce2f5072ddbde224abf24858c6484995949c98382aa58840a7" + "hash": "63b09aef13ce41446a594d904719f6dc26d4a591ffe65c5e6de84ecdf38e2355" } diff --git a/.sqlx/query-971471f349bcd22364b16b5d6c68e807ed897101eec1e8a62a7b8fab3359fa0c.json b/.sqlx/query-654c980065ce2b39c73cad1cc0cd64a1cbc280e27586dbde0498c485ae0c29e2.json similarity index 75% rename from .sqlx/query-971471f349bcd22364b16b5d6c68e807ed897101eec1e8a62a7b8fab3359fa0c.json rename to .sqlx/query-654c980065ce2b39c73cad1cc0cd64a1cbc280e27586dbde0498c485ae0c29e2.json index 514a0be55c..4d5902f955 100644 --- a/.sqlx/query-971471f349bcd22364b16b5d6c68e807ed897101eec1e8a62a7b8fab3359fa0c.json +++ b/.sqlx/query-654c980065ce2b39c73cad1cc0cd64a1cbc280e27586dbde0498c485ae0c29e2.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n m.is_user_upload,\n m.is_intermediate_system_file,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nWHERE\n m.maybe_batch_token = ?\n ", + "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums_db::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums_db::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n m.is_user_upload,\n m.is_intermediate_system_file,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nWHERE\n m.maybe_batch_token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "media_class: enums::by_table::media_files::media_file_class::MediaFileClass", + "name": "media_class: enums_db::by_table::media_files::media_file_class::MediaFileClass", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY", @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType", + "name": "media_type: enums_db::by_table::media_files::media_file_type::MediaFileType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -195,7 +195,7 @@ }, { "ordinal": 19, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -307,5 +307,5 @@ false ] }, - "hash": "971471f349bcd22364b16b5d6c68e807ed897101eec1e8a62a7b8fab3359fa0c" + "hash": "654c980065ce2b39c73cad1cc0cd64a1cbc280e27586dbde0498c485ae0c29e2" } diff --git a/.sqlx/query-6d61619c29f59a487a258ab2a4814197b39015c5c6bc0e54db43923c7f283475.json b/.sqlx/query-67af6a671a425afb65388f1ab94a019d3c2a89b0af0f02d48395b8d82b0416d7.json similarity index 87% rename from .sqlx/query-6d61619c29f59a487a258ab2a4814197b39015c5c6bc0e54db43923c7f283475.json rename to .sqlx/query-67af6a671a425afb65388f1ab94a019d3c2a89b0af0f02d48395b8d82b0416d7.json index 78cf498c0e..593b9f9ba6 100644 --- a/.sqlx/query-6d61619c29f59a487a258ab2a4814197b39015c5c6bc0e54db43923c7f283475.json +++ b/.sqlx/query-67af6a671a425afb65388f1ab94a019d3c2a89b0af0f02d48395b8d82b0416d7.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n users.token as `user_token: tokens::tokens::users::UserToken`,\n email_address,\n username,\n display_name,\n email_gravatar_hash,\n profile_markdown,\n profile_rendered_html,\n user_role_slug,\n disable_gravatar,\n preferred_tts_result_visibility as `preferred_tts_result_visibility: enums::common::visibility::Visibility`,\n preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums::common::visibility::Visibility`,\n discord_username,\n twitch_username,\n twitter_username,\n patreon_username,\n github_username,\n cashapp_username,\n website_url,\n is_banned,\n maybe_mod_comments,\n maybe_mod_user_token,\n maybe_feature_flags,\n created_at\nFROM users\nWHERE\n users.username = ?\n AND users.user_deleted_at IS NULL\n AND users.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n users.token as `user_token: tokens::tokens::users::UserToken`,\n email_address,\n username,\n display_name,\n email_gravatar_hash,\n profile_markdown,\n profile_rendered_html,\n user_role_slug,\n disable_gravatar,\n preferred_tts_result_visibility as `preferred_tts_result_visibility: enums_db::common::visibility::Visibility`,\n preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums_db::common::visibility::Visibility`,\n discord_username,\n twitch_username,\n twitter_username,\n patreon_username,\n github_username,\n cashapp_username,\n website_url,\n is_banned,\n maybe_mod_comments,\n maybe_mod_user_token,\n maybe_feature_flags,\n created_at\nFROM users\nWHERE\n users.username = ?\n AND users.user_deleted_at IS NULL\n AND users.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -95,7 +95,7 @@ }, { "ordinal": 9, - "name": "preferred_tts_result_visibility: enums::common::visibility::Visibility", + "name": "preferred_tts_result_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -105,7 +105,7 @@ }, { "ordinal": 10, - "name": "preferred_w2l_result_visibility: enums::common::visibility::Visibility", + "name": "preferred_w2l_result_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -263,5 +263,5 @@ false ] }, - "hash": "6d61619c29f59a487a258ab2a4814197b39015c5c6bc0e54db43923c7f283475" + "hash": "67af6a671a425afb65388f1ab94a019d3c2a89b0af0f02d48395b8d82b0416d7" } diff --git a/.sqlx/query-53c90f5230aa202aead37a224ec70e350172bc0ec4eeaebde22878ca4aa0f695.json b/.sqlx/query-68f66e68dae336e102c9e31a4fb50ea31a9efae04da32915ce761cd162f68dfb.json similarity index 76% rename from .sqlx/query-53c90f5230aa202aead37a224ec70e350172bc0ec4eeaebde22878ca4aa0f695.json rename to .sqlx/query-68f66e68dae336e102c9e31a4fb50ea31a9efae04da32915ce761cd162f68dfb.json index 6fdb3fede5..7521c00f0f 100644 --- a/.sqlx/query-53c90f5230aa202aead37a224ec70e350172bc0ec4eeaebde22878ca4aa0f695.json +++ b/.sqlx/query-68f66e68dae336e102c9e31a4fb50ea31a9efae04da32915ce761cd162f68dfb.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n\n wt.maybe_ietf_language_tag,\n wt.maybe_ietf_primary_language_subtag,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n wt.cached_usage_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n LEFT OUTER JOIN featured_items\n ON featured_items.entity_type = \"model_weight\"\n AND featured_items.entity_token = wt.token\n AND featured_items.deleted_at IS NULL\n WHERE\n wt.token = ?\n ", + "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n\n wt.maybe_ietf_language_tag,\n wt.maybe_ietf_primary_language_subtag,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n wt.cached_usage_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n LEFT OUTER JOIN featured_items\n ON featured_items.entity_type = \"model_weight\"\n AND featured_items.entity_token = wt.token\n AND featured_items.deleted_at IS NULL\n WHERE\n wt.token = ?\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -135,7 +135,7 @@ }, { "ordinal": 13, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -395,5 +395,5 @@ true ] }, - "hash": "53c90f5230aa202aead37a224ec70e350172bc0ec4eeaebde22878ca4aa0f695" + "hash": "68f66e68dae336e102c9e31a4fb50ea31a9efae04da32915ce761cd162f68dfb" } diff --git a/.sqlx/query-6c0a2cb31a3241fc6cd0b6738901a31bd91298f131d3b87744c698e92eaec34b.json b/.sqlx/query-699953d16eb9c60d8f91a91d6f833c907c254b99aea94973d6a12fde324ed1c3.json similarity index 75% rename from .sqlx/query-6c0a2cb31a3241fc6cd0b6738901a31bd91298f131d3b87744c698e92eaec34b.json rename to .sqlx/query-699953d16eb9c60d8f91a91d6f833c907c254b99aea94973d6a12fde324ed1c3.json index d7cb5678a0..69bf91a639 100644 --- a/.sqlx/query-6c0a2cb31a3241fc6cd0b6738901a31bd91298f131d3b87744c698e92eaec34b.json +++ b/.sqlx/query-699953d16eb9c60d8f91a91d6f833c907c254b99aea94973d6a12fde324ed1c3.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w_extension.ietf_language_tag as maybe_ietf_language_tag,\n w_extension.ietf_primary_language_subtag as maybe_ietf_primary_language_subtag,\n w_extension.maybe_default_pretrained_vocoder,\n w_extension.text_pipeline_type as maybe_text_pipeline_type,\n w_extension.use_default_mel_multiply_factor,\n w_extension.maybe_custom_mel_multiply_factor,\n\n w_extension.maybe_custom_vocoder_token,\n\n vocoder.vocoder_type as `maybe_custom_vocoder_type: enums::common::vocoder_type::VocoderType`,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder.private_bucket_hash as maybe_custom_vocoder_private_bucket_hash,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n\n LEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = wt.token\n\n LEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = w_extension.maybe_custom_vocoder_token\n\n WHERE\n wt.token = ?\n ", + "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w_extension.ietf_language_tag as maybe_ietf_language_tag,\n w_extension.ietf_primary_language_subtag as maybe_ietf_primary_language_subtag,\n w_extension.maybe_default_pretrained_vocoder,\n w_extension.text_pipeline_type as maybe_text_pipeline_type,\n w_extension.use_default_mel_multiply_factor,\n w_extension.maybe_custom_mel_multiply_factor,\n\n w_extension.maybe_custom_vocoder_token,\n\n vocoder.vocoder_type as `maybe_custom_vocoder_type: enums_db::common::vocoder_type::VocoderType`,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder.private_bucket_hash as maybe_custom_vocoder_private_bucket_hash,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n\n LEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = wt.token\n\n LEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = w_extension.maybe_custom_vocoder_token\n\n WHERE\n wt.token = ?\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -115,7 +115,7 @@ }, { "ordinal": 11, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -335,7 +335,7 @@ }, { "ordinal": 33, - "name": "maybe_custom_vocoder_type: enums::common::vocoder_type::VocoderType", + "name": "maybe_custom_vocoder_type: enums_db::common::vocoder_type::VocoderType", "type_info": { "type": "VarString", "flags": "BINARY | NO_DEFAULT_VALUE", @@ -461,5 +461,5 @@ true ] }, - "hash": "6c0a2cb31a3241fc6cd0b6738901a31bd91298f131d3b87744c698e92eaec34b" + "hash": "699953d16eb9c60d8f91a91d6f833c907c254b99aea94973d6a12fde324ed1c3" } diff --git a/.sqlx/query-359be6ce263afd62fc748c14c06c62ded5ed59fc0a9d1186967028af400d7d61.json b/.sqlx/query-6ba78379f2da84371f0e2857fd3f5a71c3f0d26aa780b6fdb27b1cc5867c6d9b.json similarity index 79% rename from .sqlx/query-359be6ce263afd62fc748c14c06c62ded5ed59fc0a9d1186967028af400d7d61.json rename to .sqlx/query-6ba78379f2da84371f0e2857fd3f5a71c3f0d26aa780b6fdb27b1cc5867c6d9b.json index 295bad6c25..e5d303b59a 100644 --- a/.sqlx/query-359be6ce263afd62fc748c14c06c62ded5ed59fc0a9d1186967028af400d7d61.json +++ b/.sqlx/query-6ba78379f2da84371f0e2857fd3f5a71c3f0d26aa780b6fdb27b1cc5867c6d9b.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`,\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vocoder.title,\n vocoder.is_staff_recommended,\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n vocoder.created_at,\n vocoder.updated_at,\n vocoder.user_deleted_at,\n vocoder.mod_deleted_at\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\nWHERE\n users.username = ?\n AND vocoder.is_mod_disabled_from_public_use IS FALSE\n AND vocoder.is_mod_disabled_from_author_use IS FALSE\n AND vocoder.user_deleted_at IS NULL\n AND vocoder.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`,\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vocoder.title,\n vocoder.is_staff_recommended,\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n vocoder.created_at,\n vocoder.updated_at,\n vocoder.user_deleted_at,\n vocoder.mod_deleted_at\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\nWHERE\n users.username = ?\n AND vocoder.is_mod_disabled_from_public_use IS FALSE\n AND vocoder.is_mod_disabled_from_author_use IS FALSE\n AND vocoder.user_deleted_at IS NULL\n AND vocoder.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "vocoder_type: enums::common::vocoder_type::VocoderType", + "name": "vocoder_type: enums_db::common::vocoder_type::VocoderType", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -175,5 +175,5 @@ true ] }, - "hash": "359be6ce263afd62fc748c14c06c62ded5ed59fc0a9d1186967028af400d7d61" + "hash": "6ba78379f2da84371f0e2857fd3f5a71c3f0d26aa780b6fdb27b1cc5867c6d9b" } diff --git a/.sqlx/query-e21825a48319819fc506b3e914625806ebde1ced4f48786174568e70028bd75b.json b/.sqlx/query-6c09fd83db142bed334fc2da38e9c5aa88377d54f7890f7d4a8a5547386e95c2.json similarity index 86% rename from .sqlx/query-e21825a48319819fc506b3e914625806ebde1ced4f48786174568e70028bd75b.json rename to .sqlx/query-6c09fd83db142bed334fc2da38e9c5aa88377d54f7890f7d4a8a5547386e95c2.json index e1ba11c455..78147f928e 100644 --- a/.sqlx/query-e21825a48319819fc506b3e914625806ebde1ced4f48786174568e70028bd75b.json +++ b/.sqlx/query-6c09fd83db142bed334fc2da38e9c5aa88377d54f7890f7d4a8a5547386e95c2.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n zd.token as `token: tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken`,\n zd.title,\n zd.ietf_language_tag,\n zd.ietf_primary_language_subtag,\n users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_email_gravatar_hash,\n zd.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n zd.created_at,\n zd.updated_at\n FROM zs_voice_datasets as zd\n JOIN users\n ON users.token = zd.maybe_creator_user_token\n WHERE\n users.username = ?\n AND zd.user_deleted_at IS NULL\n AND zd.mod_deleted_at IS NULL\n ", + "query": "\n SELECT\n zd.token as `token: tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken`,\n zd.title,\n zd.ietf_language_tag,\n zd.ietf_primary_language_subtag,\n users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_email_gravatar_hash,\n zd.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n zd.created_at,\n zd.updated_at\n FROM zs_voice_datasets as zd\n JOIN users\n ON users.token = zd.maybe_creator_user_token\n WHERE\n users.username = ?\n AND zd.user_deleted_at IS NULL\n AND zd.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -85,7 +85,7 @@ }, { "ordinal": 8, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -131,5 +131,5 @@ false ] }, - "hash": "e21825a48319819fc506b3e914625806ebde1ced4f48786174568e70028bd75b" + "hash": "6c09fd83db142bed334fc2da38e9c5aa88377d54f7890f7d4a8a5547386e95c2" } diff --git a/.sqlx/query-680d60fcda0f6fdf269f3525a3fe582db847e56ca7380c0ff5696cbd6efb7db3.json b/.sqlx/query-6feaeea53c67e63ed996886d09227a2d1f54d6f6cadd8c564f7e43e32ae1176a.json similarity index 73% rename from .sqlx/query-680d60fcda0f6fdf269f3525a3fe582db847e56ca7380c0ff5696cbd6efb7db3.json rename to .sqlx/query-6feaeea53c67e63ed996886d09227a2d1f54d6f6cadd8c564f7e43e32ae1176a.json index e34cd7441a..3639739e3f 100644 --- a/.sqlx/query-680d60fcda0f6fdf269f3525a3fe582db847e56ca7380c0ff5696cbd6efb7db3.json +++ b/.sqlx/query-6feaeea53c67e63ed996886d09227a2d1f54d6f6cadd8c564f7e43e32ae1176a.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n user_token,\n subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n subscription_product_slug,\n subscription_expires_at\n\nFROM user_subscriptions\n\nWHERE\n user_token = ?\n AND subscription_expires_at > CURRENT_TIMESTAMP\n ORDER BY id ASC\n ", + "query": "\nSELECT\n user_token,\n subscription_namespace as `subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace`,\n subscription_product_slug,\n subscription_expires_at\n\nFROM user_subscriptions\n\nWHERE\n user_token = ?\n AND subscription_expires_at > CURRENT_TIMESTAMP\n ORDER BY id ASC\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace", + "name": "subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -54,5 +54,5 @@ false ] }, - "hash": "680d60fcda0f6fdf269f3525a3fe582db847e56ca7380c0ff5696cbd6efb7db3" + "hash": "6feaeea53c67e63ed996886d09227a2d1f54d6f6cadd8c564f7e43e32ae1176a" } diff --git a/.sqlx/query-81151fbc8a93723bfd6e06ca788c1d93ee391afde2ec3cf1a4a721f1cf1c9f2d.json b/.sqlx/query-734e37c19df6c71b7c31bb28646e6a2512dd0bb927025b809027105707efd32a.json similarity index 67% rename from .sqlx/query-81151fbc8a93723bfd6e06ca788c1d93ee391afde2ec3cf1a4a721f1cf1c9f2d.json rename to .sqlx/query-734e37c19df6c71b7c31bb28646e6a2512dd0bb927025b809027105707efd32a.json index 77848d6ea9..2af2909760 100644 --- a/.sqlx/query-81151fbc8a93723bfd6e06ca788c1d93ee391afde2ec3cf1a4a721f1cf1c9f2d.json +++ b/.sqlx/query-734e37c19df6c71b7c31bb28646e6a2512dd0bb927025b809027105707efd32a.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n vc.model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`\nFROM voice_conversion_models as vc\nWHERE vc.token = ?\n ", + "query": "\nSELECT\n vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n vc.model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`\nFROM voice_conversion_models as vc\nWHERE vc.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", + "name": "model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -32,5 +32,5 @@ false ] }, - "hash": "81151fbc8a93723bfd6e06ca788c1d93ee391afde2ec3cf1a4a721f1cf1c9f2d" + "hash": "734e37c19df6c71b7c31bb28646e6a2512dd0bb927025b809027105707efd32a" } diff --git a/.sqlx/query-a32030db3502c091d443a0be522829e54eeda581faeb81639aa1b4b1fc19cdf8.json b/.sqlx/query-75991874b6768df665f2d331ce51c2322127e695c9dce7b94452bf5d32258af1.json similarity index 76% rename from .sqlx/query-a32030db3502c091d443a0be522829e54eeda581faeb81639aa1b4b1fc19cdf8.json rename to .sqlx/query-75991874b6768df665f2d331ce51c2322127e695c9dce7b94452bf5d32258af1.json index 7d985f4269..ead36fa918 100644 --- a/.sqlx/query-a32030db3502c091d443a0be522829e54eeda581faeb81639aa1b4b1fc19cdf8.json +++ b/.sqlx/query-75991874b6768df665f2d331ce51c2322127e695c9dce7b94452bf5d32258af1.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n vc.model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`,\n vc.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vc.title,\n vc.ietf_language_tag,\n vc.ietf_primary_language_subtag,\n vc.is_front_page_featured,\n vc.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n vc.created_at,\n vc.updated_at\nFROM voice_conversion_models as vc\nJOIN users\n ON users.token = vc.creator_user_token\nWHERE\n users.username = ?\n AND vc.user_deleted_at IS NULL\n AND vc.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n vc.model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`,\n vc.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vc.title,\n vc.ietf_language_tag,\n vc.ietf_primary_language_subtag,\n vc.is_front_page_featured,\n vc.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n vc.created_at,\n vc.updated_at\nFROM voice_conversion_models as vc\nJOIN users\n ON users.token = vc.creator_user_token\nWHERE\n users.username = ?\n AND vc.user_deleted_at IS NULL\n AND vc.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", + "name": "model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -105,7 +105,7 @@ }, { "ordinal": 10, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -153,5 +153,5 @@ false ] }, - "hash": "a32030db3502c091d443a0be522829e54eeda581faeb81639aa1b4b1fc19cdf8" + "hash": "75991874b6768df665f2d331ce51c2322127e695c9dce7b94452bf5d32258af1" } diff --git a/.sqlx/query-ac8e3bc9f4e0722ec2f805dbb52b8e43ec8f7a1aa923b9f8f5f6c0770a315ee6.json b/.sqlx/query-7c864df2ea10d9569df58288868235087680a57a56fb10c4d45c735b8061ff36.json similarity index 75% rename from .sqlx/query-ac8e3bc9f4e0722ec2f805dbb52b8e43ec8f7a1aa923b9f8f5f6c0770a315ee6.json rename to .sqlx/query-7c864df2ea10d9569df58288868235087680a57a56fb10c4d45c735b8061ff36.json index bda7801675..d67d0f0b11 100644 --- a/.sqlx/query-ac8e3bc9f4e0722ec2f805dbb52b8e43ec8f7a1aa923b9f8f5f6c0770a315ee6.json +++ b/.sqlx/query-7c864df2ea10d9569df58288868235087680a57a56fb10c4d45c735b8061ff36.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n token as `token: tokens::tokens::wallets::WalletToken`,\n wallet_namespace as `namespace: enums::common::payments_namespace::PaymentsNamespace`,\n banked_credits,\n monthly_credits\n FROM wallets\n WHERE owner_user_token = ?\n AND wallet_namespace = ?\n ORDER BY id ASC\n LIMIT 1\n ", + "query": "\n SELECT\n token as `token: tokens::tokens::wallets::WalletToken`,\n wallet_namespace as `namespace: enums_db::common::payments_namespace::PaymentsNamespace`,\n banked_credits,\n monthly_credits\n FROM wallets\n WHERE owner_user_token = ?\n AND wallet_namespace = ?\n ORDER BY id ASC\n LIMIT 1\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "namespace: enums::common::payments_namespace::PaymentsNamespace", + "name": "namespace: enums_db::common::payments_namespace::PaymentsNamespace", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -54,5 +54,5 @@ false ] }, - "hash": "ac8e3bc9f4e0722ec2f805dbb52b8e43ec8f7a1aa923b9f8f5f6c0770a315ee6" + "hash": "7c864df2ea10d9569df58288868235087680a57a56fb10c4d45c735b8061ff36" } diff --git a/.sqlx/query-a44c637e84152864a00f0ba58838c2f3888e3061fc8b44291541840fdb706e44.json b/.sqlx/query-86727fc74483ed1ade025dc8b2a3c33d78c4c0d1c42886dd7e0d5e882e6ea4b2.json similarity index 85% rename from .sqlx/query-a44c637e84152864a00f0ba58838c2f3888e3061fc8b44291541840fdb706e44.json rename to .sqlx/query-86727fc74483ed1ade025dc8b2a3c33d78c4c0d1c42886dd7e0d5e882e6ea4b2.json index fc12836f47..4a325c9244 100644 --- a/.sqlx/query-a44c637e84152864a00f0ba58838c2f3888e3061fc8b44291541840fdb706e44.json +++ b/.sqlx/query-86727fc74483ed1ade025dc8b2a3c33d78c4c0d1c42886dd7e0d5e882e6ea4b2.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n id,\n token as `token: tokens::tokens::tts_models::TtsModelToken`,\n\n tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,\n\n text_pipeline_type,\n has_self_contained_vocoder,\n has_self_contained_duration_model,\n has_self_contained_pitch_model,\n text_preprocessing_algorithm,\n\n use_default_mel_multiply_factor,\n maybe_custom_mel_multiply_factor,\n maybe_default_pretrained_vocoder,\n maybe_custom_vocoder_token as `maybe_custom_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken`,\n\n ietf_language_tag,\n ietf_primary_language_subtag,\n\n title,\n description_markdown,\n description_rendered_html,\n\n voice_name,\n actor_name,\n characteristic,\n version_string,\n\n is_front_page_featured,\n is_twitch_featured,\n\n maybe_suggested_unique_bot_command,\n\n original_download_url,\n original_filename,\n file_size_bytes,\n\n creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n\n creator_ip_address_creation,\n creator_ip_address_last_update,\n\n creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n private_bucket_hash,\n private_bucket_object_name,\n\n private_bucket_object_is_archive,\n\n user_ratings_total_count,\n user_ratings_positive_count,\n user_ratings_negative_count,\n\n is_public_listing_approved,\n is_locked_from_user_modification,\n is_locked_from_use,\n\n maybe_mod_comments,\n maybe_mod_user_token as `maybe_mod_user_token: tokens::tokens::users::UserToken`,\n\n maybe_migration_new_model_weights_token as `maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n\n version,\n\n created_at,\n updated_at,\n\n user_deleted_at,\n mod_deleted_at\n\nFROM tts_models\nWHERE\n id > ?\nORDER BY id ASC\nLIMIT ?\n ", + "query": "\nSELECT\n id,\n token as `token: tokens::tokens::tts_models::TtsModelToken`,\n\n tts_model_type as `tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType`,\n\n text_pipeline_type,\n has_self_contained_vocoder,\n has_self_contained_duration_model,\n has_self_contained_pitch_model,\n text_preprocessing_algorithm,\n\n use_default_mel_multiply_factor,\n maybe_custom_mel_multiply_factor,\n maybe_default_pretrained_vocoder,\n maybe_custom_vocoder_token as `maybe_custom_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken`,\n\n ietf_language_tag,\n ietf_primary_language_subtag,\n\n title,\n description_markdown,\n description_rendered_html,\n\n voice_name,\n actor_name,\n characteristic,\n version_string,\n\n is_front_page_featured,\n is_twitch_featured,\n\n maybe_suggested_unique_bot_command,\n\n original_download_url,\n original_filename,\n file_size_bytes,\n\n creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n\n creator_ip_address_creation,\n creator_ip_address_last_update,\n\n creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n private_bucket_hash,\n private_bucket_object_name,\n\n private_bucket_object_is_archive,\n\n user_ratings_total_count,\n user_ratings_positive_count,\n user_ratings_negative_count,\n\n is_public_listing_approved,\n is_locked_from_user_modification,\n is_locked_from_use,\n\n maybe_mod_comments,\n maybe_mod_user_token as `maybe_mod_user_token: tokens::tokens::users::UserToken`,\n\n maybe_migration_new_model_weights_token as `maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n\n version,\n\n created_at,\n updated_at,\n\n user_deleted_at,\n mod_deleted_at\n\nFROM tts_models\nWHERE\n id > ?\nORDER BY id ASC\nLIMIT ?\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType", + "name": "tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -305,7 +305,7 @@ }, { "ordinal": 30, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -538,5 +538,5 @@ true ] }, - "hash": "a44c637e84152864a00f0ba58838c2f3888e3061fc8b44291541840fdb706e44" + "hash": "86727fc74483ed1ade025dc8b2a3c33d78c4c0d1c42886dd7e0d5e882e6ea4b2" } diff --git a/.sqlx/query-fbe482c8987231c3b5d75f2e792d0fdd033de8a7eb821428fa034752c73edfb7.json b/.sqlx/query-8bcdc3f2360fb6b81b2e2c0462eea11f1b58b14d7a182d778d75225768d7c889.json similarity index 71% rename from .sqlx/query-fbe482c8987231c3b5d75f2e792d0fdd033de8a7eb821428fa034752c73edfb7.json rename to .sqlx/query-8bcdc3f2360fb6b81b2e2c0462eea11f1b58b14d7a182d778d75225768d7c889.json index 92581b4621..b9b2f755ac 100644 --- a/.sqlx/query-fbe482c8987231c3b5d75f2e792d0fdd033de8a7eb821428fa034752c73edfb7.json +++ b/.sqlx/query-8bcdc3f2360fb6b81b2e2c0462eea11f1b58b14d7a182d778d75225768d7c889.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n \n jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n \n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n\n jobs.created_at,\n jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n ", + "query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n jobs.status as `status: enums_db::common::job_status_plus::JobStatusPlus`,\n \n jobs.maybe_external_third_party as `external_third_party: enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n \n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n\n jobs.created_at,\n jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "status: enums::common::job_status_plus::JobStatusPlus", + "name": "status: enums_db::common::job_status_plus::JobStatusPlus", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty", + "name": "external_third_party: enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty", "type_info": { "type": "VarString", "flags": "MULTIPLE_KEY | BINARY", @@ -120,5 +120,5 @@ false ] }, - "hash": "fbe482c8987231c3b5d75f2e792d0fdd033de8a7eb821428fa034752c73edfb7" + "hash": "8bcdc3f2360fb6b81b2e2c0462eea11f1b58b14d7a182d778d75225768d7c889" } diff --git a/.sqlx/query-ffa85bac1e92386a908dfa656b6672ccc2b8ba417afcc489e4670a2287992b02.json b/.sqlx/query-8c8901926b94e1f913532d73126c1227b5294ef24dfd31dbcb7a1b8313d94b47.json similarity index 83% rename from .sqlx/query-ffa85bac1e92386a908dfa656b6672ccc2b8ba417afcc489e4670a2287992b02.json rename to .sqlx/query-8c8901926b94e1f913532d73126c1227b5294ef24dfd31dbcb7a1b8313d94b47.json index c5dfe93f7d..0cea6c4d71 100644 --- a/.sqlx/query-ffa85bac1e92386a908dfa656b6672ccc2b8ba417afcc489e4670a2287992b02.json +++ b/.sqlx/query-8c8901926b94e1f913532d73126c1227b5294ef24dfd31dbcb7a1b8313d94b47.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n zd.token as `token: tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken`,\n zd.title,\n zd.ietf_language_tag,\n zd.ietf_primary_language_subtag,\n zd.maybe_creator_user_token,\n zd.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n zd.created_at,\n zd.updated_at\n FROM zs_voice_datasets as zd\n WHERE\n zd.token = ?\n AND zd.user_deleted_at IS NULL\n AND zd.mod_deleted_at IS NULL\n ", + "query": "\n SELECT\n zd.token as `token: tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken`,\n zd.title,\n zd.ietf_language_tag,\n zd.ietf_primary_language_subtag,\n zd.maybe_creator_user_token,\n zd.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n zd.created_at,\n zd.updated_at\n FROM zs_voice_datasets as zd\n WHERE\n zd.token = ?\n AND zd.user_deleted_at IS NULL\n AND zd.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -55,7 +55,7 @@ }, { "ordinal": 5, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -98,5 +98,5 @@ false ] }, - "hash": "ffa85bac1e92386a908dfa656b6672ccc2b8ba417afcc489e4670a2287992b02" + "hash": "8c8901926b94e1f913532d73126c1227b5294ef24dfd31dbcb7a1b8313d94b47" } diff --git a/.sqlx/query-219165c1412716d2df3b791a81757180232c5f266384ad7e3e68ded4aa836d47.json b/.sqlx/query-8f6c337b72acf22631db621f0bfd7050285dc15e548af7af75e5993c205ae6d7.json similarity index 82% rename from .sqlx/query-219165c1412716d2df3b791a81757180232c5f266384ad7e3e68ded4aa836d47.json rename to .sqlx/query-8f6c337b72acf22631db621f0bfd7050285dc15e548af7af75e5993c205ae6d7.json index d3e6cf242e..22585d0fcc 100644 --- a/.sqlx/query-219165c1412716d2df3b791a81757180232c5f266384ad7e3e68ded4aa836d47.json +++ b/.sqlx/query-8f6c337b72acf22631db621f0bfd7050285dc15e548af7af75e5993c205ae6d7.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`,\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vocoder.title,\n vocoder.is_staff_recommended,\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n vocoder.created_at,\n vocoder.updated_at,\n vocoder.user_deleted_at,\n vocoder.mod_deleted_at\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\nWHERE\n users.username = ?\n ", + "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`,\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vocoder.title,\n vocoder.is_staff_recommended,\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n vocoder.created_at,\n vocoder.updated_at,\n vocoder.user_deleted_at,\n vocoder.mod_deleted_at\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\nWHERE\n users.username = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "vocoder_type: enums::common::vocoder_type::VocoderType", + "name": "vocoder_type: enums_db::common::vocoder_type::VocoderType", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -175,5 +175,5 @@ true ] }, - "hash": "219165c1412716d2df3b791a81757180232c5f266384ad7e3e68ded4aa836d47" + "hash": "8f6c337b72acf22631db621f0bfd7050285dc15e548af7af75e5993c205ae6d7" } diff --git a/.sqlx/query-0cad9a0df1167ae1dfb7847b5ab8a09a7b1e1f7bf0d7a06beddab1098cb285f6.json b/.sqlx/query-91e35cbe3be5c1c46bc237a60839edbe0018282c07743c528ad4211cd04a094f.json similarity index 75% rename from .sqlx/query-0cad9a0df1167ae1dfb7847b5ab8a09a7b1e1f7bf0d7a06beddab1098cb285f6.json rename to .sqlx/query-91e35cbe3be5c1c46bc237a60839edbe0018282c07743c528ad4211cd04a094f.json index f52725f3d9..89b7fca6d9 100644 --- a/.sqlx/query-0cad9a0df1167ae1dfb7847b5ab8a09a7b1e1f7bf0d7a06beddab1098cb285f6.json +++ b/.sqlx/query-91e35cbe3be5c1c46bc237a60839edbe0018282c07743c528ad4211cd04a094f.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n zds.token as `token: tokens::tokens::zs_voice_dataset_samples::ZsVoiceDatasetSampleToken`,\n zds.media_file_token as `media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n zds.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n zds.created_at,\n zds.updated_at\n FROM zs_voice_dataset_samples as zds\n JOIN media_files as m\n ON zds.media_file_token = m.token\n WHERE zds.dataset_token = ?\n AND zds.user_deleted_at IS NULL\n AND zds.mod_deleted_at IS NULL\n ", + "query": "\n SELECT\n zds.token as `token: tokens::tokens::zs_voice_dataset_samples::ZsVoiceDatasetSampleToken`,\n zds.media_file_token as `media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.media_type as `media_type: enums_db::by_table::media_files::media_file_type::MediaFileType`,\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n zds.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n zds.created_at,\n zds.updated_at\n FROM zs_voice_dataset_samples as zds\n JOIN media_files as m\n ON zds.media_file_token = m.token\n WHERE zds.dataset_token = ?\n AND zds.user_deleted_at IS NULL\n AND zds.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType", + "name": "media_type: enums_db::by_table::media_files::media_file_type::MediaFileType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -109,5 +109,5 @@ false ] }, - "hash": "0cad9a0df1167ae1dfb7847b5ab8a09a7b1e1f7bf0d7a06beddab1098cb285f6" + "hash": "91e35cbe3be5c1c46bc237a60839edbe0018282c07743c528ad4211cd04a094f" } diff --git a/.sqlx/query-450714d30eada676f800bc61750f7a4aa0c800c48af920dba73f31bae7862fee.json b/.sqlx/query-951e3cf8afdcf4c280a2c94790824674f0330082c9477bbfdde9d55bdda2f63b.json similarity index 79% rename from .sqlx/query-450714d30eada676f800bc61750f7a4aa0c800c48af920dba73f31bae7862fee.json rename to .sqlx/query-951e3cf8afdcf4c280a2c94790824674f0330082c9477bbfdde9d55bdda2f63b.json index 59294ae341..71b9b5365a 100644 --- a/.sqlx/query-450714d30eada676f800bc61750f7a4aa0c800c48af920dba73f31bae7862fee.json +++ b/.sqlx/query-951e3cf8afdcf4c280a2c94790824674f0330082c9477bbfdde9d55bdda2f63b.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`,\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vocoder.title,\n vocoder.is_staff_recommended,\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n vocoder.created_at,\n vocoder.updated_at,\n vocoder.user_deleted_at,\n vocoder.mod_deleted_at\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\nWHERE\n vocoder.is_mod_disabled_from_public_use IS FALSE\n AND vocoder.is_mod_disabled_from_author_use IS FALSE\n AND vocoder.user_deleted_at IS NULL\n AND vocoder.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`,\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vocoder.title,\n vocoder.is_staff_recommended,\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n vocoder.created_at,\n vocoder.updated_at,\n vocoder.user_deleted_at,\n vocoder.mod_deleted_at\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\nWHERE\n vocoder.is_mod_disabled_from_public_use IS FALSE\n AND vocoder.is_mod_disabled_from_author_use IS FALSE\n AND vocoder.user_deleted_at IS NULL\n AND vocoder.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "vocoder_type: enums::common::vocoder_type::VocoderType", + "name": "vocoder_type: enums_db::common::vocoder_type::VocoderType", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -175,5 +175,5 @@ true ] }, - "hash": "450714d30eada676f800bc61750f7a4aa0c800c48af920dba73f31bae7862fee" + "hash": "951e3cf8afdcf4c280a2c94790824674f0330082c9477bbfdde9d55bdda2f63b" } diff --git a/.sqlx/query-35b09082ebb923c8c3191eaee8553b7c3badbd9152ee43999f7c8ff1a6410fe9.json b/.sqlx/query-99b6f277c93b10c9f0b5cd4a34eb8e9372a203da4e5ceb862bdfb9b94e87663f.json similarity index 80% rename from .sqlx/query-35b09082ebb923c8c3191eaee8553b7c3badbd9152ee43999f7c8ff1a6410fe9.json rename to .sqlx/query-99b6f277c93b10c9f0b5cd4a34eb8e9372a203da4e5ceb862bdfb9b94e87663f.json index dd8a48f04b..032b31885e 100644 --- a/.sqlx/query-35b09082ebb923c8c3191eaee8553b7c3badbd9152ee43999f7c8ff1a6410fe9.json +++ b/.sqlx/query-99b6f277c93b10c9f0b5cd4a34eb8e9372a203da4e5ceb862bdfb9b94e87663f.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n w.token as `token: tokens::tokens::wallets::WalletToken`,\n w.wallet_namespace as `wallet_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n w.owner_user_token as `owner_user_token: tokens::tokens::users::UserToken`,\n w.banked_credits as `banked_credits: u32`,\n w.monthly_credits as `monthly_credits: u32`,\n w.version,\n w.created_at as `created_at: DateTime`,\n w.updated_at as `updated_at: DateTime`\nFROM wallets as w\nWHERE w.token = ?\nLIMIT 1\n ", + "query": "\nSELECT\n w.token as `token: tokens::tokens::wallets::WalletToken`,\n w.wallet_namespace as `wallet_namespace: enums_db::common::payments_namespace::PaymentsNamespace`,\n w.owner_user_token as `owner_user_token: tokens::tokens::users::UserToken`,\n w.banked_credits as `banked_credits: u32`,\n w.monthly_credits as `monthly_credits: u32`,\n w.version,\n w.created_at as `created_at: DateTime`,\n w.updated_at as `updated_at: DateTime`\nFROM wallets as w\nWHERE w.token = ?\nLIMIT 1\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "wallet_namespace: enums::common::payments_namespace::PaymentsNamespace", + "name": "wallet_namespace: enums_db::common::payments_namespace::PaymentsNamespace", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -98,5 +98,5 @@ false ] }, - "hash": "35b09082ebb923c8c3191eaee8553b7c3badbd9152ee43999f7c8ff1a6410fe9" + "hash": "99b6f277c93b10c9f0b5cd4a34eb8e9372a203da4e5ceb862bdfb9b94e87663f" } diff --git a/.sqlx/query-a3cf13dd4272af3b8fbcddba1f1ea711e64f57fb114886d60d4ae2937c56841d.json b/.sqlx/query-9b098306416f4258808e069c00054b65859476b999c4b5debbf7104cb7723e4c.json similarity index 74% rename from .sqlx/query-a3cf13dd4272af3b8fbcddba1f1ea711e64f57fb114886d60d4ae2937c56841d.json rename to .sqlx/query-9b098306416f4258808e069c00054b65859476b999c4b5debbf7104cb7723e4c.json index cf5af525de..bf7f10f1c0 100644 --- a/.sqlx/query-a3cf13dd4272af3b8fbcddba1f1ea711e64f57fb114886d60d4ae2937c56841d.json +++ b/.sqlx/query-9b098306416f4258808e069c00054b65859476b999c4b5debbf7104cb7723e4c.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w_extension.ietf_language_tag as maybe_ietf_language_tag,\n w_extension.ietf_primary_language_subtag as maybe_ietf_primary_language_subtag,\n w_extension.maybe_default_pretrained_vocoder as `maybe_default_pretrained_vocoder: crate::column_types::vocoder_type::VocoderType`,\n w_extension.text_pipeline_type as maybe_text_pipeline_type,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n\n LEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = wt.token\n\n WHERE\n wt.token = ?\n AND wt.user_deleted_at IS NULL\n AND wt.mod_deleted_at IS NULL\n ", + "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w_extension.ietf_language_tag as maybe_ietf_language_tag,\n w_extension.ietf_primary_language_subtag as maybe_ietf_primary_language_subtag,\n w_extension.maybe_default_pretrained_vocoder as `maybe_default_pretrained_vocoder: crate::column_types::vocoder_type::VocoderType`,\n w_extension.text_pipeline_type as maybe_text_pipeline_type,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n\n LEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = wt.token\n\n WHERE\n wt.token = ?\n AND wt.user_deleted_at IS NULL\n AND wt.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -75,7 +75,7 @@ }, { "ordinal": 7, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -395,5 +395,5 @@ true ] }, - "hash": "a3cf13dd4272af3b8fbcddba1f1ea711e64f57fb114886d60d4ae2937c56841d" + "hash": "9b098306416f4258808e069c00054b65859476b999c4b5debbf7104cb7723e4c" } diff --git a/.sqlx/query-fa623775c448be494778f73466d45d368e9cb575cb11dcdfc5d3128962f0e60d.json b/.sqlx/query-9d0fbf8d459e00b7192f6aae88a43d83f62b2fe5919307fd2d8b2a6ba510a2bd.json similarity index 79% rename from .sqlx/query-fa623775c448be494778f73466d45d368e9cb575cb11dcdfc5d3128962f0e60d.json rename to .sqlx/query-9d0fbf8d459e00b7192f6aae88a43d83f62b2fe5919307fd2d8b2a6ba510a2bd.json index 7aedf8d3ed..77b0983334 100644 --- a/.sqlx/query-fa623775c448be494778f73466d45d368e9cb575cb11dcdfc5d3128962f0e60d.json +++ b/.sqlx/query-9d0fbf8d459e00b7192f6aae88a43d83f62b2fe5919307fd2d8b2a6ba510a2bd.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n tts.token as `model_token: tokens::tokens::tts_models::TtsModelToken`,\n tts.tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,\n tts.text_pipeline_type,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.maybe_default_pretrained_vocoder,\n\n tts.maybe_custom_vocoder_token,\n vocoder.vocoder_type as `maybe_custom_vocoder_type: enums::common::vocoder_type::VocoderType`,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder.private_bucket_hash as maybe_custom_vocoder_private_bucket_hash,\n\n tts.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n tts.title,\n tts.private_bucket_hash,\n tts.created_at,\n tts.updated_at,\n tts.user_deleted_at,\n tts.mod_deleted_at\n\nFROM tts_models as tts\n\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\n\nWHERE tts.token = ?\n ", + "query": "\nSELECT\n tts.token as `model_token: tokens::tokens::tts_models::TtsModelToken`,\n tts.tts_model_type as `tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType`,\n tts.text_pipeline_type,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.maybe_default_pretrained_vocoder,\n\n tts.maybe_custom_vocoder_token,\n vocoder.vocoder_type as `maybe_custom_vocoder_type: enums_db::common::vocoder_type::VocoderType`,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder.private_bucket_hash as maybe_custom_vocoder_private_bucket_hash,\n\n tts.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n tts.title,\n tts.private_bucket_hash,\n tts.created_at,\n tts.updated_at,\n tts.user_deleted_at,\n tts.mod_deleted_at\n\nFROM tts_models as tts\n\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\n\nWHERE tts.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType", + "name": "tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -75,7 +75,7 @@ }, { "ordinal": 7, - "name": "maybe_custom_vocoder_type: enums::common::vocoder_type::VocoderType", + "name": "maybe_custom_vocoder_type: enums_db::common::vocoder_type::VocoderType", "type_info": { "type": "VarString", "flags": "BINARY | NO_DEFAULT_VALUE", @@ -219,5 +219,5 @@ true ] }, - "hash": "fa623775c448be494778f73466d45d368e9cb575cb11dcdfc5d3128962f0e60d" + "hash": "9d0fbf8d459e00b7192f6aae88a43d83f62b2fe5919307fd2d8b2a6ba510a2bd" } diff --git a/.sqlx/query-f68d01ee1339c0a1ea8301fcc74359e981c20abebd7024844bea6e1b9486b458.json b/.sqlx/query-b26531db300d3dd40d2038001806449d832edd5856e70acfbf12a5d3484f4eb8.json similarity index 78% rename from .sqlx/query-f68d01ee1339c0a1ea8301fcc74359e981c20abebd7024844bea6e1b9486b458.json rename to .sqlx/query-b26531db300d3dd40d2038001806449d832edd5856e70acfbf12a5d3484f4eb8.json index 4dda8a339e..9b5213790d 100644 --- a/.sqlx/query-f68d01ee1339c0a1ea8301fcc74359e981c20abebd7024844bea6e1b9486b458.json +++ b/.sqlx/query-b26531db300d3dd40d2038001806449d832edd5856e70acfbf12a5d3484f4eb8.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n created_at,\n updated_at\n FROM model_weights\n WHERE\n updated_at > ?\n ", + "query": "\n SELECT\n token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n created_at,\n updated_at\n FROM model_weights\n WHERE\n updated_at > ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -54,5 +54,5 @@ false ] }, - "hash": "f68d01ee1339c0a1ea8301fcc74359e981c20abebd7024844bea6e1b9486b458" + "hash": "b26531db300d3dd40d2038001806449d832edd5856e70acfbf12a5d3484f4eb8" } diff --git a/.sqlx/query-d220a1ea63e301deed98e4b3029dfc531e28196ec02ed4cf076646582b81099c.json b/.sqlx/query-b859a486280799c2b5d89e0fa897f3f4ea13a4569337c8ae2cdf2b1441423fbf.json similarity index 83% rename from .sqlx/query-d220a1ea63e301deed98e4b3029dfc531e28196ec02ed4cf076646582b81099c.json rename to .sqlx/query-b859a486280799c2b5d89e0fa897f3f4ea13a4569337c8ae2cdf2b1441423fbf.json index 9e84de4de9..31a2ef9511 100644 --- a/.sqlx/query-d220a1ea63e301deed98e4b3029dfc531e28196ec02ed4cf076646582b81099c.json +++ b/.sqlx/query-b859a486280799c2b5d89e0fa897f3f4ea13a4569337c8ae2cdf2b1441423fbf.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums::common::vocoder_type::VocoderType`,\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vocoder.title,\n vocoder.is_staff_recommended,\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n vocoder.created_at,\n vocoder.updated_at,\n vocoder.user_deleted_at,\n vocoder.mod_deleted_at\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\n ", + "query": "\nSELECT\n vocoder.token as vocoder_token,\n vocoder.vocoder_type as `vocoder_type: enums_db::common::vocoder_type::VocoderType`,\n vocoder.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vocoder.title,\n vocoder.is_staff_recommended,\n vocoder.is_mod_disabled_from_public_use,\n vocoder.is_mod_disabled_from_author_use,\n vocoder.is_mod_author_editing_locked,\n vocoder.created_at,\n vocoder.updated_at,\n vocoder.user_deleted_at,\n vocoder.mod_deleted_at\nFROM vocoder_models as vocoder\nJOIN users\n ON users.token = vocoder.creator_user_token\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "vocoder_type: enums::common::vocoder_type::VocoderType", + "name": "vocoder_type: enums_db::common::vocoder_type::VocoderType", "type_info": { "type": "VarString", "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", @@ -175,5 +175,5 @@ true ] }, - "hash": "d220a1ea63e301deed98e4b3029dfc531e28196ec02ed4cf076646582b81099c" + "hash": "b859a486280799c2b5d89e0fa897f3f4ea13a4569337c8ae2cdf2b1441423fbf" } diff --git a/.sqlx/query-2be78dc9fada8cda24df59ee9911118aa6f40247b10c6a76e07cfa74fd7f1412.json b/.sqlx/query-b8de2634dd2aa4b33741cbb5ef6355bd70c8a7708adbc635653a9ffabca082dd.json similarity index 77% rename from .sqlx/query-2be78dc9fada8cda24df59ee9911118aa6f40247b10c6a76e07cfa74fd7f1412.json rename to .sqlx/query-b8de2634dd2aa4b33741cbb5ef6355bd70c8a7708adbc635653a9ffabca082dd.json index bfc5b4112a..8340d8d256 100644 --- a/.sqlx/query-2be78dc9fada8cda24df59ee9911118aa6f40247b10c6a76e07cfa74fd7f1412.json +++ b/.sqlx/query-b8de2634dd2aa4b33741cbb5ef6355bd70c8a7708adbc635653a9ffabca082dd.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n token as `token: tokens::tokens::wallets::WalletToken`,\n wallet_namespace as `namespace: enums::common::payments_namespace::PaymentsNamespace`,\n owner_user_token as `owner_user_token: tokens::tokens::users::UserToken`,\n banked_credits,\n monthly_credits\nFROM wallets\nWHERE token = ?\nLIMIT 1\nFOR UPDATE\n ", + "query": "\nSELECT\n token as `token: tokens::tokens::wallets::WalletToken`,\n wallet_namespace as `namespace: enums_db::common::payments_namespace::PaymentsNamespace`,\n owner_user_token as `owner_user_token: tokens::tokens::users::UserToken`,\n banked_credits,\n monthly_credits\nFROM wallets\nWHERE token = ?\nLIMIT 1\nFOR UPDATE\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "namespace: enums::common::payments_namespace::PaymentsNamespace", + "name": "namespace: enums_db::common::payments_namespace::PaymentsNamespace", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -65,5 +65,5 @@ false ] }, - "hash": "2be78dc9fada8cda24df59ee9911118aa6f40247b10c6a76e07cfa74fd7f1412" + "hash": "b8de2634dd2aa4b33741cbb5ef6355bd70c8a7708adbc635653a9ffabca082dd" } diff --git a/.sqlx/query-46662ffe56827f98f43968681bfaab2eaa6a73f017a92c3289777f49c115f839.json b/.sqlx/query-bd0ed4704049c5e0b82a581abef99fca9f03c5b4b4d6f6c136807fd285acee73.json similarity index 75% rename from .sqlx/query-46662ffe56827f98f43968681bfaab2eaa6a73f017a92c3289777f49c115f839.json rename to .sqlx/query-bd0ed4704049c5e0b82a581abef99fca9f03c5b4b4d6f6c136807fd285acee73.json index 6121f355c2..7de3231ccc 100644 --- a/.sqlx/query-46662ffe56827f98f43968681bfaab2eaa6a73f017a92c3289777f49c115f839.json +++ b/.sqlx/query-bd0ed4704049c5e0b82a581abef99fca9f03c5b4b4d6f6c136807fd285acee73.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n mu.token as `token: tokens::tokens::media_uploads::MediaUploadToken`,\n mu.media_type as `media_type: enums::by_table::media_uploads::media_upload_type::MediaUploadType`,\n mu.maybe_original_filename,\n mu.original_file_size_bytes,\n mu.original_duration_millis,\n mu.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n mu.created_at,\n mu.updated_at\nFROM media_uploads as mu\nWHERE\n mu.uuid_idempotency_token = ?\n AND mu.user_deleted_at IS NULL\n AND mu.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n mu.token as `token: tokens::tokens::media_uploads::MediaUploadToken`,\n mu.media_type as `media_type: enums_db::by_table::media_uploads::media_upload_type::MediaUploadType`,\n mu.maybe_original_filename,\n mu.original_file_size_bytes,\n mu.original_duration_millis,\n mu.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n mu.created_at,\n mu.updated_at\nFROM media_uploads as mu\nWHERE\n mu.uuid_idempotency_token = ?\n AND mu.user_deleted_at IS NULL\n AND mu.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "media_type: enums::by_table::media_uploads::media_upload_type::MediaUploadType", + "name": "media_type: enums_db::by_table::media_uploads::media_upload_type::MediaUploadType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -55,7 +55,7 @@ }, { "ordinal": 5, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -98,5 +98,5 @@ false ] }, - "hash": "46662ffe56827f98f43968681bfaab2eaa6a73f017a92c3289777f49c115f839" + "hash": "bd0ed4704049c5e0b82a581abef99fca9f03c5b4b4d6f6c136807fd285acee73" } diff --git a/.sqlx/query-69b6e933ad400bc574204de301dde6748d2a1723f47c12e86afc05033a60d3a2.json b/.sqlx/query-bd998428a51f61375608c59069fcb3a0bbb8d740546a0efa0d3d12a9b2a056c3.json similarity index 79% rename from .sqlx/query-69b6e933ad400bc574204de301dde6748d2a1723f47c12e86afc05033a60d3a2.json rename to .sqlx/query-bd998428a51f61375608c59069fcb3a0bbb8d740546a0efa0d3d12a9b2a056c3.json index 02908ce24a..53f1646c65 100644 --- a/.sqlx/query-69b6e933ad400bc574204de301dde6748d2a1723f47c12e86afc05033a60d3a2.json +++ b/.sqlx/query-bd998428a51f61375608c59069fcb3a0bbb8d740546a0efa0d3d12a9b2a056c3.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n w.token as `token: tokens::tokens::wallets::WalletToken`,\n w.wallet_namespace as `wallet_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n w.banked_credits as `banked_credits: u32`,\n w.monthly_credits as `monthly_credits: u32`,\n w.version,\n w.created_at as `created_at: DateTime`,\n w.updated_at as `updated_at: DateTime`\nFROM wallets as w\nWHERE w.owner_user_token = ?\nORDER BY w.id DESC\n ", + "query": "\nSELECT\n w.token as `token: tokens::tokens::wallets::WalletToken`,\n w.wallet_namespace as `wallet_namespace: enums_db::common::payments_namespace::PaymentsNamespace`,\n w.banked_credits as `banked_credits: u32`,\n w.monthly_credits as `monthly_credits: u32`,\n w.version,\n w.created_at as `created_at: DateTime`,\n w.updated_at as `updated_at: DateTime`\nFROM wallets as w\nWHERE w.owner_user_token = ?\nORDER BY w.id DESC\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "wallet_namespace: enums::common::payments_namespace::PaymentsNamespace", + "name": "wallet_namespace: enums_db::common::payments_namespace::PaymentsNamespace", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -87,5 +87,5 @@ false ] }, - "hash": "69b6e933ad400bc574204de301dde6748d2a1723f47c12e86afc05033a60d3a2" + "hash": "bd998428a51f61375608c59069fcb3a0bbb8d740546a0efa0d3d12a9b2a056c3" } diff --git a/.sqlx/query-ad0dfcca42406d0fe109056f2238ff2a48e2b0f287f86dbaf36363e3a9624ba2.json b/.sqlx/query-c10672e9c9f5adb6d0ff7c60156e64689f3dd70e23a05ec10647c4dd0ddd75ed.json similarity index 66% rename from .sqlx/query-ad0dfcca42406d0fe109056f2238ff2a48e2b0f287f86dbaf36363e3a9624ba2.json rename to .sqlx/query-c10672e9c9f5adb6d0ff7c60156e64689f3dd70e23a05ec10647c4dd0ddd75ed.json index 9b2f2fb543..15888f63ea 100644 --- a/.sqlx/query-ad0dfcca42406d0fe109056f2238ff2a48e2b0f287f86dbaf36363e3a9624ba2.json +++ b/.sqlx/query-c10672e9c9f5adb6d0ff7c60156e64689f3dd70e23a05ec10647c4dd0ddd75ed.json @@ -1,11 +1,11 @@ { "db_name": "MySQL", - "query": "\nSELECT\n rating_value as `rating_value: enums::by_table::user_ratings::rating_value::UserRatingValue`,\n created_at,\n updated_at\n\nFROM user_ratings\n\nWHERE user_token = ?\nAND entity_type = ?\nAND entity_token = ?\nLIMIT 1\n ", + "query": "\nSELECT\n rating_value as `rating_value: enums_db::by_table::user_ratings::rating_value::UserRatingValue`,\n created_at,\n updated_at\n\nFROM user_ratings\n\nWHERE user_token = ?\nAND entity_type = ?\nAND entity_token = ?\nLIMIT 1\n ", "describe": { "columns": [ { "ordinal": 0, - "name": "rating_value: enums::by_table::user_ratings::rating_value::UserRatingValue", + "name": "rating_value: enums_db::by_table::user_ratings::rating_value::UserRatingValue", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -43,5 +43,5 @@ false ] }, - "hash": "ad0dfcca42406d0fe109056f2238ff2a48e2b0f287f86dbaf36363e3a9624ba2" + "hash": "c10672e9c9f5adb6d0ff7c60156e64689f3dd70e23a05ec10647c4dd0ddd75ed" } diff --git a/.sqlx/query-8bd7ddec0966c742754a278000902c7d5059237ef312c638817a465dcb1979de.json b/.sqlx/query-c67b783665c157cd702c824ff8604b373fd31898333e2747b3f9e660c667353e.json similarity index 75% rename from .sqlx/query-8bd7ddec0966c742754a278000902c7d5059237ef312c638817a465dcb1979de.json rename to .sqlx/query-c67b783665c157cd702c824ff8604b373fd31898333e2747b3f9e660c667353e.json index e249224743..f0e49a0355 100644 --- a/.sqlx/query-8bd7ddec0966c742754a278000902c7d5059237ef312c638817a465dcb1979de.json +++ b/.sqlx/query-c67b783665c157cd702c824ff8604b373fd31898333e2747b3f9e660c667353e.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w_extension.ietf_language_tag as maybe_ietf_language_tag,\n w_extension.ietf_primary_language_subtag as maybe_ietf_primary_language_subtag,\n w_extension.maybe_default_pretrained_vocoder as `maybe_default_pretrained_vocoder: crate::column_types::vocoder_type::VocoderType`,\n w_extension.text_pipeline_type as maybe_text_pipeline_type,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n\n LEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = wt.token\n\n WHERE\n wt.token = ?\n ", + "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w_extension.ietf_language_tag as maybe_ietf_language_tag,\n w_extension.ietf_primary_language_subtag as maybe_ietf_primary_language_subtag,\n w_extension.maybe_default_pretrained_vocoder as `maybe_default_pretrained_vocoder: crate::column_types::vocoder_type::VocoderType`,\n w_extension.text_pipeline_type as maybe_text_pipeline_type,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n\n LEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = wt.token\n\n WHERE\n wt.token = ?\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -115,7 +115,7 @@ }, { "ordinal": 11, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -395,5 +395,5 @@ true ] }, - "hash": "8bd7ddec0966c742754a278000902c7d5059237ef312c638817a465dcb1979de" + "hash": "c67b783665c157cd702c824ff8604b373fd31898333e2747b3f9e660c667353e" } diff --git a/.sqlx/query-366bc2a90afff0e0ff6b15d39c6815bf50f116ebdf99485aa909a647d52809dd.json b/.sqlx/query-c6ca8d9375f234bb4df75da1d703966b1d4524a7ebfc2f4b364e92b03021fa46.json similarity index 77% rename from .sqlx/query-366bc2a90afff0e0ff6b15d39c6815bf50f116ebdf99485aa909a647d52809dd.json rename to .sqlx/query-c6ca8d9375f234bb4df75da1d703966b1d4524a7ebfc2f4b364e92b03021fa46.json index a9f6a2d896..76485e77d2 100644 --- a/.sqlx/query-366bc2a90afff0e0ff6b15d39c6815bf50f116ebdf99485aa909a647d52809dd.json +++ b/.sqlx/query-c6ca8d9375f234bb4df75da1d703966b1d4524a7ebfc2f4b364e92b03021fa46.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n mu.token as `token: tokens::tokens::media_uploads::MediaUploadToken`,\n mu.media_type as `media_type: enums::by_table::media_uploads::media_upload_type::MediaUploadType`,\n mu.maybe_original_filename,\n mu.public_bucket_directory_hash,\n mu.original_file_size_bytes,\n mu.original_duration_millis,\n mu.maybe_extra_file_modification_info,\n mu.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n mu.created_at,\n mu.updated_at\nFROM media_uploads as mu\nWHERE\n mu.token = ?\n AND mu.user_deleted_at IS NULL\n AND mu.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n mu.token as `token: tokens::tokens::media_uploads::MediaUploadToken`,\n mu.media_type as `media_type: enums_db::by_table::media_uploads::media_upload_type::MediaUploadType`,\n mu.maybe_original_filename,\n mu.public_bucket_directory_hash,\n mu.original_file_size_bytes,\n mu.original_duration_millis,\n mu.maybe_extra_file_modification_info,\n mu.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n mu.created_at,\n mu.updated_at\nFROM media_uploads as mu\nWHERE\n mu.token = ?\n AND mu.user_deleted_at IS NULL\n AND mu.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "media_type: enums::by_table::media_uploads::media_upload_type::MediaUploadType", + "name": "media_type: enums_db::by_table::media_uploads::media_upload_type::MediaUploadType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -75,7 +75,7 @@ }, { "ordinal": 7, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -120,5 +120,5 @@ false ] }, - "hash": "366bc2a90afff0e0ff6b15d39c6815bf50f116ebdf99485aa909a647d52809dd" + "hash": "c6ca8d9375f234bb4df75da1d703966b1d4524a7ebfc2f4b364e92b03021fa46" } diff --git a/.sqlx/query-d56a26a7300495fac9741e77e390f16402e2273dbab9a15d7c17eb1f0da7a1b1.json b/.sqlx/query-ccef29747718614db793f4d97e4069d516e7bdf47eca81b13da22754374ab267.json similarity index 81% rename from .sqlx/query-d56a26a7300495fac9741e77e390f16402e2273dbab9a15d7c17eb1f0da7a1b1.json rename to .sqlx/query-ccef29747718614db793f4d97e4069d516e7bdf47eca81b13da22754374ab267.json index 4337a59014..238b0cb5c1 100644 --- a/.sqlx/query-d56a26a7300495fac9741e77e390f16402e2273dbab9a15d7c17eb1f0da7a1b1.json +++ b/.sqlx/query-ccef29747718614db793f4d97e4069d516e7bdf47eca81b13da22754374ab267.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n jobs.maybe_external_third_party_id as `operation_id`,\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n AND jobs.status NOT IN ('complete_success', 'complete_failure')\n AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n ", + "query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n jobs.maybe_external_third_party_id as `operation_id`,\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n jobs.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n AND jobs.status NOT IN ('complete_success', 'complete_failure')\n AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n ", "describe": { "columns": [ { @@ -55,7 +55,7 @@ }, { "ordinal": 5, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -98,5 +98,5 @@ true ] }, - "hash": "d56a26a7300495fac9741e77e390f16402e2273dbab9a15d7c17eb1f0da7a1b1" + "hash": "ccef29747718614db793f4d97e4069d516e7bdf47eca81b13da22754374ab267" } diff --git a/.sqlx/query-98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb.json b/.sqlx/query-cdff8dd5b25c56b94884360dea2a002b5b8b2f88dee08185bc836dd2506c49df.json similarity index 74% rename from .sqlx/query-98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb.json rename to .sqlx/query-cdff8dd5b25c56b94884360dea2a002b5b8b2f88dee08185bc836dd2506c49df.json index e9fa1c552e..6393baf960 100644 --- a/.sqlx/query-98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb.json +++ b/.sqlx/query-cdff8dd5b25c56b94884360dea2a002b5b8b2f88dee08185bc836dd2506c49df.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`\nFROM model_weights as w\n ", + "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`\nFROM model_weights as w\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -32,5 +32,5 @@ false ] }, - "hash": "98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb" + "hash": "cdff8dd5b25c56b94884360dea2a002b5b8b2f88dee08185bc836dd2506c49df" } diff --git a/.sqlx/query-8deae5674403372e52eeaf29cb23fe92e562832530eab1e5c7684a10e35c5f36.json b/.sqlx/query-ced0f360e1e5333837d46d32129013672ebd7b8a4767531bbc8d3e207baa83dd.json similarity index 77% rename from .sqlx/query-8deae5674403372e52eeaf29cb23fe92e562832530eab1e5c7684a10e35c5f36.json rename to .sqlx/query-ced0f360e1e5333837d46d32129013672ebd7b8a4767531bbc8d3e207baa83dd.json index ba06e2e53b..1d6f501a59 100644 --- a/.sqlx/query-8deae5674403372e52eeaf29cb23fe92e562832530eab1e5c7684a10e35c5f36.json +++ b/.sqlx/query-ced0f360e1e5333837d46d32129013672ebd7b8a4767531bbc8d3e207baa83dd.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n m.file_size_bytes,\n m.maybe_duration_millis,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension\n\nFROM media_files AS m\nWHERE\n m.token = ?\n ", + "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_type as `media_type: enums_db::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n m.file_size_bytes,\n m.maybe_duration_millis,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension\n\nFROM media_files AS m\nWHERE\n m.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType", + "name": "media_type: enums_db::by_table::media_files::media_file_type::MediaFileType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -109,5 +109,5 @@ true ] }, - "hash": "8deae5674403372e52eeaf29cb23fe92e562832530eab1e5c7684a10e35c5f36" + "hash": "ced0f360e1e5333837d46d32129013672ebd7b8a4767531bbc8d3e207baa83dd" } diff --git a/.sqlx/query-d0f9d2cf4176c3f7f8fbff66eb6ff9415d989afc2b5944629a7bcea4b5a822f3.json b/.sqlx/query-d45d857eee353b5f3c35f1f6dda264d381cb46e8a15320f885981db58cf4b005.json similarity index 73% rename from .sqlx/query-d0f9d2cf4176c3f7f8fbff66eb6ff9415d989afc2b5944629a7bcea4b5a822f3.json rename to .sqlx/query-d45d857eee353b5f3c35f1f6dda264d381cb46e8a15320f885981db58cf4b005.json index f6c7db5b3d..10fc0179a4 100644 --- a/.sqlx/query-d0f9d2cf4176c3f7f8fbff66eb6ff9415d989afc2b5944629a7bcea4b5a822f3.json +++ b/.sqlx/query-d45d857eee353b5f3c35f1f6dda264d381cb46e8a15320f885981db58cf4b005.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n w.id,\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n\n w.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n w.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n w.title,\n\n w.maybe_ietf_language_tag,\n w.maybe_ietf_primary_language_subtag,\n\n cover_image.token as `maybe_cover_image_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n w.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w.cached_usage_count,\n\n extension_tts.ietf_language_tag as maybe_tts_ietf_language_tag,\n extension_tts.ietf_primary_language_subtag as maybe_tts_ietf_primary_language_subtag,\n\n extension_vc.ietf_language_tag as maybe_vc_ietf_language_tag,\n extension_vc.ietf_primary_language_subtag as maybe_vc_ietf_primary_language_subtag,\n\n w.created_at,\n w.updated_at,\n w.user_deleted_at,\n w.mod_deleted_at,\n\n NOW() as database_read_time\n\nFROM model_weights as w\n\nJOIN users\n ON users.token = w.creator_user_token\n\nLEFT OUTER JOIN model_weights_extension_tts_details as extension_tts\n ON extension_tts.model_weights_token = w.token\nLEFT OUTER JOIN model_weights_extension_voice_conversion_details as extension_vc\n ON extension_vc.model_weights_token = w.token\nLEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = w.token\nLEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = w.maybe_cover_image_media_file_token\nLEFT OUTER JOIN featured_items\n ON featured_items.entity_type = \"model_weight\"\n AND featured_items.entity_token = w.token\n AND featured_items.deleted_at IS NULL\n\nWHERE\n w.id > ?\nORDER BY id ASC\nLIMIT ?\n ", + "query": "\nSELECT\n w.id,\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n\n w.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n w.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n w.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n\n w.title,\n\n w.maybe_ietf_language_tag,\n w.maybe_ietf_primary_language_subtag,\n\n cover_image.token as `maybe_cover_image_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n w.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w.cached_usage_count,\n\n extension_tts.ietf_language_tag as maybe_tts_ietf_language_tag,\n extension_tts.ietf_primary_language_subtag as maybe_tts_ietf_primary_language_subtag,\n\n extension_vc.ietf_language_tag as maybe_vc_ietf_language_tag,\n extension_vc.ietf_primary_language_subtag as maybe_vc_ietf_primary_language_subtag,\n\n w.created_at,\n w.updated_at,\n w.user_deleted_at,\n w.mod_deleted_at,\n\n NOW() as database_read_time\n\nFROM model_weights as w\n\nJOIN users\n ON users.token = w.creator_user_token\n\nLEFT OUTER JOIN model_weights_extension_tts_details as extension_tts\n ON extension_tts.model_weights_token = w.token\nLEFT OUTER JOIN model_weights_extension_voice_conversion_details as extension_vc\n ON extension_vc.model_weights_token = w.token\nLEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = w.token\nLEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = w.maybe_cover_image_media_file_token\nLEFT OUTER JOIN featured_items\n ON featured_items.entity_type = \"model_weight\"\n AND featured_items.entity_token = w.token\n AND featured_items.deleted_at IS NULL\n\nWHERE\n w.id > ?\nORDER BY id ASC\nLIMIT ?\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -45,7 +45,7 @@ }, { "ordinal": 4, - "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -340,5 +340,5 @@ false ] }, - "hash": "d0f9d2cf4176c3f7f8fbff66eb6ff9415d989afc2b5944629a7bcea4b5a822f3" + "hash": "d45d857eee353b5f3c35f1f6dda264d381cb46e8a15320f885981db58cf4b005" } diff --git a/.sqlx/query-58625c07952f5c9cd9590a5af6953edab58a35a95814ba89ce740a7aebc37557.json b/.sqlx/query-d91d775fac7ca30c99abac34ba2596ecc25023be274d52465a0c837b2515ed1b.json similarity index 77% rename from .sqlx/query-58625c07952f5c9cd9590a5af6953edab58a35a95814ba89ce740a7aebc37557.json rename to .sqlx/query-d91d775fac7ca30c99abac34ba2596ecc25023be274d52465a0c837b2515ed1b.json index 4e9429385b..c06d64b43d 100644 --- a/.sqlx/query-58625c07952f5c9cd9590a5af6953edab58a35a95814ba89ce740a7aebc37557.json +++ b/.sqlx/query-d91d775fac7ca30c99abac34ba2596ecc25023be274d52465a0c837b2515ed1b.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n vc.model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`,\n vc.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vc.title,\n vc.ietf_language_tag,\n vc.ietf_primary_language_subtag,\n vc.is_front_page_featured,\n vc.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n vc.created_at,\n vc.updated_at\nFROM voice_conversion_models as vc\nJOIN users\n ON users.token = vc.creator_user_token\nWHERE\n vc.user_deleted_at IS NULL\n AND vc.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n vc.token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n vc.model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`,\n vc.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n vc.title,\n vc.ietf_language_tag,\n vc.ietf_primary_language_subtag,\n vc.is_front_page_featured,\n vc.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n vc.created_at,\n vc.updated_at\nFROM voice_conversion_models as vc\nJOIN users\n ON users.token = vc.creator_user_token\nWHERE\n vc.user_deleted_at IS NULL\n AND vc.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", + "name": "model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -105,7 +105,7 @@ }, { "ordinal": 10, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -153,5 +153,5 @@ false ] }, - "hash": "58625c07952f5c9cd9590a5af6953edab58a35a95814ba89ce740a7aebc37557" + "hash": "d91d775fac7ca30c99abac34ba2596ecc25023be274d52465a0c837b2515ed1b" } diff --git a/.sqlx/query-f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6.json b/.sqlx/query-d96a500d4d1ecf3fb8b75f6ffe60fa53d8e6528393b9c41855774edf1f2e6ca6.json similarity index 69% rename from .sqlx/query-f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6.json rename to .sqlx/query-d96a500d4d1ecf3fb8b75f6ffe60fa53d8e6528393b9c41855774edf1f2e6ca6.json index edb44c109f..f7fa46decb 100644 --- a/.sqlx/query-f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6.json +++ b/.sqlx/query-d96a500d4d1ecf3fb8b75f6ffe60fa53d8e6528393b9c41855774edf1f2e6ca6.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_engine_category as `maybe_engine_category: enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory`,\n m.maybe_animation_type as `maybe_animation_type: enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType`,\n\n m.maybe_media_subtype as `maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_style_transfer_source_media_file_token as `maybe_style_transfer_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.maybe_scene_source_media_file_token as `maybe_scene_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n m.is_user_upload,\n m.is_intermediate_system_file,\n\n model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n model_weights.title as maybe_model_weights_title,\n model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n model_weight_cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n model_weight_cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n model_weight_cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n model_weight_creator.username as maybe_model_weight_creator_username,\n model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n m.extra_file_modification_info,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN media_files as model_weight_cover_image\n ON model_weight_cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"media_file\"\n AND entity_stats.entity_token = m.token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nLEFT OUTER JOIN featured_items\n ON featured_items.entity_type = 'media_file'\n AND featured_items.entity_token = m.token\n AND featured_items.deleted_at IS NULL\nWHERE\n m.token = ?\n ", + "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums_db::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums_db::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_engine_category as `maybe_engine_category: enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory`,\n m.maybe_animation_type as `maybe_animation_type: enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType`,\n\n m.maybe_media_subtype as `maybe_media_subtype: enums_db::by_table::media_files::media_file_subtype::MediaFileSubtype`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_style_transfer_source_media_file_token as `maybe_style_transfer_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.maybe_scene_source_media_file_token as `maybe_scene_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n m.is_user_upload,\n m.is_intermediate_system_file,\n\n model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n model_weights.title as maybe_model_weights_title,\n model_weights.weights_type as `maybe_model_weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n model_weights.weights_category as `maybe_model_weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n\n model_weight_cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n model_weight_cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n model_weight_cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n model_weight_creator.username as maybe_model_weight_creator_username,\n model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n m.extra_file_modification_info,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN media_files as model_weight_cover_image\n ON model_weight_cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"media_file\"\n AND entity_stats.entity_token = m.token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nLEFT OUTER JOIN featured_items\n ON featured_items.entity_type = 'media_file'\n AND featured_items.entity_token = m.token\n AND featured_items.deleted_at IS NULL\nWHERE\n m.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "media_class: enums::by_table::media_files::media_file_class::MediaFileClass", + "name": "media_class: enums_db::by_table::media_files::media_file_class::MediaFileClass", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY", @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType", + "name": "media_type: enums_db::by_table::media_files::media_file_type::MediaFileType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "maybe_engine_category: enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory", + "name": "maybe_engine_category: enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory", "type_info": { "type": "VarString", "flags": "MULTIPLE_KEY | BINARY", @@ -45,7 +45,7 @@ }, { "ordinal": 4, - "name": "maybe_animation_type: enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType", + "name": "maybe_animation_type: enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType", "type_info": { "type": "VarString", "flags": "BINARY", @@ -55,7 +55,7 @@ }, { "ordinal": 5, - "name": "maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype", + "name": "maybe_media_subtype: enums_db::by_table::media_files::media_file_subtype::MediaFileSubtype", "type_info": { "type": "VarString", "flags": "BINARY", @@ -245,7 +245,7 @@ }, { "ordinal": 24, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -295,7 +295,7 @@ }, { "ordinal": 29, - "name": "maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "maybe_model_weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -305,7 +305,7 @@ }, { "ordinal": 30, - "name": "maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "maybe_model_weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -538,5 +538,5 @@ false ] }, - "hash": "f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6" + "hash": "d96a500d4d1ecf3fb8b75f6ffe60fa53d8e6528393b9c41855774edf1f2e6ca6" } diff --git a/.sqlx/query-bde5d2fed3508fb2c289fe583f35b0d6e6bb38d15da0271aaed761cbc342dac3.json b/.sqlx/query-d9b2d521be0db5b5c007e332335ffa66ff4ca6bc0f7d414cd8926a41a8b7014e.json similarity index 74% rename from .sqlx/query-bde5d2fed3508fb2c289fe583f35b0d6e6bb38d15da0271aaed761cbc342dac3.json rename to .sqlx/query-d9b2d521be0db5b5c007e332335ffa66ff4ca6bc0f7d414cd8926a41a8b7014e.json index 738ad778ff..0ebcb24472 100644 --- a/.sqlx/query-bde5d2fed3508fb2c289fe583f35b0d6e6bb38d15da0271aaed761cbc342dac3.json +++ b/.sqlx/query-d9b2d521be0db5b5c007e332335ffa66ff4ca6bc0f7d414cd8926a41a8b7014e.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w_extension.ietf_language_tag as maybe_ietf_language_tag,\n w_extension.ietf_primary_language_subtag as maybe_ietf_primary_language_subtag,\n w_extension.maybe_default_pretrained_vocoder as `maybe_default_pretrained_vocoder: crate::column_types::vocoder_type::VocoderType`,\n w_extension.text_pipeline_type as maybe_text_pipeline_type,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n\n LEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = wt.token\n\n WHERE\n wt.maybe_migration_old_model_token = ?\n AND wt.user_deleted_at IS NULL\n AND wt.mod_deleted_at IS NULL\n ", + "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n w_extension.ietf_language_tag as maybe_ietf_language_tag,\n w_extension.ietf_primary_language_subtag as maybe_ietf_primary_language_subtag,\n w_extension.maybe_default_pretrained_vocoder as `maybe_default_pretrained_vocoder: crate::column_types::vocoder_type::VocoderType`,\n w_extension.text_pipeline_type as maybe_text_pipeline_type,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n\n LEFT OUTER JOIN model_weights_extension_tts_details as w_extension\n ON w_extension.model_weights_token = wt.token\n\n WHERE\n wt.maybe_migration_old_model_token = ?\n AND wt.user_deleted_at IS NULL\n AND wt.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -75,7 +75,7 @@ }, { "ordinal": 7, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -395,5 +395,5 @@ true ] }, - "hash": "bde5d2fed3508fb2c289fe583f35b0d6e6bb38d15da0271aaed761cbc342dac3" + "hash": "d9b2d521be0db5b5c007e332335ffa66ff4ca6bc0f7d414cd8926a41a8b7014e" } diff --git a/.sqlx/query-29fe7f8464257537840d7f095ec01f850d79f970109549d14978fc3bed7cef32.json b/.sqlx/query-e382bc973741615d33d8684905475a256fe551dfe153147d1d889c05929f6d08.json similarity index 75% rename from .sqlx/query-29fe7f8464257537840d7f095ec01f850d79f970109549d14978fc3bed7cef32.json rename to .sqlx/query-e382bc973741615d33d8684905475a256fe551dfe153147d1d889c05929f6d08.json index 463e2f6d96..26904b4995 100644 --- a/.sqlx/query-29fe7f8464257537840d7f095ec01f850d79f970109549d14978fc3bed7cef32.json +++ b/.sqlx/query-e382bc973741615d33d8684905475a256fe551dfe153147d1d889c05929f6d08.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n\n wt.maybe_ietf_language_tag,\n wt.maybe_ietf_primary_language_subtag,\n\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n wt.cached_usage_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n LEFT OUTER JOIN featured_items\n ON featured_items.entity_type = \"model_weight\"\n AND featured_items.entity_token = wt.token\n AND featured_items.deleted_at IS NULL\n WHERE\n wt.token = ?\n AND wt.user_deleted_at IS NULL\n AND wt.mod_deleted_at IS NULL\n ", + "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.title,\n wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n wt.maybe_description_markdown,\n wt.maybe_description_rendered_html,\n\n wt.maybe_ietf_language_tag,\n wt.maybe_ietf_primary_language_subtag,\n\n wt.creator_ip_address,\n wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash AS creator_gravatar_hash,\n\n wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n wt.original_download_url,\n wt.original_filename,\n wt.file_size_bytes,\n wt.file_checksum_sha2,\n wt.public_bucket_hash,\n wt.maybe_public_bucket_prefix,\n wt.maybe_public_bucket_extension,\n\n cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n wt.cached_usage_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n wt.version,\n wt.created_at,\n wt.updated_at,\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n JOIN users\n ON users.token = wt.creator_user_token\n LEFT OUTER JOIN media_files as cover_image\n ON cover_image.token = wt.maybe_cover_image_media_file_token\n LEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"model_weight\"\n AND entity_stats.entity_token = wt.token\n LEFT OUTER JOIN featured_items\n ON featured_items.entity_type = \"model_weight\"\n AND featured_items.entity_token = wt.token\n AND featured_items.deleted_at IS NULL\n WHERE\n wt.token = ?\n AND wt.user_deleted_at IS NULL\n AND wt.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -35,7 +35,7 @@ }, { "ordinal": 3, - "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -95,7 +95,7 @@ }, { "ordinal": 9, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -395,5 +395,5 @@ true ] }, - "hash": "29fe7f8464257537840d7f095ec01f850d79f970109549d14978fc3bed7cef32" + "hash": "e382bc973741615d33d8684905475a256fe551dfe153147d1d889c05929f6d08" } diff --git a/.sqlx/query-3390084f700ef2444691a02c691a59ccdd66bc8b096547e89c68b58b04dd44e4.json b/.sqlx/query-e3f5b62c77ccb985d9c4536c3d6b0b082ef6fa721b124f2846e0e1a1968f619a.json similarity index 69% rename from .sqlx/query-3390084f700ef2444691a02c691a59ccdd66bc8b096547e89c68b58b04dd44e4.json rename to .sqlx/query-e3f5b62c77ccb985d9c4536c3d6b0b082ef6fa721b124f2846e0e1a1968f619a.json index 6487817971..5ab8170d39 100644 --- a/.sqlx/query-3390084f700ef2444691a02c691a59ccdd66bc8b096547e89c68b58b04dd44e4.json +++ b/.sqlx/query-e3f5b62c77ccb985d9c4536c3d6b0b082ef6fa721b124f2846e0e1a1968f619a.json @@ -1,11 +1,11 @@ { "db_name": "MySQL", - "query": "\nSELECT\n user_subscriptions.subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n user_subscriptions.maybe_stripe_subscription_id,\n users.token as `user_token: tokens::tokens::users::UserToken`,\n users.email_address,\n users.username,\n users.display_name\nFROM user_subscriptions\nINNER JOIN users ON users.token = user_subscriptions.user_token\nWHERE\n user_subscriptions.maybe_stripe_customer_id = ?\n AND user_subscriptions.deleted_at IS NULL\n AND users.user_deleted_at IS NULL\n AND users.mod_deleted_at IS NULL\nORDER BY user_subscriptions.created_at DESC\n ", + "query": "\nSELECT\n user_subscriptions.subscription_namespace as `subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace`,\n user_subscriptions.maybe_stripe_subscription_id,\n users.token as `user_token: tokens::tokens::users::UserToken`,\n users.email_address,\n users.username,\n users.display_name\nFROM user_subscriptions\nINNER JOIN users ON users.token = user_subscriptions.user_token\nWHERE\n user_subscriptions.maybe_stripe_customer_id = ?\n AND user_subscriptions.deleted_at IS NULL\n AND users.user_deleted_at IS NULL\n AND users.mod_deleted_at IS NULL\nORDER BY user_subscriptions.created_at DESC\n ", "describe": { "columns": [ { "ordinal": 0, - "name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace", + "name": "subscription_namespace: enums_db::common::payments_namespace::PaymentsNamespace", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -76,5 +76,5 @@ false ] }, - "hash": "3390084f700ef2444691a02c691a59ccdd66bc8b096547e89c68b58b04dd44e4" + "hash": "e3f5b62c77ccb985d9c4536c3d6b0b082ef6fa721b124f2846e0e1a1968f619a" } diff --git a/.sqlx/query-b83f7487976aa3100a783daa503b80e5bc58453d90579fe700d8a18ab66dab54.json b/.sqlx/query-e627d2f757bcc48fe1b1894c41c3274d11b44ba05222e417f2880c2b46652a12.json similarity index 88% rename from .sqlx/query-b83f7487976aa3100a783daa503b80e5bc58453d90579fe700d8a18ab66dab54.json rename to .sqlx/query-e627d2f757bcc48fe1b1894c41c3274d11b44ba05222e417f2880c2b46652a12.json index 832cd4c027..75ceeaabf3 100644 --- a/.sqlx/query-b83f7487976aa3100a783daa503b80e5bc58453d90579fe700d8a18ab66dab54.json +++ b/.sqlx/query-e627d2f757bcc48fe1b1894c41c3274d11b44ba05222e417f2880c2b46652a12.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n zv.token as `token: tokens::tokens::zs_voices::ZsVoiceToken`,\n zv.title,\n zv.ietf_language_tag,\n zv.ietf_primary_language_subtag,\n users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_email_gravatar_hash,\n zv.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n zv.created_at,\n zv.updated_at\n FROM zs_voices as zv\n JOIN users\n ON users.token = zv.maybe_creator_user_token\n WHERE\n users.username = ?\n ", + "query": "\n SELECT\n zv.token as `token: tokens::tokens::zs_voices::ZsVoiceToken`,\n zv.title,\n zv.ietf_language_tag,\n zv.ietf_primary_language_subtag,\n users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_email_gravatar_hash,\n zv.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n zv.created_at,\n zv.updated_at\n FROM zs_voices as zv\n JOIN users\n ON users.token = zv.maybe_creator_user_token\n WHERE\n users.username = ?\n ", "describe": { "columns": [ { @@ -85,7 +85,7 @@ }, { "ordinal": 8, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -131,5 +131,5 @@ false ] }, - "hash": "b83f7487976aa3100a783daa503b80e5bc58453d90579fe700d8a18ab66dab54" + "hash": "e627d2f757bcc48fe1b1894c41c3274d11b44ba05222e417f2880c2b46652a12" } diff --git a/.sqlx/query-02136088e16742de2154cd9e84eeebbdb76045ad26aeb1c517a54c296bf31087.json b/.sqlx/query-e836c11eb2265c7476762cdb523160e2e79ba13e9884cd1fc200837550e8d352.json similarity index 81% rename from .sqlx/query-02136088e16742de2154cd9e84eeebbdb76045ad26aeb1c517a54c296bf31087.json rename to .sqlx/query-e836c11eb2265c7476762cdb523160e2e79ba13e9884cd1fc200837550e8d352.json index 047b14d7ff..d836b28cc5 100644 --- a/.sqlx/query-02136088e16742de2154cd9e84eeebbdb76045ad26aeb1c517a54c296bf31087.json +++ b/.sqlx/query-e836c11eb2265c7476762cdb523160e2e79ba13e9884cd1fc200837550e8d352.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n f.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n\n f.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n f.entity_token,\n\n f.user_token as `user_token: tokens::tokens::users::UserToken`,\n u.username,\n u.display_name as user_display_name,\n u.email_gravatar_hash as user_gravatar_hash,\n\n f.created_at,\n f.updated_at,\n f.deleted_at\n\nFROM\n user_bookmarks AS f\nJOIN users AS u\n ON f.user_token = u.token\nWHERE\n f.token = ?\n ", + "query": "\nSELECT\n f.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n\n f.entity_type as `entity_type: enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n f.entity_token,\n\n f.user_token as `user_token: tokens::tokens::users::UserToken`,\n u.username,\n u.display_name as user_display_name,\n u.email_gravatar_hash as user_gravatar_hash,\n\n f.created_at,\n f.updated_at,\n f.deleted_at\n\nFROM\n user_bookmarks AS f\nJOIN users AS u\n ON f.user_token = u.token\nWHERE\n f.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType", + "name": "entity_type: enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -120,5 +120,5 @@ true ] }, - "hash": "02136088e16742de2154cd9e84eeebbdb76045ad26aeb1c517a54c296bf31087" + "hash": "e836c11eb2265c7476762cdb523160e2e79ba13e9884cd1fc200837550e8d352" } diff --git a/.sqlx/query-1bcb79b19d2e894bdbda7d9f717a8f22d580cfbb8294f0702b9ffaf7f3602145.json b/.sqlx/query-ea3c8bdd7279ed4855031e93e35b6f6605e079901a898ca508ab3878aaee3071.json similarity index 86% rename from .sqlx/query-1bcb79b19d2e894bdbda7d9f717a8f22d580cfbb8294f0702b9ffaf7f3602145.json rename to .sqlx/query-ea3c8bdd7279ed4855031e93e35b6f6605e079901a898ca508ab3878aaee3071.json index 7e6feeec08..dc25e3b39d 100644 --- a/.sqlx/query-1bcb79b19d2e894bdbda7d9f717a8f22d580cfbb8294f0702b9ffaf7f3602145.json +++ b/.sqlx/query-ea3c8bdd7279ed4855031e93e35b6f6605e079901a898ca508ab3878aaee3071.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type,\n tts.text_pipeline_type,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.maybe_default_pretrained_vocoder,\n\n tts.maybe_custom_vocoder_token,\n vocoder.vocoder_type as `maybe_custom_vocoder_type: enums::common::vocoder_type::VocoderType`,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder.private_bucket_hash as maybe_custom_vocoder_private_bucket_hash,\n\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n tts.title,\n tts.private_bucket_hash,\n tts.created_at,\n tts.updated_at,\n tts.user_deleted_at,\n tts.mod_deleted_at\n\nFROM tts_models as tts\n\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\n\nWHERE tts.token = ?\n ", + "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type,\n tts.text_pipeline_type,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.maybe_default_pretrained_vocoder,\n\n tts.maybe_custom_vocoder_token,\n vocoder.vocoder_type as `maybe_custom_vocoder_type: enums_db::common::vocoder_type::VocoderType`,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder.private_bucket_hash as maybe_custom_vocoder_private_bucket_hash,\n\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n tts.title,\n tts.private_bucket_hash,\n tts.created_at,\n tts.updated_at,\n tts.user_deleted_at,\n tts.mod_deleted_at\n\nFROM tts_models as tts\n\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\n\nWHERE tts.token = ?\n ", "describe": { "columns": [ { @@ -75,7 +75,7 @@ }, { "ordinal": 7, - "name": "maybe_custom_vocoder_type: enums::common::vocoder_type::VocoderType", + "name": "maybe_custom_vocoder_type: enums_db::common::vocoder_type::VocoderType", "type_info": { "type": "VarString", "flags": "BINARY | NO_DEFAULT_VALUE", @@ -219,5 +219,5 @@ true ] }, - "hash": "1bcb79b19d2e894bdbda7d9f717a8f22d580cfbb8294f0702b9ffaf7f3602145" + "hash": "ea3c8bdd7279ed4855031e93e35b6f6605e079901a898ca508ab3878aaee3071" } diff --git a/.sqlx/query-8b75503d61af6b4f799f775249cdaecec0250efea77a69bb84e618e3ea972b09.json b/.sqlx/query-eb0e388a4e62f472da82ecc4d160a68db42ad250780212d2e35925dc734bdc8c.json similarity index 87% rename from .sqlx/query-8b75503d61af6b4f799f775249cdaecec0250efea77a69bb84e618e3ea972b09.json rename to .sqlx/query-eb0e388a4e62f472da82ecc4d160a68db42ad250780212d2e35925dc734bdc8c.json index 9cd0ae246b..c9aaafd6bc 100644 --- a/.sqlx/query-8b75503d61af6b4f799f775249cdaecec0250efea77a69bb84e618e3ea972b09.json +++ b/.sqlx/query-eb0e388a4e62f472da82ecc4d160a68db42ad250780212d2e35925dc734bdc8c.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n zv.token as `token: tokens::tokens::zs_voices::ZsVoiceToken`,\n zv.title,\n zv.ietf_language_tag,\n zv.ietf_primary_language_subtag,\n zv.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n zv.bucket_hash,\n zv.model_version,\n zv.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n zv.created_at,\n zv.updated_at\n FROM zs_voices as zv\n WHERE\n zv.token = ?\n AND zv.user_deleted_at IS NULL\n AND zv.mod_deleted_at IS NULL\n ", + "query": "\n SELECT\n zv.token as `token: tokens::tokens::zs_voices::ZsVoiceToken`,\n zv.title,\n zv.ietf_language_tag,\n zv.ietf_primary_language_subtag,\n zv.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n zv.bucket_hash,\n zv.model_version,\n zv.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n zv.created_at,\n zv.updated_at\n FROM zs_voices as zv\n WHERE\n zv.token = ?\n AND zv.user_deleted_at IS NULL\n AND zv.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -75,7 +75,7 @@ }, { "ordinal": 7, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -120,5 +120,5 @@ false ] }, - "hash": "8b75503d61af6b4f799f775249cdaecec0250efea77a69bb84e618e3ea972b09" + "hash": "eb0e388a4e62f472da82ecc4d160a68db42ad250780212d2e35925dc734bdc8c" } diff --git a/.sqlx/query-82ce02cf9e0bb85932772e5c90dba7fd5782e7b68d6b8061e32624a3ee7e31c1.json b/.sqlx/query-ed83023f1a62a8c0b97e9ccdfc1a07740d56d7452db7705bf5610b92c1a62f41.json similarity index 88% rename from .sqlx/query-82ce02cf9e0bb85932772e5c90dba7fd5782e7b68d6b8061e32624a3ee7e31c1.json rename to .sqlx/query-ed83023f1a62a8c0b97e9ccdfc1a07740d56d7452db7705bf5610b92c1a62f41.json index 7049f63343..7ab6c14c9d 100644 --- a/.sqlx/query-82ce02cf9e0bb85932772e5c90dba7fd5782e7b68d6b8061e32624a3ee7e31c1.json +++ b/.sqlx/query-ed83023f1a62a8c0b97e9ccdfc1a07740d56d7452db7705bf5610b92c1a62f41.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n zd.token as `token: tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken`,\n zd.title,\n zd.ietf_language_tag,\n zd.ietf_primary_language_subtag,\n users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_email_gravatar_hash,\n zd.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n zd.created_at,\n zd.updated_at\n FROM zs_voice_datasets as zd\n JOIN users\n ON users.token = zd.maybe_creator_user_token\n WHERE\n users.username = ?\n ", + "query": "\n SELECT\n zd.token as `token: tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken`,\n zd.title,\n zd.ietf_language_tag,\n zd.ietf_primary_language_subtag,\n users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_email_gravatar_hash,\n zd.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n zd.created_at,\n zd.updated_at\n FROM zs_voice_datasets as zd\n JOIN users\n ON users.token = zd.maybe_creator_user_token\n WHERE\n users.username = ?\n ", "describe": { "columns": [ { @@ -85,7 +85,7 @@ }, { "ordinal": 8, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -131,5 +131,5 @@ false ] }, - "hash": "82ce02cf9e0bb85932772e5c90dba7fd5782e7b68d6b8061e32624a3ee7e31c1" + "hash": "ed83023f1a62a8c0b97e9ccdfc1a07740d56d7452db7705bf5610b92c1a62f41" } diff --git a/.sqlx/query-be70e3bd4a946da7bd66a29a94e659b25f40a33ef5973a8ff34bfabe08db4051.json b/.sqlx/query-efec57631af71ccde28be07a40582efd0a249a658eb1f04ba17d001d2f5d5f41.json similarity index 69% rename from .sqlx/query-be70e3bd4a946da7bd66a29a94e659b25f40a33ef5973a8ff34bfabe08db4051.json rename to .sqlx/query-efec57631af71ccde28be07a40582efd0a249a658eb1f04ba17d001d2f5d5f41.json index 91289d3164..eb735577ba 100644 --- a/.sqlx/query-be70e3bd4a946da7bd66a29a94e659b25f40a33ef5973a8ff34bfabe08db4051.json +++ b/.sqlx/query-efec57631af71ccde28be07a40582efd0a249a658eb1f04ba17d001d2f5d5f41.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n WHERE\n wt.token = ?\n ", + "query": "\n SELECT\n wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n wt.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n wt.weights_category as `weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory`,\n\n wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n wt.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n wt.user_deleted_at,\n wt.mod_deleted_at\n\n FROM model_weights as wt\n WHERE\n wt.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", + "name": "weights_category: enums_db::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -45,7 +45,7 @@ }, { "ordinal": 4, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -87,5 +87,5 @@ true ] }, - "hash": "be70e3bd4a946da7bd66a29a94e659b25f40a33ef5973a8ff34bfabe08db4051" + "hash": "efec57631af71ccde28be07a40582efd0a249a658eb1f04ba17d001d2f5d5f41" } diff --git a/.sqlx/query-d2d05678aa1c4c3b2d95bbb2ed563c2fc8b587c0480354a42f11409d9671afbe.json b/.sqlx/query-f78fda5c12eb000a405e11e6ad4ef78405de1b2e1e8aca47620be2d67904bede.json similarity index 83% rename from .sqlx/query-d2d05678aa1c4c3b2d95bbb2ed563c2fc8b587c0480354a42f11409d9671afbe.json rename to .sqlx/query-f78fda5c12eb000a405e11e6ad4ef78405de1b2e1e8aca47620be2d67904bede.json index 3faed67856..6ba8e8ee90 100644 --- a/.sqlx/query-d2d05678aa1c4c3b2d95bbb2ed563c2fc8b587c0480354a42f11409d9671afbe.json +++ b/.sqlx/query-f78fda5c12eb000a405e11e6ad4ef78405de1b2e1e8aca47620be2d67904bede.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,\n tts.text_pipeline_type,\n tts.text_preprocessing_algorithm,\n tts.maybe_default_pretrained_vocoder,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n tts.title,\n tts.description_markdown,\n tts.description_rendered_html,\n\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n\n tts.maybe_suggested_unique_bot_command,\n\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n\n tts.creator_set_visibility,\n\n tts.is_locked_from_use,\n tts.is_locked_from_user_modification,\n\n tts.maybe_migration_new_model_weights_token,\n\n tts.maybe_custom_vocoder_token,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder_user.token as maybe_custom_vocoder_creator_user_token,\n vocoder_user.username as maybe_custom_vocoder_creator_username,\n vocoder_user.display_name as maybe_custom_vocoder_creator_display_name,\n vocoder_user.email_gravatar_hash as maybe_custom_vocoder_creator_gravatar_hash,\n\n tts.created_at,\n tts.updated_at,\n\n tts.creator_ip_address_creation,\n tts.creator_ip_address_last_update,\n tts.mod_deleted_at,\n tts.user_deleted_at\n\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\nLEFT OUTER JOIN users AS vocoder_user\n ON vocoder_user.token = vocoder.creator_user_token\n\nWHERE tts.token = ?\n ", + "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type as `tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType`,\n tts.text_pipeline_type,\n tts.text_preprocessing_algorithm,\n tts.maybe_default_pretrained_vocoder,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n tts.title,\n tts.description_markdown,\n tts.description_rendered_html,\n\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n\n tts.maybe_suggested_unique_bot_command,\n\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n\n tts.creator_set_visibility,\n\n tts.is_locked_from_use,\n tts.is_locked_from_user_modification,\n\n tts.maybe_migration_new_model_weights_token,\n\n tts.maybe_custom_vocoder_token,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder_user.token as maybe_custom_vocoder_creator_user_token,\n vocoder_user.username as maybe_custom_vocoder_creator_username,\n vocoder_user.display_name as maybe_custom_vocoder_creator_display_name,\n vocoder_user.email_gravatar_hash as maybe_custom_vocoder_creator_gravatar_hash,\n\n tts.created_at,\n tts.updated_at,\n\n tts.creator_ip_address_creation,\n tts.creator_ip_address_last_update,\n tts.mod_deleted_at,\n tts.user_deleted_at\n\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\nLEFT OUTER JOIN users AS vocoder_user\n ON vocoder_user.token = vocoder.creator_user_token\n\nWHERE tts.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType", + "name": "tts_model_type: enums_db::by_table::tts_models::tts_model_type::TtsModelType", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -439,5 +439,5 @@ true ] }, - "hash": "d2d05678aa1c4c3b2d95bbb2ed563c2fc8b587c0480354a42f11409d9671afbe" + "hash": "f78fda5c12eb000a405e11e6ad4ef78405de1b2e1e8aca47620be2d67904bede" } diff --git a/.sqlx/query-0757d81ba153b2ad2df25df3dd92b655ef08b95f5f83251bf3573f9be3a9f8d1.json b/.sqlx/query-f87ddc1a58613e0401e12f0acec608c766c27e5125a299f77dd25bdf0aa554c8.json similarity index 63% rename from .sqlx/query-0757d81ba153b2ad2df25df3dd92b655ef08b95f5f83251bf3573f9be3a9f8d1.json rename to .sqlx/query-f87ddc1a58613e0401e12f0acec608c766c27e5125a299f77dd25bdf0aa554c8.json index 24281bd30c..a736c11420 100644 --- a/.sqlx/query-0757d81ba153b2ad2df25df3dd92b655ef08b95f5f83251bf3573f9be3a9f8d1.json +++ b/.sqlx/query-f87ddc1a58613e0401e12f0acec608c766c27e5125a299f77dd25bdf0aa554c8.json @@ -1,11 +1,11 @@ { "db_name": "MySQL", - "query": "\nSELECT\n j.status as `job_status: enums::common::job_status_plus::JobStatusPlus`,\n j.failure_reason as job_failure_reason,\n wle.credits_delta,\n wle.maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n j.on_success_result_entity_token as `on_success_result_media_token: tokens::tokens::media_files::MediaFileToken`,\n j.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n wle.token as `wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n wle.entry_type as `wallet_ledger_entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`\nFROM generic_inference_jobs as j\nLEFT OUTER JOIN users as u\n ON j.maybe_creator_user_token = u.token\nLEFT OUTER JOIN wallet_ledger_entries as wle\n ON wle.maybe_entity_ref = j.token\nWHERE u.token = ?\nORDER BY j.id DESC\n ", + "query": "\nSELECT\n j.status as `job_status: enums_db::common::job_status_plus::JobStatusPlus`,\n j.failure_reason as job_failure_reason,\n wle.credits_delta,\n wle.maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n j.on_success_result_entity_token as `on_success_result_media_token: tokens::tokens::media_files::MediaFileToken`,\n j.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n wle.token as `wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n wle.entry_type as `wallet_ledger_entry_type: enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`\nFROM generic_inference_jobs as j\nLEFT OUTER JOIN users as u\n ON j.maybe_creator_user_token = u.token\nLEFT OUTER JOIN wallet_ledger_entries as wle\n ON wle.maybe_entity_ref = j.token\nWHERE u.token = ?\nORDER BY j.id DESC\n ", "describe": { "columns": [ { "ordinal": 0, - "name": "job_status: enums::common::job_status_plus::JobStatusPlus", + "name": "job_status: enums_db::common::job_status_plus::JobStatusPlus", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -75,7 +75,7 @@ }, { "ordinal": 7, - "name": "wallet_ledger_entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType", + "name": "wallet_ledger_entry_type: enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType", "type_info": { "type": "VarString", "flags": "BINARY | NO_DEFAULT_VALUE", @@ -98,5 +98,5 @@ true ] }, - "hash": "0757d81ba153b2ad2df25df3dd92b655ef08b95f5f83251bf3573f9be3a9f8d1" + "hash": "f87ddc1a58613e0401e12f0acec608c766c27e5125a299f77dd25bdf0aa554c8" } diff --git a/.sqlx/query-3ca99449c071cb0a8d90a735e1a767a94be224a02e0d16e81997d569af8d4cbb.json b/.sqlx/query-fb155632dd72ac2918041c80f8ca9836b0a2a17094b57afb6b0cb2b280724a91.json similarity index 85% rename from .sqlx/query-3ca99449c071cb0a8d90a735e1a767a94be224a02e0d16e81997d569af8d4cbb.json rename to .sqlx/query-fb155632dd72ac2918041c80f8ca9836b0a2a17094b57afb6b0cb2b280724a91.json index 933299b632..fc770e8253 100644 --- a/.sqlx/query-3ca99449c071cb0a8d90a735e1a767a94be224a02e0d16e81997d569af8d4cbb.json +++ b/.sqlx/query-fb155632dd72ac2918041c80f8ca9836b0a2a17094b57afb6b0cb2b280724a91.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n users.token as user_token,\n users.username,\n users.display_name,\n\n users.email_address,\n users.email_gravatar_hash,\n \n users.email_confirmed,\n users.email_confirmed_by_google,\n users.email_is_synthetic,\n users.is_without_password,\n users.username_is_not_customized,\n\n users.maybe_stripe_customer_id,\n users.maybe_loyalty_program_key,\n\n users.disable_gravatar,\n users.auto_play_audio_preference,\n users.auto_play_video_preference,\n users.preferred_tts_result_visibility as `preferred_tts_result_visibility: enums::common::visibility::Visibility`,\n users.preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums::common::visibility::Visibility`,\n\n users.user_role_slug,\n users.is_banned,\n\n users.can_access_studio,\n users.maybe_feature_flags,\n\n user_roles.can_use_tts,\n user_roles.can_use_w2l,\n user_roles.can_delete_own_tts_results,\n user_roles.can_delete_own_w2l_results,\n user_roles.can_delete_own_account,\n\n user_roles.can_upload_tts_models,\n user_roles.can_upload_w2l_templates,\n user_roles.can_delete_own_tts_models,\n user_roles.can_delete_own_w2l_templates,\n\n user_roles.can_approve_w2l_templates,\n user_roles.can_edit_other_users_profiles,\n user_roles.can_edit_other_users_tts_models,\n user_roles.can_edit_other_users_w2l_templates,\n user_roles.can_delete_other_users_tts_models,\n user_roles.can_delete_other_users_tts_results,\n user_roles.can_delete_other_users_w2l_templates,\n user_roles.can_delete_other_users_w2l_results,\n user_roles.can_ban_users,\n user_roles.can_delete_users\n\nFROM users\nLEFT OUTER JOIN user_sessions\n ON users.token = user_sessions.user_token\nLEFT OUTER JOIN user_roles\n ON users.user_role_slug = user_roles.slug\nWHERE user_sessions.token = ?\n AND user_sessions.deleted_at IS NULL\n AND users.user_deleted_at IS NULL\n AND users.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n users.token as user_token,\n users.username,\n users.display_name,\n\n users.email_address,\n users.email_gravatar_hash,\n \n users.email_confirmed,\n users.email_confirmed_by_google,\n users.email_is_synthetic,\n users.is_without_password,\n users.username_is_not_customized,\n\n users.maybe_stripe_customer_id,\n users.maybe_loyalty_program_key,\n\n users.disable_gravatar,\n users.auto_play_audio_preference,\n users.auto_play_video_preference,\n users.preferred_tts_result_visibility as `preferred_tts_result_visibility: enums_db::common::visibility::Visibility`,\n users.preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums_db::common::visibility::Visibility`,\n\n users.user_role_slug,\n users.is_banned,\n\n users.can_access_studio,\n users.maybe_feature_flags,\n\n user_roles.can_use_tts,\n user_roles.can_use_w2l,\n user_roles.can_delete_own_tts_results,\n user_roles.can_delete_own_w2l_results,\n user_roles.can_delete_own_account,\n\n user_roles.can_upload_tts_models,\n user_roles.can_upload_w2l_templates,\n user_roles.can_delete_own_tts_models,\n user_roles.can_delete_own_w2l_templates,\n\n user_roles.can_approve_w2l_templates,\n user_roles.can_edit_other_users_profiles,\n user_roles.can_edit_other_users_tts_models,\n user_roles.can_edit_other_users_w2l_templates,\n user_roles.can_delete_other_users_tts_models,\n user_roles.can_delete_other_users_tts_results,\n user_roles.can_delete_other_users_w2l_templates,\n user_roles.can_delete_other_users_w2l_results,\n user_roles.can_ban_users,\n user_roles.can_delete_users\n\nFROM users\nLEFT OUTER JOIN user_sessions\n ON users.token = user_sessions.user_token\nLEFT OUTER JOIN user_roles\n ON users.user_role_slug = user_roles.slug\nWHERE user_sessions.token = ?\n AND user_sessions.deleted_at IS NULL\n AND users.user_deleted_at IS NULL\n AND users.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -155,7 +155,7 @@ }, { "ordinal": 15, - "name": "preferred_tts_result_visibility: enums::common::visibility::Visibility", + "name": "preferred_tts_result_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -165,7 +165,7 @@ }, { "ordinal": 16, - "name": "preferred_w2l_result_visibility: enums::common::visibility::Visibility", + "name": "preferred_w2l_result_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -450,5 +450,5 @@ true ] }, - "hash": "3ca99449c071cb0a8d90a735e1a767a94be224a02e0d16e81997d569af8d4cbb" + "hash": "fb155632dd72ac2918041c80f8ca9836b0a2a17094b57afb6b0cb2b280724a91" } diff --git a/.sqlx/query-a0e1091c0deaf0265640d0c6d0a862d74172e7adf29c4c8e08e12a3662e323d5.json b/.sqlx/query-fc3a47c90335e3912d03d53f9c4d5cb1cfe8a99cde072e1943e4db76133fa1f1.json similarity index 86% rename from .sqlx/query-a0e1091c0deaf0265640d0c6d0a862d74172e7adf29c4c8e08e12a3662e323d5.json rename to .sqlx/query-fc3a47c90335e3912d03d53f9c4d5cb1cfe8a99cde072e1943e4db76133fa1f1.json index 0d5ed1bad7..b2c3200ab0 100644 --- a/.sqlx/query-a0e1091c0deaf0265640d0c6d0a862d74172e7adf29c4c8e08e12a3662e323d5.json +++ b/.sqlx/query-fc3a47c90335e3912d03d53f9c4d5cb1cfe8a99cde072e1943e4db76133fa1f1.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n id,\n token AS inference_job_token,\n uuid_idempotency_token,\n\n model_token,\n raw_inference_text,\n\n max_duration_seconds,\n \n creator_ip_address,\n maybe_creator_user_token,\n creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n is_from_api,\n is_for_twitch,\n is_debug_request,\n\n status as `status: enums::common::job_status::JobStatus`,\n priority_level,\n attempt_count,\n failure_reason,\n\n created_at,\n updated_at,\n retry_at\nFROM tts_inference_jobs\nWHERE\n priority_level >= ?\n AND is_debug_request = ?\n AND\n (\n status IN (\"pending\", \"attempt_failed\")\n )\n AND\n (\n retry_at IS NULL\n OR\n retry_at < CURRENT_TIMESTAMP\n )\n ORDER BY priority_level DESC, id ASC\n LIMIT ?\n ", + "query": "\nSELECT\n id,\n token AS inference_job_token,\n uuid_idempotency_token,\n\n model_token,\n raw_inference_text,\n\n max_duration_seconds,\n \n creator_ip_address,\n maybe_creator_user_token,\n creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n is_from_api,\n is_for_twitch,\n is_debug_request,\n\n status as `status: enums_db::common::job_status::JobStatus`,\n priority_level,\n attempt_count,\n failure_reason,\n\n created_at,\n updated_at,\n retry_at\nFROM tts_inference_jobs\nWHERE\n priority_level >= ?\n AND is_debug_request = ?\n AND\n (\n status IN (\"pending\", \"attempt_failed\")\n )\n AND\n (\n retry_at IS NULL\n OR\n retry_at < CURRENT_TIMESTAMP\n )\n ORDER BY priority_level DESC, id ASC\n LIMIT ?\n ", "describe": { "columns": [ { @@ -85,7 +85,7 @@ }, { "ordinal": 8, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -125,7 +125,7 @@ }, { "ordinal": 12, - "name": "status: enums::common::job_status::JobStatus", + "name": "status: enums_db::common::job_status::JobStatus", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -219,5 +219,5 @@ true ] }, - "hash": "a0e1091c0deaf0265640d0c6d0a862d74172e7adf29c4c8e08e12a3662e323d5" + "hash": "fc3a47c90335e3912d03d53f9c4d5cb1cfe8a99cde072e1943e4db76133fa1f1" } diff --git a/.sqlx/query-ae34c2ce11250786962be50f167f15f6d2d023afe2bb31994d21a1007d81e0a0.json b/.sqlx/query-fc42151ac09db6d655f27d83c589602d72f3d1017cf3b29dffbe0a3a5c1acaa7.json similarity index 83% rename from .sqlx/query-ae34c2ce11250786962be50f167f15f6d2d023afe2bb31994d21a1007d81e0a0.json rename to .sqlx/query-fc42151ac09db6d655f27d83c589602d72f3d1017cf3b29dffbe0a3a5c1acaa7.json index f6b2431a98..97b6ec7cc3 100644 --- a/.sqlx/query-ae34c2ce11250786962be50f167f15f6d2d023afe2bb31994d21a1007d81e0a0.json +++ b/.sqlx/query-fc42151ac09db6d655f27d83c589602d72f3d1017cf3b29dffbe0a3a5c1acaa7.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n\n w.title,\n vc.has_index_file,\n\n w.public_bucket_hash,\n w.maybe_public_bucket_prefix,\n w.maybe_public_bucket_extension,\n\n w.created_at,\n w.updated_at,\n w.user_deleted_at,\n w.mod_deleted_at\n\nFROM model_weights as w\nJOIN model_weights_extension_voice_conversion_details as vc\nON vc.model_weights_token = w.token\n\nWHERE w.token = ?\n ", + "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weights_type: enums_db::by_table::model_weights::weights_types::WeightsType`,\n\n w.title,\n vc.has_index_file,\n\n w.public_bucket_hash,\n w.maybe_public_bucket_prefix,\n w.maybe_public_bucket_extension,\n\n w.created_at,\n w.updated_at,\n w.user_deleted_at,\n w.mod_deleted_at\n\nFROM model_weights as w\nJOIN model_weights_extension_voice_conversion_details as vc\nON vc.model_weights_token = w.token\n\nWHERE w.token = ?\n ", "describe": { "columns": [ { @@ -15,7 +15,7 @@ }, { "ordinal": 1, - "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "name": "weights_type: enums_db::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -131,5 +131,5 @@ true ] }, - "hash": "ae34c2ce11250786962be50f167f15f6d2d023afe2bb31994d21a1007d81e0a0" + "hash": "fc42151ac09db6d655f27d83c589602d72f3d1017cf3b29dffbe0a3a5c1acaa7" } diff --git a/.sqlx/query-d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c.json b/.sqlx/query-ff01a066883a22dfe8e78f814659ff8684a2908359625ec03f1a15aee08399a4.json similarity index 83% rename from .sqlx/query-d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c.json rename to .sqlx/query-ff01a066883a22dfe8e78f814659ff8684a2908359625ec03f1a15aee08399a4.json index 265506cd34..99ab126171 100644 --- a/.sqlx/query-d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c.json +++ b/.sqlx/query-ff01a066883a22dfe8e78f814659ff8684a2908359625ec03f1a15aee08399a4.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n id,\n token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n\n model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`,\n maybe_vocoder_token as `maybe_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken`,\n\n title,\n description_markdown,\n description_rendered_html,\n\n ietf_language_tag,\n ietf_primary_language_subtag,\n\n has_index_file,\n\n is_front_page_featured,\n\n original_download_url,\n original_filename,\n file_size_bytes,\n\n creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n\n ip_address_creation,\n ip_address_last_update,\n\n maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n\n creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n private_bucket_hash,\n private_bucket_object_name,\n\n is_public_listing_approved,\n is_locked_from_user_modification,\n maybe_mod_comments,\n\n maybe_migration_new_model_weights_token as `maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n\n version,\n\n created_at,\n updated_at,\n\n user_deleted_at,\n mod_deleted_at\n\nFROM voice_conversion_models\nWHERE\n id > ?\nORDER BY id ASC\nLIMIT ?\n ", + "query": "\nSELECT\n id,\n token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n\n model_type as `model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`,\n maybe_vocoder_token as `maybe_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken`,\n\n title,\n description_markdown,\n description_rendered_html,\n\n ietf_language_tag,\n ietf_primary_language_subtag,\n\n has_index_file,\n\n is_front_page_featured,\n\n original_download_url,\n original_filename,\n file_size_bytes,\n\n creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n\n ip_address_creation,\n ip_address_last_update,\n\n maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n\n creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n\n private_bucket_hash,\n private_bucket_object_name,\n\n is_public_listing_approved,\n is_locked_from_user_modification,\n maybe_mod_comments,\n\n maybe_migration_new_model_weights_token as `maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n\n version,\n\n created_at,\n updated_at,\n\n user_deleted_at,\n mod_deleted_at\n\nFROM voice_conversion_models\nWHERE\n id > ?\nORDER BY id ASC\nLIMIT ?\n ", "describe": { "columns": [ { @@ -25,7 +25,7 @@ }, { "ordinal": 2, - "name": "model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", + "name": "model_type: enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", "type_info": { "type": "VarString", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", @@ -185,7 +185,7 @@ }, { "ordinal": 18, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", @@ -340,5 +340,5 @@ true ] }, - "hash": "d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c" + "hash": "ff01a066883a22dfe8e78f814659ff8684a2908359625ec03f1a15aee08399a4" } diff --git a/.sqlx/query-ce8560e2ff8c879647c7b9f154a8987765272c53f95b9e6a8b8ee5c4ad7b1f17.json b/.sqlx/query-ff105bceaac793f44d21d0a140daf8741ad1a58aa6c844e2a25b9539844f31ab.json similarity index 91% rename from .sqlx/query-ce8560e2ff8c879647c7b9f154a8987765272c53f95b9e6a8b8ee5c4ad7b1f17.json rename to .sqlx/query-ff105bceaac793f44d21d0a140daf8741ad1a58aa6c844e2a25b9539844f31ab.json index 12e77a72f3..5f1a82f41d 100644 --- a/.sqlx/query-ce8560e2ff8c879647c7b9f154a8987765272c53f95b9e6a8b8ee5c4ad7b1f17.json +++ b/.sqlx/query-ff105bceaac793f44d21d0a140daf8741ad1a58aa6c844e2a25b9539844f31ab.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n id,\n token AS inference_job_token,\n uuid_idempotency_token,\n\n maybe_w2l_template_token,\n maybe_public_image_bucket_location,\n maybe_tts_inference_result_token,\n maybe_public_audio_bucket_hash,\n maybe_public_audio_bucket_location,\n\n maybe_original_audio_filename,\n maybe_original_audio_download_url,\n maybe_audio_mime_type,\n\n creator_ip_address,\n maybe_creator_user_token,\n\n creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n disable_end_bump,\n disable_watermark,\n\n status,\n attempt_count,\n failure_reason,\n created_at,\n updated_at,\n retry_at\nFROM w2l_inference_jobs\nWHERE\n (\n status IN (\"pending\", \"attempt_failed\")\n )\n AND\n (\n retry_at IS NULL\n OR\n retry_at < CURRENT_TIMESTAMP\n )\n LIMIT ?\n ", + "query": "\nSELECT\n id,\n token AS inference_job_token,\n uuid_idempotency_token,\n\n maybe_w2l_template_token,\n maybe_public_image_bucket_location,\n maybe_tts_inference_result_token,\n maybe_public_audio_bucket_hash,\n maybe_public_audio_bucket_location,\n\n maybe_original_audio_filename,\n maybe_original_audio_download_url,\n maybe_audio_mime_type,\n\n creator_ip_address,\n maybe_creator_user_token,\n\n creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,\n disable_end_bump,\n disable_watermark,\n\n status,\n attempt_count,\n failure_reason,\n created_at,\n updated_at,\n retry_at\nFROM w2l_inference_jobs\nWHERE\n (\n status IN (\"pending\", \"attempt_failed\")\n )\n AND\n (\n retry_at IS NULL\n OR\n retry_at < CURRENT_TIMESTAMP\n )\n LIMIT ?\n ", "describe": { "columns": [ { @@ -135,7 +135,7 @@ }, { "ordinal": 13, - "name": "creator_set_visibility: enums::common::visibility::Visibility", + "name": "creator_set_visibility: enums_db::common::visibility::Visibility", "type_info": { "type": "String", "flags": "NOT_NULL | BINARY | ENUM", @@ -252,5 +252,5 @@ true ] }, - "hash": "ce8560e2ff8c879647c7b9f154a8987765272c53f95b9e6a8b8ee5c4ad7b1f17" + "hash": "ff105bceaac793f44d21d0a140daf8741ad1a58aa6c844e2a25b9539844f31ab" } From 30cd8cd119e61586fbe10b7df37a5cbaa77a52ce Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 22 Mar 2026 16:04:34 -0400 Subject: [PATCH 5/5] to_str impls for two enums --- .../src/common/artcraft_credits_pack_slug.rs | 35 +++++++++++++++++++ .../src/common/artcraft_subscription_slug.rs | 29 +++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/crates/schema/public/enums_api/src/common/artcraft_credits_pack_slug.rs b/crates/schema/public/enums_api/src/common/artcraft_credits_pack_slug.rs index 3f3d8e7acc..ee8f5c5060 100644 --- a/crates/schema/public/enums_api/src/common/artcraft_credits_pack_slug.rs +++ b/crates/schema/public/enums_api/src/common/artcraft_credits_pack_slug.rs @@ -21,6 +21,19 @@ pub enum ArtcraftCreditsPackSlug { Artcraft50000, } +impl ArtcraftCreditsPackSlug { + pub const fn to_str(&self) -> &'static str { + match self { + Self::Artcraft1000 => "artcraft_1000", + Self::Artcraft2500 => "artcraft_2500", + Self::Artcraft5000 => "artcraft_5000", + Self::Artcraft10000 => "artcraft_10000", + Self::Artcraft25000 => "artcraft_25000", + Self::Artcraft50000 => "artcraft_50000", + } + } +} + #[cfg(test)] mod tests { use super::ArtcraftCreditsPackSlug; @@ -56,6 +69,28 @@ mod tests { } } + mod to_str_checks { + use super::*; + + #[test] + fn to_str() { + assert_eq!(ArtcraftCreditsPackSlug::Artcraft1000.to_str(), "artcraft_1000"); + assert_eq!(ArtcraftCreditsPackSlug::Artcraft2500.to_str(), "artcraft_2500"); + assert_eq!(ArtcraftCreditsPackSlug::Artcraft5000.to_str(), "artcraft_5000"); + assert_eq!(ArtcraftCreditsPackSlug::Artcraft10000.to_str(), "artcraft_10000"); + assert_eq!(ArtcraftCreditsPackSlug::Artcraft25000.to_str(), "artcraft_25000"); + assert_eq!(ArtcraftCreditsPackSlug::Artcraft50000.to_str(), "artcraft_50000"); + } + + #[test] + fn to_str_matches_serde() { + for variant in ArtcraftCreditsPackSlug::iter() { + let serde_str = serde_json::to_string(&variant).unwrap().replace('"', ""); + assert_eq!(variant.to_str(), serde_str); + } + } + } + mod mechanical_checks { use super::*; diff --git a/crates/schema/public/enums_api/src/common/artcraft_subscription_slug.rs b/crates/schema/public/enums_api/src/common/artcraft_subscription_slug.rs index e4587ac0e4..e61b942446 100644 --- a/crates/schema/public/enums_api/src/common/artcraft_subscription_slug.rs +++ b/crates/schema/public/enums_api/src/common/artcraft_subscription_slug.rs @@ -12,6 +12,16 @@ pub enum ArtcraftSubscriptionSlug { ArtcraftMax, } +impl ArtcraftSubscriptionSlug { + pub const fn to_str(&self) -> &'static str { + match self { + Self::ArtcraftBasic => "artcraft_basic", + Self::ArtcraftPro => "artcraft_pro", + Self::ArtcraftMax => "artcraft_max", + } + } +} + #[cfg(test)] mod tests { use super::ArtcraftSubscriptionSlug; @@ -41,6 +51,25 @@ mod tests { } } + mod to_str_checks { + use super::*; + + #[test] + fn to_str() { + assert_eq!(ArtcraftSubscriptionSlug::ArtcraftBasic.to_str(), "artcraft_basic"); + assert_eq!(ArtcraftSubscriptionSlug::ArtcraftPro.to_str(), "artcraft_pro"); + assert_eq!(ArtcraftSubscriptionSlug::ArtcraftMax.to_str(), "artcraft_max"); + } + + #[test] + fn to_str_matches_serde() { + for variant in ArtcraftSubscriptionSlug::iter() { + let serde_str = serde_json::to_string(&variant).unwrap().replace('"', ""); + assert_eq!(variant.to_str(), serde_str); + } + } + } + mod mechanical_checks { use super::*;