From f2b9a9c5f2dd687d36c55224eef19331d2b11940 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 22 Mar 2026 13:35:13 -0400 Subject: [PATCH] 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};