diff --git a/Cargo.lock b/Cargo.lock index a9d2b0861e..2e068cc750 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -677,7 +677,9 @@ dependencies = [ "directories", "dirs", "discord-rich-presence", - "enums", + "enums_api", + "enums_convert", + "enums_db", "errors", "filesys", "futures 0.3.32", @@ -1434,7 +1436,9 @@ dependencies = [ "async-stripe-webhook", "chrono", "component_traits", - "enums", + "enums_api", + "enums_convert", + "enums_db", "errors", "http_headers", "http_server_common", @@ -1465,7 +1469,9 @@ dependencies = [ "async-trait", "chrono", "component_traits", - "enums", + "enums_api", + "enums_convert", + "enums_db", "errors", "http_server_common", "log", @@ -2351,7 +2357,9 @@ dependencies = [ "artcraft_api_defs", "async-trait", "chrono", - "enums", + "enums_api", + "enums_convert", + "enums_db", "errors", "http_server_common", "log", @@ -3422,7 +3430,9 @@ dependencies = [ "crockford", "dotenv", "easyenv", - "enums", + "enums_api", + "enums_convert", + "enums_db", "errors", "filesys", "google_drive_downloader", @@ -3690,7 +3700,7 @@ dependencies = [ "config", "easyenv", "email_sender", - "enums", + "enums_db", "errors", "filesys", "jobs_common", @@ -5783,7 +5793,9 @@ dependencies = [ "crockford", "dotenv", "easyenv", - "enums", + "enums_api", + "enums_convert", + "enums_db", "errors", "ffmpeg_utils", "filesys", @@ -10217,7 +10229,7 @@ dependencies = [ "concurrency", "config", "easyenv", - "enums", + "enums_db", "errors", "hashing", "jobs_common", @@ -11263,7 +11275,9 @@ dependencies = [ "easyenv", "elasticsearch", "elasticsearch_schema", - "enums", + "enums_api", + "enums_convert", + "enums_db", "enums_public", "errors", "fal_client", @@ -12876,7 +12890,7 @@ dependencies = [ "config", "dotenv", "easyenv", - "enums", + "enums_db", "errors", "filesys", "google_drive_downloader", @@ -14760,7 +14774,7 @@ dependencies = [ "concurrency", "config", "easyenv", - "enums", + "enums_db", "errors", "hashing", "jobs_common", diff --git a/crates/desktop/artcraft/Cargo.toml b/crates/desktop/artcraft/Cargo.toml index cec696fca5..2612f1f193 100644 --- a/crates/desktop/artcraft/Cargo.toml +++ b/crates/desktop/artcraft/Cargo.toml @@ -31,7 +31,9 @@ artcraft_client.workspace = true artcraft_router.workspace = true build_metadata.workspace = true cookie_store.workspace = true -enums.workspace = true +enums_db.workspace = true +enums_api.workspace = true +enums_convert.workspace = true errors.workspace = true filesys.workspace = true grok_client.workspace = true diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/common/maybe_notify_frontend_of_billing_errors.rs b/crates/desktop/artcraft/src/core/commands/enqueue/common/maybe_notify_frontend_of_billing_errors.rs index 9612551df2..1ad9aa193a 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/common/maybe_notify_frontend_of_billing_errors.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/common/maybe_notify_frontend_of_billing_errors.rs @@ -1,6 +1,6 @@ use crate::core::commands::enqueue::generate_error::{BillingIssueReason, BillingProvider, GenerateError, ProviderFailureReason}; use crate::core::events::functional_events::show_provider_billing_modal_event::ShowProviderBillingModalEvent; -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; use log::warn; use artcraft_client::error::api_error::ApiError; use artcraft_client::error::storyteller_error::StorytellerError; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/generate_error.rs b/crates/desktop/artcraft/src/core/commands/enqueue/generate_error.rs index a8b34ffd9e..6bf0d3bc2a 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/generate_error.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/generate_error.rs @@ -3,8 +3,8 @@ use anyhow::anyhow; use artcraft_router::errors::artcraft_router_error::ArtcraftRouterError; use artcraft_router::errors::provider_error::ProviderError; use base64::DecodeError; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::common::model_type::ModelType; use errors::AnyhowError; use grok_client::error::grok_error::GrokError; use midjourney_client::error::midjourney_error::MidjourneyError; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/artcraft/handle_generic_bg_removal_artcraft.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/artcraft/handle_generic_bg_removal_artcraft.rs index 785bd36282..0bb4a00951 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/artcraft/handle_generic_bg_removal_artcraft.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/artcraft/handle_generic_bg_removal_artcraft.rs @@ -14,8 +14,8 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use anyhow::anyhow; use artcraft_api_defs::generate::image::bg_removal::remove_image_background::RemoveImageBackgroundRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/enqueue_image_bg_removal_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/enqueue_image_bg_removal_command.rs index 15447e0031..2c5fc51240 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/enqueue_image_bg_removal_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/enqueue_image_bg_removal_command.rs @@ -23,9 +23,9 @@ use crate::core::utils::simple_http_download::simple_http_download; use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; -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::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowError; use log::{error, info, warn}; use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_flux_kontext_edit.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_flux_kontext_edit.rs index 252dcbbab0..61aafcc5ed 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_flux_kontext_edit.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_flux_kontext_edit.rs @@ -13,8 +13,8 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte use anyhow::anyhow; use artcraft_api_defs::generate::image::edit::flux_pro_kontext_max_edit_image::{FluxProKontextMaxEditImageNumImages, FluxProKontextMaxEditImageRequest}; use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::endpoints::generate::image::edit::flux_pro_kontext_max_edit_image::flux_pro_kontext_max_edit_image; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_gpt_image_1_edit.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_gpt_image_1_edit.rs index edbf355ec1..cefdbc8d2c 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_gpt_image_1_edit.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_gpt_image_1_edit.rs @@ -12,8 +12,8 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use anyhow::anyhow; use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs index 9d3572ae11..eaa6dca82c 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs @@ -16,8 +16,8 @@ use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismat use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::generate::generate_image::generate_image_request::GenerateImageRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use log::{error, info}; pub(super) const MAX_EDIT_IMAGES: usize = 10; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs index 32a2c40705..18aea10f85 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs @@ -24,11 +24,11 @@ use crate::core::utils::simple_http_download::simple_http_download; use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -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::common::model_type::ModelType; +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 errors::AnyhowError; use log::{error, info, warn}; use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/image_edit_models.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/image_edit_models.rs index 124f566402..80c9a15395 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/image_edit_models.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/image_edit_models.rs @@ -1,4 +1,4 @@ -use enums::common::model_type::ModelType; +use enums_db::common::model_type::ModelType; use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::ImageEditModel; pub fn image_edit_model_to_model_type(model: ImageEditModel) -> ModelType { diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_image_edit_sora.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_image_edit_sora.rs index 5e15ec79ec..857fef69d6 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_image_edit_sora.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_image_edit_sora.rs @@ -7,7 +7,7 @@ use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; use tauri::AppHandle; pub async fn handle_image_edit_sora( diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_sora_gpt_image_1_edit.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_sora_gpt_image_1_edit.rs index ed0bc273ea..901452cc68 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_sora_gpt_image_1_edit.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_sora_gpt_image_1_edit.rs @@ -17,8 +17,8 @@ use crate::services::sora::state::sora_credential_manager::SoraCredentialManager use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use anyhow::anyhow; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_dev_juggernaut_inpaint.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_dev_juggernaut_inpaint.rs index e8000eb97f..92bed227b1 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_dev_juggernaut_inpaint.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_dev_juggernaut_inpaint.rs @@ -16,8 +16,8 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte use anyhow::anyhow; use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest}; use artcraft_api_defs::generate::image::inpaint::flux_dev_juggernaut_inpaint_image::{FluxDevJuggernautInpaintImageNumImages, FluxDevJuggernautInpaintImageRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use images::encoding::image_bytes_to_png_bytes::image_bytes_to_png_bytes; use images::encoding::image_bytes_to_png_bytes_with_dimensions::image_bytes_to_png_bytes_with_dimensions; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_1_inpaint.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_1_inpaint.rs index b3236e9130..e0255c4a9b 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_1_inpaint.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_1_inpaint.rs @@ -16,8 +16,8 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte use anyhow::anyhow; use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest}; use artcraft_api_defs::generate::image::inpaint::flux_pro_1_inpaint_image::{FluxPro1InpaintImageNumImages, FluxPro1InpaintImageRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use images::encoding::image_bytes_to_png_bytes::image_bytes_to_png_bytes; use images::encoding::image_bytes_to_png_bytes_with_dimensions::image_bytes_to_png_bytes_with_dimensions; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_kontext_inpaint.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_kontext_inpaint.rs index f149efb832..2611a66b40 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_kontext_inpaint.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_kontext_inpaint.rs @@ -17,8 +17,8 @@ use anyhow::anyhow; use artcraft_api_defs::generate::image::edit::flux_pro_kontext_max_edit_image::{FluxProKontextMaxEditImageNumImages, FluxProKontextMaxEditImageRequest}; use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest}; use artcraft_api_defs::generate::image::inpaint::flux_pro_1_inpaint_image::{FluxPro1InpaintImageNumImages, FluxPro1InpaintImageRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use images::encoding::image_bytes_to_png_bytes::image_bytes_to_png_bytes; use images::encoding::image_bytes_to_png_bytes_with_dimensions::image_bytes_to_png_bytes_with_dimensions; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_nano_banana_inpaint.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_nano_banana_inpaint.rs index db5b67f9a7..fc0b2fab4a 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_nano_banana_inpaint.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_nano_banana_inpaint.rs @@ -18,8 +18,8 @@ use artcraft_api_defs::generate::image::edit::flux_pro_kontext_max_edit_image::{ use artcraft_api_defs::generate::image::edit::gemini_25_flash_edit_image::{Gemini25FlashEditImageNumImages, Gemini25FlashEditImageRequest}; use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest}; use artcraft_api_defs::generate::image::inpaint::flux_pro_1_inpaint_image::{FluxPro1InpaintImageNumImages, FluxPro1InpaintImageRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use images::encoding::image_bytes_to_png_bytes::image_bytes_to_png_bytes; use images::encoding::image_bytes_to_png_bytes_with_dimensions::image_bytes_to_png_bytes_with_dimensions; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs index 36a089f607..1b47153f5b 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs @@ -23,10 +23,10 @@ use crate::core::utils::simple_http_download::simple_http_download; use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; -use enums::common::generation_provider::GenerationProvider; -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_status::TaskStatus; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowError; use log::{error, info, warn}; use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/inpaint_models.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/inpaint_models.rs index c6eea0a571..7f405bbf7d 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/inpaint_models.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/inpaint_models.rs @@ -1,5 +1,5 @@ use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::ImageInpaintModel; -use enums::common::model_type::ModelType; +use enums_db::common::model_type::ModelType; pub fn image_inpaint_model_to_model_type(model: ImageInpaintModel) -> ModelType { match model { diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/artcraft/handle_artcraft_splat_via_router.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/artcraft/handle_artcraft_splat_via_router.rs index fe81fedcb0..8f61cfc85e 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/artcraft/handle_artcraft_splat_via_router.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/artcraft/handle_artcraft_splat_via_router.rs @@ -10,8 +10,8 @@ use artcraft_router::api::provider::Provider; use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::generate::generate_splat::generate_splat_request::GenerateSplatRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use log::{error, info}; pub(super) async fn handle_artcraft_splat_via_router( diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/enqueue_image_to_gaussian_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/enqueue_image_to_gaussian_command.rs index 9c42060b18..b6ed6dddb9 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/enqueue_image_to_gaussian_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/enqueue_image_to_gaussian_command.rs @@ -22,10 +22,10 @@ use crate::services::sora::state::sora_credential_manager::SoraCredentialManager use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use crate::services::worldlabs::state::worldlabs_credential_manager::WorldlabsCredentialManager; -use enums::common::generation_provider::GenerationProvider; -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_status::TaskStatus; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use log::{error, info, warn}; use serde::{Deserialize, Serialize}; use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/worldlabs/handle_worldlabs_marble.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/worldlabs/handle_worldlabs_marble.rs index 591e701893..4c04adac76 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/worldlabs/handle_worldlabs_marble.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/worldlabs/handle_worldlabs_marble.rs @@ -11,8 +11,8 @@ use crate::core::utils::get_url_file_extension::get_url_file_extension; use crate::core::utils::simple_http_download::simple_http_download; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use crate::services::worldlabs::state::worldlabs_credential_manager::WorldlabsCredentialManager; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use std::path::PathBuf; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/artcraft/handle_artcraft_object.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/artcraft/handle_artcraft_object.rs index 7944a7fb38..6c063077b1 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/artcraft/handle_artcraft_object.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/artcraft/handle_artcraft_object.rs @@ -10,8 +10,8 @@ use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::object::generate_hunyuan_2_0_image_to_3d::GenerateHunyuan20ImageTo3dRequest; use artcraft_api_defs::generate::object::generate_hunyuan_2_1_image_to_3d::GenerateHunyuan21ImageTo3dRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::endpoints::generate::object::generate_hunyuan_3d_2_0_image_to_3d::generate_hunyuan3d_2_0_image_to_3d; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/enqueue_image_to_3d_object_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/enqueue_image_to_3d_object_command.rs index 39bcf076d3..49996cd8f4 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/enqueue_image_to_3d_object_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/enqueue_image_to_3d_object_command.rs @@ -14,7 +14,7 @@ use crate::core::state::provider_priority::{Provider, ProviderPriorityStore}; use crate::core::state::task_database::TaskDatabase; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use log::{error, info, warn}; use serde_derive::{Deserialize, Serialize}; use tauri::{AppHandle, State}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_1p6_pro.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_1p6_pro.rs index b9ee7a2679..ad37946a96 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_1p6_pro.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_1p6_pro.rs @@ -13,8 +13,8 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProDuration, GenerateKling16ProImageToVideoRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p1_master.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p1_master.rs index cc66d35dff..a4d61b78c1 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p1_master.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p1_master.rs @@ -13,8 +13,8 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::generate_kling_2_1_master_image_to_video::{GenerateKling21MasterAspectRatio, GenerateKling21MasterDuration, GenerateKling21MasterImageToVideoRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p1_pro.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p1_pro.rs index 5892fa1366..afe4bafb97 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p1_pro.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p1_pro.rs @@ -13,8 +13,8 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProAspectRatio, GenerateKling21ProDuration, GenerateKling21ProImageToVideoRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p5_turbo_pro.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p5_turbo_pro.rs index b8bf4015e9..69c5221377 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p5_turbo_pro.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p5_turbo_pro.rs @@ -13,8 +13,8 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::multi_function::kling_2_5_turbo_multi_function_video_gen::{Kling2p5TurboProMultiFunctionVideoGenAspectRatio, Kling2p5TurboProMultiFunctionVideoGenDuration, Kling2p5TurboProMultiFunctionVideoGenRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p6_pro.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p6_pro.rs index b2c196c885..47aeb6519f 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p6_pro.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p6_pro.rs @@ -14,8 +14,8 @@ use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest}; use artcraft_api_defs::generate::video::multi_function::kling_2_6_multi_function_video_gen::{Kling2p6ProMultiFunctionVideoGenAspectRatio, Kling2p6ProMultiFunctionVideoGenDuration, Kling2p6ProMultiFunctionVideoGenRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_1_lite.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_1_lite.rs index 5e07d28a07..121aa6dfef 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_1_lite.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_1_lite.rs @@ -13,8 +13,8 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::{GenerateSeedance10LiteDuration, GenerateSeedance10LiteImageToVideoRequest, GenerateSeedance10LiteResolution}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_2p0.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_2p0.rs index dd010ca090..3384138f0a 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_2p0.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_2p0.rs @@ -13,8 +13,8 @@ use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismat use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::generate::generate_video::generate_video_request::GenerateVideoRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2.rs index c8660aa9ab..9cf835157c 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2.rs @@ -14,8 +14,8 @@ use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest}; use artcraft_api_defs::generate::video::multi_function::sora_2_multi_function_video_gen::{Sora2MultiFunctionVideoGenAspectRatio, Sora2MultiFunctionVideoGenDuration, Sora2MultiFunctionVideoGenRequest, Sora2MultiFunctionVideoGenResolution}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use openai_sora_client::recipes::generate_sora2_video::generate_sora2_video_with_session_auto_renew::generate_sora2_video_with_session_auto_renew; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2_pro.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2_pro.rs index 9dec7ef6ae..066b9dd089 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2_pro.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2_pro.rs @@ -13,8 +13,8 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::multi_function::sora_2_pro_multi_function_video_gen::{Sora2ProMultiFunctionVideoGenAspectRatio, Sora2ProMultiFunctionVideoGenDuration, Sora2ProMultiFunctionVideoGenRequest, Sora2ProMultiFunctionVideoGenResolution}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use openai_sora_client::recipes::generate_sora2_video::generate_sora2_video_with_session_auto_renew::generate_sora2_video_with_session_auto_renew; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo2.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo2.rs index f90128a926..3d12743d32 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo2.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo2.rs @@ -13,8 +13,8 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::{GenerateVeo2AspectRatio, GenerateVeo2ImageToVideoRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3.rs index 9036b604e8..e4991db493 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3.rs @@ -14,8 +14,8 @@ use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest}; use artcraft_api_defs::generate::video::generate_veo_3_image_to_video::{GenerateVeo3AspectRatio, GenerateVeo3ImageToVideoRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3_fast.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3_fast.rs index 05996448f1..7ddca8e58c 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3_fast.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3_fast.rs @@ -14,8 +14,8 @@ use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest}; use artcraft_api_defs::generate::video::generate_veo_3_fast_image_to_video::GenerateVeo3FastImageToVideoRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3p1.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3p1.rs index fdad3af739..6e64f88da9 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3p1.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3p1.rs @@ -14,8 +14,8 @@ use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest}; use artcraft_api_defs::generate::video::multi_function::veo_3p1_multi_function_video_gen::{Veo3p1MultiFunctionVideoGenAspectRatio, Veo3p1MultiFunctionVideoGenDuration, Veo3p1MultiFunctionVideoGenRequest, Veo3p1MultiFunctionVideoGenResolution}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3p1_fast.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3p1_fast.rs index afbfb0e2f4..bc2b50b8b4 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3p1_fast.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3p1_fast.rs @@ -13,8 +13,8 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::video::multi_function::veo_3p1_fast_multi_function_video_gen::{Veo3p1FastMultiFunctionVideoGenAspectRatio, Veo3p1FastMultiFunctionVideoGenDuration, Veo3p1FastMultiFunctionVideoGenRequest, Veo3p1FastMultiFunctionVideoGenResolution}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_video_via_router.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_video_via_router.rs index 0113d1e618..c06af188ea 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_video_via_router.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_video_via_router.rs @@ -10,8 +10,8 @@ use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismat use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::generate::generate_video::generate_video_request::GenerateVideoRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use log::{error, info}; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/enqueue_image_to_video_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/enqueue_image_to_video_command.rs index c2a6b22516..b98aae50b9 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/enqueue_image_to_video_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/enqueue_image_to_video_command.rs @@ -24,8 +24,8 @@ use crate::services::sora::state::sora_credential_manager::SoraCredentialManager use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_router::api::common_aspect_ratio::CommonAspectRatio; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use log::{error, info, warn}; use serde_derive::{Deserialize, Serialize}; use tauri::{AppHandle, State}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/grok/handle_grok_video.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/grok/handle_grok_video.rs index bd6d1e0cb9..8ef89950dc 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/grok/handle_grok_video.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/grok/handle_grok_video.rs @@ -15,8 +15,8 @@ use crate::services::sora::state::sora_credential_manager::SoraCredentialManager use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use grok_client::credentials::grok_cookies::GrokCookies; use grok_client::credentials::grok_full_credentials::GrokFullCredentials; use grok_client::datatypes::api::aspect_ratio::AspectRatio; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/sora2/handle_sora_sora2.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/sora2/handle_sora_sora2.rs index d61844eaae..60457e8e06 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/sora2/handle_sora_sora2.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/sora2/handle_sora_sora2.rs @@ -9,8 +9,8 @@ use crate::services::sora::state::sora_credential_manager::SoraCredentialManager use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use log::{error, info}; use openai_sora_client::recipes::generate_sora2_video::generate_sora2_video_with_session_auto_renew::generate_sora2_video_with_session_auto_renew; use openai_sora_client::recipes::list_sora2_drafts::list_sora2_drafts_with_session_auto_renew::list_sora2_drafts_with_session_auto_renew; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/task_enqueue_success.rs b/crates/desktop/artcraft/src/core/commands/enqueue/task_enqueue_success.rs index b147360e9a..09c5a9b0b7 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/task_enqueue_success.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/task_enqueue_success.rs @@ -1,10 +1,10 @@ use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; use crate::core::state::task_database::TaskDatabase; -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 sqlite_tasks::error::SqliteTasksError; use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs}; use tokens::tokens::sqlite::tasks::TaskId; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_artcraft_gpt_image_1_text_to_image.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_artcraft_gpt_image_1_text_to_image.rs index 4265016619..5e63627108 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_artcraft_gpt_image_1_text_to_image.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_artcraft_gpt_image_1_text_to_image.rs @@ -12,8 +12,8 @@ use crate::services::sora::state::sora_credential_manager::SoraCredentialManager use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::generate::image::text::generate_gpt_image_1_text_to_image::{GenerateGptImage1TextToImageImageQuality, GenerateGptImage1TextToImageImageSize, GenerateGptImage1TextToImageNumImages, GenerateGptImage1TextToImageRequest}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_text_to_image_artcraft.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_text_to_image_artcraft.rs index 8c680f1e0e..4ef9496e0c 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_text_to_image_artcraft.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_text_to_image_artcraft.rs @@ -9,7 +9,7 @@ use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_router::api::common_image_model::CommonImageModel; -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; use tauri::AppHandle; pub async fn handle_text_to_image_artcraft( diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs index 0a375585d1..5cb4127c20 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs @@ -17,8 +17,8 @@ use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismat use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::generate::generate_image::generate_image_request::GenerateImageRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use log::{error, info}; pub(super) async fn handle_text_to_image_artcraft_via_router( diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs index 5dd79fce68..c59994a8af 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs @@ -29,10 +29,10 @@ use crate::services::midjourney::state::midjourney_credential_manager::Midjourne use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; -use enums::common::generation_provider::GenerationProvider; -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_status::TaskStatus; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use log::{error, info, warn}; use serde::{Deserialize, Serialize}; use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/grok/handle_grok.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/grok/handle_grok.rs index 8318f5f6e6..3aa0584ff0 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/grok/handle_grok.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/grok/handle_grok.rs @@ -6,8 +6,8 @@ use crate::core::events::generation_events::common::GenerationModel; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::services::grok::state::grok_credential_manager::GrokCredentialManager; use crate::services::grok::state::grok_image_prompt_queue::{GrokImagePromptQueue, PromptItem}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use grok_client::requests::image_websocket::messages::websocket_client_message::ClientMessageAspectRatio; use uuid_utils::uuid::generate_random_uuid; use tauri::AppHandle; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/midjourney/handle_midjourney.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/midjourney/handle_midjourney.rs index 848ebe8105..fff854da0b 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/midjourney/handle_midjourney.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/midjourney/handle_midjourney.rs @@ -15,8 +15,8 @@ use crate::services::midjourney::state::midjourney_credential_manager::Midjourne use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; use midjourney_client::client::midjourney_hostname::MidjourneyHostname; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/sora/handle_gpt_image_1_sora_text_to_image.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/sora/handle_gpt_image_1_sora_text_to_image.rs index 82a1abedbf..bacd68ef1f 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/sora/handle_gpt_image_1_sora_text_to_image.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/sora/handle_gpt_image_1_sora_text_to_image.rs @@ -9,8 +9,8 @@ use crate::core::events::generation_events::common::{GenerationAction, Generatio use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent; use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::tasks::task_type::TaskType; use errors::AnyhowResult; use grok_client::requests::image_websocket::messages::websocket_client_message::ClientMessageAspectRatio; use log::{error, info}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/text_to_image_models.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/text_to_image_models.rs index 4f64d599df..f2811eeefb 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/text_to_image_models.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/text_to_image_models.rs @@ -1,5 +1,5 @@ use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::TextToImageModel; -use enums::common::model_type::ModelType; +use enums_db::common::model_type::ModelType; pub fn text_to_image_model_to_model_type(model: TextToImageModel) -> ModelType { match model { diff --git a/crates/desktop/artcraft/src/core/commands/task_queue/get_task_queue_command.rs b/crates/desktop/artcraft/src/core/commands/task_queue/get_task_queue_command.rs index 89cc80c7da..ed65fad43b 100644 --- a/crates/desktop/artcraft/src/core/commands/task_queue/get_task_queue_command.rs +++ b/crates/desktop/artcraft/src/core/commands/task_queue/get_task_queue_command.rs @@ -8,18 +8,18 @@ use crate::core::state::task_database::TaskDatabase; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use chrono::{DateTime, Utc}; -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_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 errors::AnyhowResult; use log::{debug, error, info, warn}; use serde_derive::{Deserialize, Serialize}; use sqlite_tasks::queries::list_tasks_for_frontend::list_tasks_for_frontend; use artcraft_client::endpoints::media_files::delete_media_file::delete_media_file; use tauri::{AppHandle, State}; -use enums::tauri::tasks::task_failure_type::TaskFailureType; -use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_db::tauri::tasks::task_failure_type::TaskFailureType; +use enums_db::tauri::tasks::task_media_file_class::TaskMediaFileClass; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::sqlite::tasks::TaskId; diff --git a/crates/desktop/artcraft/src/core/commands/task_queue/mark_task_as_dismissed_command.rs b/crates/desktop/artcraft/src/core/commands/task_queue/mark_task_as_dismissed_command.rs index ef7dfe0e96..10d6ddecb4 100644 --- a/crates/desktop/artcraft/src/core/commands/task_queue/mark_task_as_dismissed_command.rs +++ b/crates/desktop/artcraft/src/core/commands/task_queue/mark_task_as_dismissed_command.rs @@ -8,10 +8,10 @@ use crate::core::state::task_database::TaskDatabase; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use chrono::{DateTime, Utc}; -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_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 errors::AnyhowResult; use log::{error, info, warn}; use serde_derive::{Deserialize, Serialize}; diff --git a/crates/desktop/artcraft/src/core/commands/task_queue/tasks_nuke_all_command.rs b/crates/desktop/artcraft/src/core/commands/task_queue/tasks_nuke_all_command.rs index f7685d5237..2dc45c6fa5 100644 --- a/crates/desktop/artcraft/src/core/commands/task_queue/tasks_nuke_all_command.rs +++ b/crates/desktop/artcraft/src/core/commands/task_queue/tasks_nuke_all_command.rs @@ -8,10 +8,10 @@ use crate::core::state::task_database::TaskDatabase; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use chrono::{DateTime, Utc}; -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_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 errors::AnyhowResult; use log::{error, info, warn}; use serde_derive::{Deserialize, Serialize}; diff --git a/crates/desktop/artcraft/src/core/events/basic_sendable_event_trait.rs b/crates/desktop/artcraft/src/core/events/basic_sendable_event_trait.rs index 8eae34f14b..165d464428 100644 --- a/crates/desktop/artcraft/src/core/events/basic_sendable_event_trait.rs +++ b/crates/desktop/artcraft/src/core/events/basic_sendable_event_trait.rs @@ -1,5 +1,5 @@ use crate::core::events::sendable_event_error::SendableEventError; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use log::{error, info}; use serde::Serialize; use std::fmt::Debug; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/canvas_background_removal_complete_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/canvas_background_removal_complete_event.rs index 54fd74decb..61448a24a8 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/canvas_background_removal_complete_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/canvas_background_removal_complete_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tokens::tokens::media_files::MediaFileToken; use url::Url; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/credits_balance_changed_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/credits_balance_changed_event.rs index c295351c19..ac5ac7a934 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/credits_balance_changed_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/credits_balance_changed_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tokens::tokens::media_files::MediaFileToken; use url::Url; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/gaussian_generation_complete_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/gaussian_generation_complete_event.rs index 51ffda4794..c068c76f88 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/gaussian_generation_complete_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/gaussian_generation_complete_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tokens::tokens::media_files::MediaFileToken; use url::Url; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/image_edit_complete_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/image_edit_complete_event.rs index ca89dcbb22..031f86870c 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/image_edit_complete_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/image_edit_complete_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tokens::tokens::media_files::MediaFileToken; use url::Url; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/media_file_deleted_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/media_file_deleted_event.rs index a77d15a0d5..b94c0f4a97 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/media_file_deleted_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/media_file_deleted_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tokens::tokens::media_files::MediaFileToken; use url::Url; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/object_generation_complete_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/object_generation_complete_event.rs index 43b2311886..063cc547a4 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/object_generation_complete_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/object_generation_complete_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tokens::tokens::media_files::MediaFileToken; use url::Url; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/refresh_account_state_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/refresh_account_state_event.rs index 56d55ad94f..aed823cc89 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/refresh_account_state_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/refresh_account_state_event.rs @@ -1,6 +1,6 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; /// Send a signal to the frontend that an account state has changed: login, diff --git a/crates/desktop/artcraft/src/core/events/functional_events/show_provider_billing_modal_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/show_provider_billing_modal_event.rs index 1aaa4b5102..0f59e72d11 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/show_provider_billing_modal_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/show_provider_billing_modal_event.rs @@ -1,6 +1,6 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tauri::AppHandle; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/show_provider_login_modal_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/show_provider_login_modal_event.rs index 9e4726c367..f7de08b129 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/show_provider_login_modal_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/show_provider_login_modal_event.rs @@ -1,6 +1,6 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::common::generation_provider::GenerationProvider; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tauri::AppHandle; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/subscription_plan_changed_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/subscription_plan_changed_event.rs index 78174ce4b8..0657f1df13 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/subscription_plan_changed_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/subscription_plan_changed_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tokens::tokens::media_files::MediaFileToken; use url::Url; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/text_to_image_generation_complete_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/text_to_image_generation_complete_event.rs index 31736a94bd..1295e7293e 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/text_to_image_generation_complete_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/text_to_image_generation_complete_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tokens::tokens::media_files::MediaFileToken; use url::Url; diff --git a/crates/desktop/artcraft/src/core/events/functional_events/video_generation_complete_event.rs b/crates/desktop/artcraft/src/core/events/functional_events/video_generation_complete_event.rs index 5e20bcf548..80a07b0f03 100644 --- a/crates/desktop/artcraft/src/core/events/functional_events/video_generation_complete_event.rs +++ b/crates/desktop/artcraft/src/core/events/functional_events/video_generation_complete_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use tokens::tokens::media_files::MediaFileToken; use url::Url; diff --git a/crates/desktop/artcraft/src/core/events/generation_events/generation_complete_event.rs b/crates/desktop/artcraft/src/core/events/generation_events/generation_complete_event.rs index e1c225dc41..cf086e0f50 100644 --- a/crates/desktop/artcraft/src/core/events/generation_events/generation_complete_event.rs +++ b/crates/desktop/artcraft/src/core/events/generation_events/generation_complete_event.rs @@ -1,6 +1,6 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; #[derive(Clone, Debug, Serialize)] diff --git a/crates/desktop/artcraft/src/core/events/generation_events/generation_enqueue_failure_event.rs b/crates/desktop/artcraft/src/core/events/generation_events/generation_enqueue_failure_event.rs index c55620f983..3bfbf53d3a 100644 --- a/crates/desktop/artcraft/src/core/events/generation_events/generation_enqueue_failure_event.rs +++ b/crates/desktop/artcraft/src/core/events/generation_events/generation_enqueue_failure_event.rs @@ -1,6 +1,6 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; #[derive(Clone, Debug, Serialize)] diff --git a/crates/desktop/artcraft/src/core/events/generation_events/generation_enqueue_success_event.rs b/crates/desktop/artcraft/src/core/events/generation_events/generation_enqueue_success_event.rs index 7737d3477a..377e912b85 100644 --- a/crates/desktop/artcraft/src/core/events/generation_events/generation_enqueue_success_event.rs +++ b/crates/desktop/artcraft/src/core/events/generation_events/generation_enqueue_success_event.rs @@ -1,6 +1,6 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; #[derive(Clone, Debug, Serialize)] diff --git a/crates/desktop/artcraft/src/core/events/generation_events/generation_failed_event.rs b/crates/desktop/artcraft/src/core/events/generation_events/generation_failed_event.rs index f4d580fc43..f422de40a5 100644 --- a/crates/desktop/artcraft/src/core/events/generation_events/generation_failed_event.rs +++ b/crates/desktop/artcraft/src/core/events/generation_events/generation_failed_event.rs @@ -1,6 +1,6 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; #[derive(Clone, Debug, Serialize)] diff --git a/crates/desktop/artcraft/src/core/events/warning_events/flash_file_download_error_event.rs b/crates/desktop/artcraft/src/core/events/warning_events/flash_file_download_error_event.rs index a1bea798a4..5e3dc8c2c6 100644 --- a/crates/desktop/artcraft/src/core/events/warning_events/flash_file_download_error_event.rs +++ b/crates/desktop/artcraft/src/core/events/warning_events/flash_file_download_error_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; use std::path::PathBuf; diff --git a/crates/desktop/artcraft/src/core/events/warning_events/flash_user_input_error_event.rs b/crates/desktop/artcraft/src/core/events/warning_events/flash_user_input_error_event.rs index 8586d52a34..fa0dded493 100644 --- a/crates/desktop/artcraft/src/core/events/warning_events/flash_user_input_error_event.rs +++ b/crates/desktop/artcraft/src/core/events/warning_events/flash_user_input_error_event.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::{BasicEventStatus, BasicSendableEvent}; -use enums::tauri::ux::tauri_event_name::TauriEventName; +use enums_db::tauri::ux::tauri_event_name::TauriEventName; use serde_derive::Serialize; #[derive(Clone, Debug, Serialize)] diff --git a/crates/desktop/artcraft/src/core/utils/enum_conversion/generation_provider.rs b/crates/desktop/artcraft/src/core/utils/enum_conversion/generation_provider.rs index 991747a68e..9c062a2b8b 100644 --- a/crates/desktop/artcraft/src/core/utils/enum_conversion/generation_provider.rs +++ b/crates/desktop/artcraft/src/core/utils/enum_conversion/generation_provider.rs @@ -1,5 +1,5 @@ use crate::core::events::generation_events::common::GenerationServiceProvider; -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; // TODO(bt,2025-07-15): Get rid of GenerationServiceProvider pub fn to_generation_service_provider(provider: GenerationProvider) -> GenerationServiceProvider { diff --git a/crates/desktop/artcraft/src/core/utils/enum_conversion/task_type.rs b/crates/desktop/artcraft/src/core/utils/enum_conversion/task_type.rs index 79054dbc2b..30e65152c6 100644 --- a/crates/desktop/artcraft/src/core/utils/enum_conversion/task_type.rs +++ b/crates/desktop/artcraft/src/core/utils/enum_conversion/task_type.rs @@ -1,5 +1,5 @@ use crate::core::events::generation_events::common::GenerationAction; -use enums::tauri::tasks::task_type::TaskType; +use enums_db::tauri::tasks::task_type::TaskType; pub fn to_generation_action(task_type: TaskType) -> GenerationAction { match task_type { diff --git a/crates/desktop/artcraft/src/core/utils/task_database_pending_statuses.rs b/crates/desktop/artcraft/src/core/utils/task_database_pending_statuses.rs index f74e5e9703..8f4e903f49 100644 --- a/crates/desktop/artcraft/src/core/utils/task_database_pending_statuses.rs +++ b/crates/desktop/artcraft/src/core/utils/task_database_pending_statuses.rs @@ -1,4 +1,4 @@ -use enums::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_status::TaskStatus; use once_cell::sync::Lazy; use std::collections::HashSet; diff --git a/crates/desktop/artcraft/src/services/grok/threads/grok_image_websocket_thread/grok_image_websocket_thread.rs b/crates/desktop/artcraft/src/services/grok/threads/grok_image_websocket_thread/grok_image_websocket_thread.rs index ce8cfb721d..aa72e23891 100644 --- a/crates/desktop/artcraft/src/services/grok/threads/grok_image_websocket_thread/grok_image_websocket_thread.rs +++ b/crates/desktop/artcraft/src/services/grok/threads/grok_image_websocket_thread/grok_image_websocket_thread.rs @@ -13,10 +13,14 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte use anyhow::anyhow; use artcraft_api_defs::prompts::create_prompt::CreatePromptRequest; use artcraft_api_defs::utils::media_links_to_thumbnail_template::media_links_to_thumbnail_template; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; -use enums::tauri::tasks::task_model_type::TaskModelType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_api::common::generation::generation_provider::GenerationProvider as ApiGenerationProvider; +use enums_db::common::model_type::ModelType; +use enums_api::common::model_type::ModelType as ApiModelType; +use enums_db::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_api::tauri::tasks::task_media_file_class::TaskMediaFileClass as ApiTaskMediaFileClass; +use enums_db::tauri::tasks::task_model_type::TaskModelType; +use enums_api::tauri::tasks::task_model_type::TaskModelType as ApiTaskModelType; use errors::AnyhowResult; use grok_client::recipes::prompt_websocket_image_with_retry::{prompt_websocket_image_with_retry, PromptWebsocketImageWithRetryArgs}; use grok_client::requests::image_websocket::create_listen_websocket::{create_listen_websocket, CreateListenWebsocketArgs}; @@ -183,8 +187,8 @@ async fn upload_images_to_storyteller( uuid_idempotency_token: generate_random_uuid(), positive_prompt: Some(prompt), negative_prompt: None, - model_type: Some(ModelType::GrokImage), - generation_provider: Some(GenerationProvider::Grok), + model_type: Some(ApiModelType::GrokImage), + generation_provider: Some(ApiGenerationProvider::Grok), }; let prompt_response = create_prompt( diff --git a/crates/desktop/artcraft/src/services/grok/threads/grok_video_task_polling/grok_video_task_polling_thread.rs b/crates/desktop/artcraft/src/services/grok/threads/grok_video_task_polling/grok_video_task_polling_thread.rs index 336b170e46..b97bc5557e 100644 --- a/crates/desktop/artcraft/src/services/grok/threads/grok_video_task_polling/grok_video_task_polling_thread.rs +++ b/crates/desktop/artcraft/src/services/grok/threads/grok_video_task_polling/grok_video_task_polling_thread.rs @@ -14,11 +14,15 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte use artcraft_api_defs::prompts::create_prompt::CreatePromptRequest; use artcraft_api_defs::utils::media_links_to_thumbnail_template::media_links_to_thumbnail_template; use cookie_store::cookie_store::CookieStore; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; -use enums::tauri::tasks::task_status::TaskStatus; +use enums_db::by_table::prompts::prompt_type::PromptType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_api::common::generation::generation_provider::GenerationProvider as ApiGenerationProvider; +use enums_db::common::model_type::ModelType; +use enums_api::common::model_type::ModelType as ApiModelType; +use enums_db::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_api::tauri::tasks::task_media_file_class::TaskMediaFileClass as ApiTaskMediaFileClass; +use enums_db::tauri::tasks::task_status::TaskStatus; +use enums_api::tauri::tasks::task_status::TaskStatus as ApiTaskStatus; use errors::AnyhowResult; use grok_client::credentials::grok_full_credentials::GrokFullCredentials; use grok_client::error::grok_error::GrokError; @@ -222,8 +226,8 @@ async fn upload_grok_video( uuid_idempotency_token: generate_random_uuid(), positive_prompt: grok_video_post.prompt.clone(), negative_prompt: None, - model_type: Some(ModelType::GrokVideo), - generation_provider: Some(GenerationProvider::Grok), + model_type: Some(ApiModelType::GrokVideo), + generation_provider: Some(ApiGenerationProvider::Grok), }; let prompt_response = create_prompt( diff --git a/crates/desktop/artcraft/src/services/grok/util/get_or_upgrade_grok_full_credentials.rs b/crates/desktop/artcraft/src/services/grok/util/get_or_upgrade_grok_full_credentials.rs index 830ac7eb84..b6d4f98568 100644 --- a/crates/desktop/artcraft/src/services/grok/util/get_or_upgrade_grok_full_credentials.rs +++ b/crates/desktop/artcraft/src/services/grok/util/get_or_upgrade_grok_full_credentials.rs @@ -1,7 +1,7 @@ use crate::core::commands::enqueue::generate_error::GenerateError; use crate::core::events::functional_events::show_provider_login_modal_event::ShowProviderLoginModalEvent; use crate::services::grok::state::grok_credential_manager::GrokCredentialManager; -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; use grok_client::credentials::grok_cookies::GrokCookies; use grok_client::credentials::grok_full_credentials::GrokFullCredentials; use grok_client::error::grok_client_error::GrokClientError; diff --git a/crates/desktop/artcraft/src/services/grok/windows/grok_login_window/grok_login_window_thread.rs b/crates/desktop/artcraft/src/services/grok/windows/grok_login_window/grok_login_window_thread.rs index 672e1d011c..b9a48bdde6 100644 --- a/crates/desktop/artcraft/src/services/grok/windows/grok_login_window/grok_login_window_thread.rs +++ b/crates/desktop/artcraft/src/services/grok/windows/grok_login_window/grok_login_window_thread.rs @@ -13,7 +13,7 @@ use crate::services::sora::state::sora_credential_manager::SoraCredentialManager use crate::services::sora::windows::sora_login_window::extract_sora_webview_cookies::extract_sora_webview_cookies; use anyhow::anyhow; use cookie_store::cookie_store::CookieStore; -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; use errors::AnyhowResult; use log::{error, info}; use openai_sora_client::creds::sora_credential_set::SoraCredentialSet; diff --git a/crates/desktop/artcraft/src/services/midjourney/threads/events/maybe_handle_text_to_image_complete_event.rs b/crates/desktop/artcraft/src/services/midjourney/threads/events/maybe_handle_text_to_image_complete_event.rs index 1f3a1449c0..0608b55c04 100644 --- a/crates/desktop/artcraft/src/services/midjourney/threads/events/maybe_handle_text_to_image_complete_event.rs +++ b/crates/desktop/artcraft/src/services/midjourney/threads/events/maybe_handle_text_to_image_complete_event.rs @@ -3,8 +3,8 @@ use crate::core::events::functional_events::text_to_image_generation_complete_ev use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use anyhow::anyhow; use artcraft_api_defs::jobs::list_session_jobs::{ListSessionJobsItem, ListSessionResultDetailsResponse}; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, warn}; use sqlite_tasks::queries::list_tasks_by_provider_and_status::{list_tasks_by_provider_and_status, ListTasksByProviderAndStatusArgs, TaskList}; diff --git a/crates/desktop/artcraft/src/services/midjourney/threads/midjourney_long_polling_thread.rs b/crates/desktop/artcraft/src/services/midjourney/threads/midjourney_long_polling_thread.rs index 429e410cb2..24da1b6bec 100644 --- a/crates/desktop/artcraft/src/services/midjourney/threads/midjourney_long_polling_thread.rs +++ b/crates/desktop/artcraft/src/services/midjourney/threads/midjourney_long_polling_thread.rs @@ -13,11 +13,15 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte use artcraft_api_defs::prompts::create_prompt::CreatePromptRequest; use artcraft_api_defs::utils::media_links_to_thumbnail_template::media_links_to_thumbnail_template; use cookie_store::cookie_store::CookieStore; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; -use enums::tauri::tasks::task_status::TaskStatus; +use enums_db::by_table::prompts::prompt_type::PromptType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_api::common::generation::generation_provider::GenerationProvider as ApiGenerationProvider; +use enums_db::common::model_type::ModelType; +use enums_api::common::model_type::ModelType as ApiModelType; +use enums_db::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_api::tauri::tasks::task_media_file_class::TaskMediaFileClass as ApiTaskMediaFileClass; +use enums_db::tauri::tasks::task_status::TaskStatus; +use enums_api::tauri::tasks::task_status::TaskStatus as ApiTaskStatus; use errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; @@ -251,8 +255,8 @@ async fn upload_midjourney_batch( uuid_idempotency_token: generate_random_uuid(), positive_prompt: midjourney_item.full_command.clone(), negative_prompt: None, - model_type: Some(model_type), - generation_provider: Some(GenerationProvider::Midjourney), + model_type: Some(enums_convert::common::model_type::model_type_to_api(&model_type)), + generation_provider: Some(ApiGenerationProvider::Midjourney), }; let prompt_response = create_prompt( diff --git a/crates/desktop/artcraft/src/services/midjourney/windows/midjourney_login_window_thread.rs b/crates/desktop/artcraft/src/services/midjourney/windows/midjourney_login_window_thread.rs index 55a267eb51..039d1572d7 100644 --- a/crates/desktop/artcraft/src/services/midjourney/windows/midjourney_login_window_thread.rs +++ b/crates/desktop/artcraft/src/services/midjourney/windows/midjourney_login_window_thread.rs @@ -14,7 +14,7 @@ use crate::services::sora::state::sora_credential_manager::SoraCredentialManager use crate::services::sora::windows::sora_login_window::extract_sora_webview_cookies::extract_sora_webview_cookies; use anyhow::anyhow; use cookie_store::cookie_store::CookieStore; -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; use errors::AnyhowResult; use log::{error, info}; use midjourney_client::client::midjourney_hostname::MidjourneyHostname; diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_failed_generations.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_failed_generations.rs index f5635c1c66..33baf2fba7 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_failed_generations.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_failed_generations.rs @@ -6,7 +6,7 @@ use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::core::state::task_database::TaskDatabase; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use crate::services::sora::threads::sora_task_polling::helpers::handle_successful_generations::GenerationItem; -use enums::tauri::tasks::task_status; +use enums_db::tauri::tasks::task_status; use errors::AnyhowResult; use log::info; use openai_sora_client::requests::common::task_id::TaskId; diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs index 15b54c8b95..a6fff0f534 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs @@ -15,10 +15,13 @@ use crate::services::sora::threads::sora_task_polling::helpers::upload_generatio use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::prompts::create_prompt::CreatePromptRequest; use artcraft_api_defs::utils::media_links_to_thumbnail_template::media_links_to_thumbnail_template; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; -use enums::tauri::tasks::task_status; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_api::common::generation::generation_provider::GenerationProvider as ApiGenerationProvider; +use enums_db::common::model_type::ModelType; +use enums_api::common::model_type::ModelType as ApiModelType; +use enums_db::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_api::tauri::tasks::task_media_file_class::TaskMediaFileClass as ApiTaskMediaFileClass; +use enums_db::tauri::tasks::task_status; use errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info, warn}; @@ -89,8 +92,8 @@ pub async fn handle_classic_successful_generations( uuid_idempotency_token: generate_random_uuid(), positive_prompt: generation.prompt.clone(), negative_prompt: None, - model_type: Some(generation.model_type), - generation_provider: Some(GenerationProvider::Sora), + model_type: Some(enums_convert::common::model_type::model_type_to_api(&generation.model_type)), + generation_provider: Some(ApiGenerationProvider::Sora), }; let prompt_response = create_prompt( diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_classic_sora_tasks.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_classic_sora_tasks.rs index 9a85ad3f6a..f3f7fb79f7 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_classic_sora_tasks.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_classic_sora_tasks.rs @@ -15,9 +15,9 @@ use crate::services::sora::threads::sora_task_polling::helpers::handle_failed_ge use crate::services::sora::threads::sora_task_polling::helpers::handle_successful_generations::{handle_classic_successful_generations, GenerationItem, SuccessfulGeneration}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::prompts::create_prompt::CreatePromptRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::tauri::tasks::task_status; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::common::model_type::ModelType; +use enums_db::tauri::tasks::task_status; use errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_sora_2_tasks.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_sora_2_tasks.rs index 8ef9d1ea38..bd30eea5aa 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_sora_2_tasks.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_sora_2_tasks.rs @@ -15,9 +15,9 @@ use crate::services::sora::threads::sora_task_polling::helpers::handle_failed_ge use crate::services::sora::threads::sora_task_polling::helpers::handle_successful_generations::{handle_classic_successful_generations, GenerationItem, SuccessfulGeneration}; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::prompts::create_prompt::CreatePromptRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::tauri::tasks::task_status; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::common::model_type::ModelType; +use enums_db::tauri::tasks::task_status; use errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/sora_task_polling_thread.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/sora_task_polling_thread.rs index e56f0c0092..a6030c8db4 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/sora_task_polling_thread.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/sora_task_polling_thread.rs @@ -16,9 +16,9 @@ use crate::services::sora::threads::sora_task_polling::helpers::poll_classic_sor use crate::services::sora::threads::sora_task_polling::helpers::poll_sora_2_tasks::poll_sora_2_tasks; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use artcraft_api_defs::prompts::create_prompt::CreatePromptRequest; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::tauri::tasks::task_status; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::common::model_type::ModelType; +use enums_db::tauri::tasks::task_status; use errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/services/sora/windows/sora_login_window/sora_login_thread.rs b/crates/desktop/artcraft/src/services/sora/windows/sora_login_window/sora_login_thread.rs index e7d6fe5614..6f1aaa8df0 100644 --- a/crates/desktop/artcraft/src/services/sora/windows/sora_login_window/sora_login_thread.rs +++ b/crates/desktop/artcraft/src/services/sora/windows/sora_login_window/sora_login_thread.rs @@ -8,7 +8,7 @@ use crate::services::sora::state::sora_credential_manager::SoraCredentialManager use crate::services::sora::windows::sora_login_window::extract_sora_webview_cookies::extract_sora_webview_cookies; use crate::services::sora::windows::sora_login_window::open_sora_login_window::LOGIN_WINDOW_NAME; use anyhow::anyhow; -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; use errors::AnyhowResult; use log::{error, info}; use openai_sora_client::creds::sora_credential_set::SoraCredentialSet; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_credits_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_credits_command.rs index a47cba35a6..0d8605003d 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_credits_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_credits_command.rs @@ -9,10 +9,10 @@ use crate::services::sora::windows::sora_login_window::open_sora_login_window::o use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use crate::services::storyteller::windows::open_storyteller_billing_window::{open_storyteller_billing_window, OpenStorytellerBillingWindowArgs, BillingWindowCase}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::PlanBillingCadence; -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::common::payments_namespace::PaymentsNamespace; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::payments_namespace::PaymentsNamespace; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, info}; use serde_derive::{Deserialize, Serialize}; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_subscription_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_subscription_command.rs index 031d92e0cc..576bdd2f12 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_subscription_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_subscription_command.rs @@ -12,10 +12,10 @@ use crate::services::sora::windows::sora_login_window::open_sora_login_window::o use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use crate::services::storyteller::windows::open_storyteller_billing_window::{open_storyteller_billing_window, OpenStorytellerBillingWindowArgs, BillingWindowCase}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::PlanBillingCadence; -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::common::payments_namespace::PaymentsNamespace; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::payments_namespace::PaymentsNamespace; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, info}; use serde_derive::{Deserialize, Serialize}; @@ -82,7 +82,7 @@ async fn get( Ok(GetSubscriptionResponse { active_subscription: response.active_subscription .map(|sub| { - let product_slug = match ArtcraftSubscriptionSlug::from_str(&sub.product_slug) { + let product_slug = match serde_json::from_str::(&format!("\"{}\"", &sub.product_slug)) { Ok(product_slug) => product_slug, Err(err) => { error!("Received unknown product slug from storyteller: {:?}, error: {:?}", sub.product_slug, err); diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_credits_purchase_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_credits_purchase_command.rs index 6e34588193..8400bb221d 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_credits_purchase_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_credits_purchase_command.rs @@ -7,9 +7,9 @@ use crate::services::sora::windows::sora_login_window::open_sora_login_window::o use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use crate::services::storyteller::windows::open_storyteller_billing_window::{open_storyteller_billing_window, OpenStorytellerBillingWindowArgs, BillingWindowCase}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::PlanBillingCadence; -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_subscription_purchase_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_subscription_purchase_command.rs index 3c7b39c517..4ee0a35bd0 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_subscription_purchase_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_subscription_purchase_command.rs @@ -7,8 +7,8 @@ use crate::services::sora::windows::sora_login_window::open_sora_login_window::o use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use crate::services::storyteller::windows::open_storyteller_billing_window::{open_storyteller_billing_window, OpenStorytellerBillingWindowArgs, BillingWindowCase}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::PlanBillingCadence; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_cancel_plan_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_cancel_plan_command.rs index 057d4dbf92..23f77719d9 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_cancel_plan_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_cancel_plan_command.rs @@ -7,9 +7,9 @@ use crate::services::sora::windows::sora_login_window::open_sora_login_window::o use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use crate::services::storyteller::windows::open_storyteller_billing_window::{open_storyteller_billing_window, BillingWindowCase, OpenStorytellerBillingWindowArgs}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::PlanBillingCadence; -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_manage_plan_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_manage_plan_command.rs index 6b217c11ae..88085fc495 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_manage_plan_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_manage_plan_command.rs @@ -7,9 +7,9 @@ use crate::services::sora::windows::sora_login_window::open_sora_login_window::o use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use crate::services::storyteller::windows::open_storyteller_billing_window::{open_storyteller_billing_window, BillingWindowCase, OpenStorytellerBillingWindowArgs}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::PlanBillingCadence; -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_switch_plan_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_switch_plan_command.rs index d4ef00b883..d448738ede 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_switch_plan_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_switch_plan_command.rs @@ -8,9 +8,9 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte use crate::services::storyteller::windows::open_storyteller_billing_window::{open_storyteller_billing_window, BillingWindowCase, OpenStorytellerBillingWindowArgs}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::PlanBillingCadence; use artcraft_api_defs::stripe_artcraft::customer_portal_switch_plan::PlanBillingCadenceConfirmation; -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_update_payment_method_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_update_payment_method_command.rs index d04fac37f1..9b27fc7e06 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_update_payment_method_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_update_payment_method_command.rs @@ -8,9 +8,9 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte use crate::services::storyteller::windows::open_storyteller_billing_window::{open_storyteller_billing_window, BillingWindowCase, OpenStorytellerBillingWindowArgs}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::PlanBillingCadence; use artcraft_api_defs::stripe_artcraft::customer_portal_switch_plan::PlanBillingCadenceConfirmation; -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_frontend_caller_notification.rs b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_frontend_caller_notification.rs index 5684ddd7f8..5f16555855 100644 --- a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_frontend_caller_notification.rs +++ b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_frontend_caller_notification.rs @@ -9,8 +9,8 @@ use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use anyhow::anyhow; use artcraft_api_defs::jobs::list_session_jobs::{ListSessionJobsItem, ListSessionResultDetailsResponse}; use artcraft_api_defs::utils::media_links_to_thumbnail_template::media_links_to_thumbnail_template; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, warn}; use sqlite_tasks::queries::list_tasks_by_provider_and_tokens::{list_tasks_by_provider_and_tokens, ListTasksArgs}; diff --git a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_inpainting_complete_event.rs b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_inpainting_complete_event.rs index c1e6e24791..3639439faf 100644 --- a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_inpainting_complete_event.rs +++ b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_inpainting_complete_event.rs @@ -5,8 +5,8 @@ use crate::core::events::generation_events::generation_complete_event::Generatio use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use anyhow::anyhow; use artcraft_api_defs::jobs::list_session_jobs::{ListSessionJobsItem, ListSessionResultDetailsResponse}; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, warn}; use sqlite_tasks::queries::list_tasks_by_provider_and_tokens::{list_tasks_by_provider_and_tokens, ListTasksArgs}; diff --git a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_text_to_image_complete_event.rs b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_text_to_image_complete_event.rs index d3bffd2d0f..860e1be4b7 100644 --- a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_text_to_image_complete_event.rs +++ b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_text_to_image_complete_event.rs @@ -3,8 +3,8 @@ use crate::core::events::functional_events::text_to_image_generation_complete_ev use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use anyhow::anyhow; use artcraft_api_defs::jobs::list_session_jobs::{ListSessionJobsItem, ListSessionResultDetailsResponse}; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::{error, warn}; use sqlite_tasks::queries::list_tasks_by_provider_and_tokens::{list_tasks_by_provider_and_tokens, ListTasksArgs}; diff --git a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_send_background_removal_complete_event.rs b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_send_background_removal_complete_event.rs index f5fa250e7d..23274f84e0 100644 --- a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_send_background_removal_complete_event.rs +++ b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_send_background_removal_complete_event.rs @@ -2,8 +2,8 @@ use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::functional_events::canvas_background_removal_complete_event::CanvasBackgroundRemovalCompleteEvent; use crate::core::events::generation_events::generation_complete_event::GenerationCompleteEvent; use artcraft_api_defs::jobs::list_session_jobs::ListSessionJobsItem; -use enums::tauri::tasks::task_type::TaskType; -use enums::tauri::ux::tauri_command_caller::TauriCommandCaller; +use enums_db::tauri::tasks::task_type::TaskType; +use enums_db::tauri::ux::tauri_command_caller::TauriCommandCaller; use errors::AnyhowResult; use log::error; use sqlite_tasks::queries::list_tasks_by_provider_and_tokens::{list_tasks_by_provider_and_tokens, ListTasksArgs}; diff --git a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/handle_storyteller_failed_job.rs b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/handle_storyteller_failed_job.rs index 3582d46922..758d0731a9 100644 --- a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/handle_storyteller_failed_job.rs +++ b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/handle_storyteller_failed_job.rs @@ -4,13 +4,13 @@ use crate::core::state::task_database::TaskDatabase; use crate::core::utils::enum_conversion::generation_provider::to_generation_service_provider; use crate::core::utils::enum_conversion::task_type::to_generation_action; use artcraft_api_defs::jobs::list_session_jobs::ListSessionJobsItem; -use enums::tauri::tasks::task_status::TaskStatus; +use enums_db::tauri::tasks::task_status::TaskStatus; use errors::AnyhowResult; use log::info; use sqlite_tasks::queries::task::Task; use sqlite_tasks::queries::update_task_status::{update_task_status, UpdateTaskArgs}; use tauri::AppHandle; -use enums::tauri::tasks::task_failure_type::TaskFailureType; +use enums_db::tauri::tasks::task_failure_type::TaskFailureType; use sqlite_tasks::queries::update_task_status_with_rich_failure::{update_task_status_with_rich_failure, UpdateTaskWithRichFailureArgs}; pub async fn handle_failed_job( @@ -24,7 +24,11 @@ pub async fn handle_failed_job( let maybe_failure_type = job.status .maybe_failure_category_updated .as_ref() - .map(|val| TaskFailureType::from_frontend_failure_category_for_api(val)); + .and_then(|val| { + let json = serde_json::to_string(&val).ok()?; + let db_category = serde_json::from_str(&json).ok()?; + Some(TaskFailureType::from_frontend_failure_category(db_category)) + }); let maybe_failure_message = job.status.maybe_failure_message.as_deref(); diff --git a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/handle_storyteller_successful_job.rs b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/handle_storyteller_successful_job.rs index 679dc03776..263d1ce80b 100644 --- a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/handle_storyteller_successful_job.rs +++ b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/handle_storyteller_successful_job.rs @@ -10,8 +10,9 @@ use super::events::maybe_handle_frontend_caller_notification::maybe_handle_front use artcraft_api_defs::jobs::list_session_jobs::ListSessionJobsItem; use artcraft_api_defs::utils::media_links_to_thumbnail_template::media_links_to_thumbnail_template; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_api::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_api::tauri::tasks::task_media_file_class::TaskMediaFileClass as ApiTaskMediaFileClass; use errors::AnyhowResult; use log::error; use log::info; diff --git a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/storyteller_task_polling_thread.rs b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/storyteller_task_polling_thread.rs index ee94c674e6..f1de2d1d14 100644 --- a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/storyteller_task_polling_thread.rs +++ b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/storyteller_task_polling_thread.rs @@ -7,9 +7,11 @@ use anyhow::anyhow; use artcraft_client::endpoints::jobs::list_session_jobs::{list_session_jobs, States}; use artcraft_client::error::api_error::ApiError; use artcraft_client::error::storyteller_error::StorytellerError; -use enums::common::generation_provider::GenerationProvider; -use enums::common::job_status_plus::JobStatusPlus; -use enums::tauri::tasks::task_status::TaskStatus; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_api::common::generation::generation_provider::GenerationProvider as ApiGenerationProvider; +use enums_api::common::job_status_plus::JobStatusPlus; +use enums_db::tauri::tasks::task_status::TaskStatus; +use enums_api::tauri::tasks::task_status::TaskStatus as ApiTaskStatus; use errors::AnyhowResult; use log::error; use sqlite_tasks::queries::list_tasks_by_provider_and_tokens::{list_tasks_by_provider_and_tokens, ListTasksArgs}; diff --git a/crates/desktop/artcraft/src/services/storyteller/windows/open_storyteller_billing_window.rs b/crates/desktop/artcraft/src/services/storyteller/windows/open_storyteller_billing_window.rs index 0f228059f7..b22d80284d 100644 --- a/crates/desktop/artcraft/src/services/storyteller/windows/open_storyteller_billing_window.rs +++ b/crates/desktop/artcraft/src/services/storyteller/windows/open_storyteller_billing_window.rs @@ -10,8 +10,8 @@ use artcraft_api_defs::stripe_artcraft::customer_portal_cancel_plan::StripeArtcr use artcraft_api_defs::stripe_artcraft::customer_portal_manage_plan::StripeArtcraftCustomerPortalManagePlanRequest; use artcraft_api_defs::stripe_artcraft::customer_portal_switch_plan::{PlanBillingCadenceConfirmation, StripeArtcraftCustomerPortalSwitchPlanRequest}; use artcraft_api_defs::stripe_artcraft::customer_portal_update_payment_method::StripeArtcraftCustomerPortalUpdatePaymentMethodRequest; -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use errors::AnyhowResult; use log::info; use reqwest::Url; diff --git a/crates/desktop/artcraft/src/services/storyteller/windows/storyteller_billing_window_thread.rs b/crates/desktop/artcraft/src/services/storyteller/windows/storyteller_billing_window_thread.rs index 2f44f0b68f..6a5ce14959 100644 --- a/crates/desktop/artcraft/src/services/storyteller/windows/storyteller_billing_window_thread.rs +++ b/crates/desktop/artcraft/src/services/storyteller/windows/storyteller_billing_window_thread.rs @@ -16,7 +16,7 @@ use crate::services::sora::windows::sora_login_window::extract_sora_webview_cook use crate::services::storyteller::windows::open_storyteller_billing_window::BILLING_WINDOW_NAME; use anyhow::anyhow; use cookie_store::cookie_store::CookieStore; -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; use errors::AnyhowResult; use log::{error, info}; use midjourney_client::client::midjourney_hostname::MidjourneyHostname; diff --git a/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs b/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs index 81821fb460..24f0163c77 100644 --- a/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs +++ b/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs @@ -16,11 +16,11 @@ use crate::services::worldlabs::state::worldlabs_credential_manager::WorldlabsCr use artcraft_api_defs::prompts::create_prompt::CreatePromptRequest; use artcraft_api_defs::utils::media_links_to_thumbnail_template::media_links_to_thumbnail_template; use cookie_store::cookie_store::CookieStore; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; -use enums::tauri::tasks::task_status::TaskStatus; +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 enums_db::tauri::tasks::task_media_file_class::TaskMediaFileClass; +use enums_db::tauri::tasks::task_status::TaskStatus; use errors::AnyhowResult; use futures::poll; use grok_client::credentials::grok_full_credentials::GrokFullCredentials; diff --git a/crates/desktop/artcraft/src/services/worldlabs/windows/worldlabs_login_window/worldlabs_login_window_thread.rs b/crates/desktop/artcraft/src/services/worldlabs/windows/worldlabs_login_window/worldlabs_login_window_thread.rs index d8d0640d77..6266b45d86 100644 --- a/crates/desktop/artcraft/src/services/worldlabs/windows/worldlabs_login_window/worldlabs_login_window_thread.rs +++ b/crates/desktop/artcraft/src/services/worldlabs/windows/worldlabs_login_window/worldlabs_login_window_thread.rs @@ -17,7 +17,7 @@ use crate::services::worldlabs::windows::worldlabs_login_window::worldlabs_login use crate::services::worldlabs::windows::worldlabs_login_window::worldlabs_login_window_open::WORLDLABS_LOGIN_WINDOW_NAME; use anyhow::anyhow; use cookie_store::cookie_store::CookieStore; -use enums::common::generation_provider::GenerationProvider; +use enums_db::common::generation::generation_provider::GenerationProvider; use errors::AnyhowResult; use log::{error, info}; use openai_sora_client::creds::sora_credential_set::SoraCredentialSet; diff --git a/crates/schema/public/enums_db/src/by_table/beta_keys/beta_key_product.rs b/crates/schema/public/enums_db/src/by_table/beta_keys/beta_key_product.rs index ef945796f3..7058b95641 100644 --- a/crates/schema/public/enums_db/src/by_table/beta_keys/beta_key_product.rs +++ b/crates/schema/public/enums_db/src/by_table/beta_keys/beta_key_product.rs @@ -3,6 +3,7 @@ use strum::EnumIter; /// Used in the `batch_generations` table in a `VARCHAR(32)` field named `entity_type`. #[derive(Clone, Copy, Eq, PartialEq, Hash, Deserialize, Serialize, Ord, PartialOrd, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum BetaKeyProduct { /// Media files /// This will probably be the only type supported, but we'll leave the possibility of future types. diff --git a/crates/schema/public/enums_db/src/by_table/comments/comment_entity_type.rs b/crates/schema/public/enums_db/src/by_table/comments/comment_entity_type.rs index e313219739..37d2c1ff06 100644 --- a/crates/schema/public/enums_db/src/by_table/comments/comment_entity_type.rs +++ b/crates/schema/public/enums_db/src/by_table/comments/comment_entity_type.rs @@ -3,6 +3,7 @@ use strum::EnumIter; /// Used in the `comments` table in a `VARCHAR(32)` field named `entity_type`. #[derive(Clone, Copy, Eq, PartialEq, Hash, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum CommentEntityType { /// User #[serde(rename = "user")] diff --git a/crates/schema/public/enums_db/src/by_table/featured_items/featured_item_entity_type.rs b/crates/schema/public/enums_db/src/by_table/featured_items/featured_item_entity_type.rs index 82d6144fcd..96d9c998cf 100644 --- a/crates/schema/public/enums_db/src/by_table/featured_items/featured_item_entity_type.rs +++ b/crates/schema/public/enums_db/src/by_table/featured_items/featured_item_entity_type.rs @@ -3,6 +3,7 @@ use strum::EnumIter; /// Used in the `user_bookmarks` table in a `VARCHAR(32)` field named `entity_type`. #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum FeaturedItemEntityType { /// MediaFile #[serde(rename = "media_file")] diff --git a/crates/schema/public/enums_db/src/by_table/generic_inference_jobs/frontend_failure_category.rs b/crates/schema/public/enums_db/src/by_table/generic_inference_jobs/frontend_failure_category.rs index 8bb440971e..e24c0dfcc2 100644 --- a/crates/schema/public/enums_db/src/by_table/generic_inference_jobs/frontend_failure_category.rs +++ b/crates/schema/public/enums_db/src/by_table/generic_inference_jobs/frontend_failure_category.rs @@ -16,6 +16,7 @@ use strum::EnumIter; /// /// YOU CAN ADD NEW VALUES, BUT DO NOT CHANGE EXISTING VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum FrontendFailureCategory { /// When a face is not detected in the image used for animation. /// For SadTalker (and possibly Wav2Lip) diff --git a/crates/schema/public/enums_db/src/by_table/generic_inference_jobs/inference_category.rs b/crates/schema/public/enums_db/src/by_table/generic_inference_jobs/inference_category.rs index 5b63ed2fa2..ff69bd8005 100644 --- a/crates/schema/public/enums_db/src/by_table/generic_inference_jobs/inference_category.rs +++ b/crates/schema/public/enums_db/src/by_table/generic_inference_jobs/inference_category.rs @@ -9,6 +9,7 @@ use strum::EnumIter; /// /// YOU CAN ADD NEW VALUES, BUT DO NOT CHANGE EXISTING VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, Default, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum InferenceCategory { /// Deprecate this field !!! /// We should drain all jobs from using this database field, then remove it. diff --git a/crates/schema/public/enums_db/src/by_table/media_files/media_file_animation_type.rs b/crates/schema/public/enums_db/src/by_table/media_files/media_file_animation_type.rs index da939798c3..495bbb1976 100644 --- a/crates/schema/public/enums_db/src/by_table/media_files/media_file_animation_type.rs +++ b/crates/schema/public/enums_db/src/by_table/media_files/media_file_animation_type.rs @@ -5,6 +5,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum MediaFileAnimationType { /// Body: No body animation or rig. diff --git a/crates/schema/public/enums_db/src/by_table/media_files/media_file_class.rs b/crates/schema/public/enums_db/src/by_table/media_files/media_file_class.rs index af3470ba86..b06aadd378 100644 --- a/crates/schema/public/enums_db/src/by_table/media_files/media_file_class.rs +++ b/crates/schema/public/enums_db/src/by_table/media_files/media_file_class.rs @@ -5,6 +5,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum MediaFileClass { /// Unknown (default value) diff --git a/crates/schema/public/enums_db/src/by_table/media_files/media_file_engine_category.rs b/crates/schema/public/enums_db/src/by_table/media_files/media_file_engine_category.rs index 07ec9d0676..1cc625b859 100644 --- a/crates/schema/public/enums_db/src/by_table/media_files/media_file_engine_category.rs +++ b/crates/schema/public/enums_db/src/by_table/media_files/media_file_engine_category.rs @@ -5,6 +5,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum MediaFileEngineCategory { /// A 3D scene full of objects, characters, animations, etc. diff --git a/crates/schema/public/enums_db/src/by_table/media_files/media_file_origin_category.rs b/crates/schema/public/enums_db/src/by_table/media_files/media_file_origin_category.rs index 330d3638c0..040479f036 100644 --- a/crates/schema/public/enums_db/src/by_table/media_files/media_file_origin_category.rs +++ b/crates/schema/public/enums_db/src/by_table/media_files/media_file_origin_category.rs @@ -5,6 +5,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum MediaFileOriginCategory { /// ML model inference output - uploaded models or zero shot. diff --git a/crates/schema/public/enums_db/src/by_table/media_files/media_file_origin_product_category.rs b/crates/schema/public/enums_db/src/by_table/media_files/media_file_origin_product_category.rs index 5e42105e32..90c2110531 100644 --- a/crates/schema/public/enums_db/src/by_table/media_files/media_file_origin_product_category.rs +++ b/crates/schema/public/enums_db/src/by_table/media_files/media_file_origin_product_category.rs @@ -10,6 +10,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum MediaFileOriginProductCategory { /// Unknown which product is attached to the file (generated the file, the file was /// uploaded on behalf of, etc.) diff --git a/crates/schema/public/enums_db/src/by_table/media_files/media_file_subtype.rs b/crates/schema/public/enums_db/src/by_table/media_files/media_file_subtype.rs index b801560ba3..6beca1a884 100644 --- a/crates/schema/public/enums_db/src/by_table/media_files/media_file_subtype.rs +++ b/crates/schema/public/enums_db/src/by_table/media_files/media_file_subtype.rs @@ -5,6 +5,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] #[deprecated(note = "This was primarily for Bevy")] pub enum MediaFileSubtype { diff --git a/crates/schema/public/enums_db/src/by_table/media_files/media_file_type.rs b/crates/schema/public/enums_db/src/by_table/media_files/media_file_type.rs index 03ef90139d..9717dc3f88 100644 --- a/crates/schema/public/enums_db/src/by_table/media_files/media_file_type.rs +++ b/crates/schema/public/enums_db/src/by_table/media_files/media_file_type.rs @@ -5,6 +5,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum MediaFileType { // TODO(bt): Deprecate and split into audio mime types; use media_class to represent broadly diff --git a/crates/schema/public/enums_db/src/by_table/model_weights/weights_category.rs b/crates/schema/public/enums_db/src/by_table/model_weights/weights_category.rs index 976a4c98f0..ea797d90b1 100644 --- a/crates/schema/public/enums_db/src/by_table/model_weights/weights_category.rs +++ b/crates/schema/public/enums_db/src/by_table/model_weights/weights_category.rs @@ -2,6 +2,7 @@ use strum::EnumCount; use strum::EnumIter; #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum WeightsCategory { #[serde(rename = "image_generation")] ImageGeneration, diff --git a/crates/schema/public/enums_db/src/by_table/model_weights/weights_types.rs b/crates/schema/public/enums_db/src/by_table/model_weights/weights_types.rs index 7a08a41540..263c82a048 100644 --- a/crates/schema/public/enums_db/src/by_table/model_weights/weights_types.rs +++ b/crates/schema/public/enums_db/src/by_table/model_weights/weights_types.rs @@ -2,6 +2,7 @@ use strum::EnumCount; use strum::EnumIter; #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum WeightsType { #[serde(rename = "hifigan_tt2")] HifiganTacotron2, diff --git a/crates/schema/public/enums_db/src/by_table/prompt_context_items/prompt_context_semantic_type.rs b/crates/schema/public/enums_db/src/by_table/prompt_context_items/prompt_context_semantic_type.rs index ce2b0147b7..23cb8641b4 100644 --- a/crates/schema/public/enums_db/src/by_table/prompt_context_items/prompt_context_semantic_type.rs +++ b/crates/schema/public/enums_db/src/by_table/prompt_context_items/prompt_context_semantic_type.rs @@ -15,6 +15,7 @@ vidref /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum PromptContextSemanticType { /// Image-to-Video starting frame diff --git a/crates/schema/public/enums_db/src/by_table/prompts/prompt_type.rs b/crates/schema/public/enums_db/src/by_table/prompts/prompt_type.rs index df96428b7e..3d86545e47 100644 --- a/crates/schema/public/enums_db/src/by_table/prompts/prompt_type.rs +++ b/crates/schema/public/enums_db/src/by_table/prompts/prompt_type.rs @@ -5,6 +5,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum PromptType { /// Artcraft (App) diff --git a/crates/schema/public/enums_db/src/by_table/tag_uses/tag_use_entity_type.rs b/crates/schema/public/enums_db/src/by_table/tag_uses/tag_use_entity_type.rs index dc947c5ff8..6d6d101eaa 100644 --- a/crates/schema/public/enums_db/src/by_table/tag_uses/tag_use_entity_type.rs +++ b/crates/schema/public/enums_db/src/by_table/tag_uses/tag_use_entity_type.rs @@ -3,6 +3,7 @@ use strum::EnumIter; /// Used in the `tag_uses` table in a `VARCHAR(32)` field named `entity_type`. #[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum TagUseEntityType { /// Media files #[serde(rename = "media_file")] diff --git a/crates/schema/public/enums_db/src/by_table/user_bookmarks/user_bookmark_entity_type.rs b/crates/schema/public/enums_db/src/by_table/user_bookmarks/user_bookmark_entity_type.rs index 87d5c0cfa6..e100bc6c8c 100644 --- a/crates/schema/public/enums_db/src/by_table/user_bookmarks/user_bookmark_entity_type.rs +++ b/crates/schema/public/enums_db/src/by_table/user_bookmarks/user_bookmark_entity_type.rs @@ -3,6 +3,7 @@ use strum::EnumIter; /// Used in the `user_bookmarks` table in a `VARCHAR(32)` field named `entity_type`. #[derive(Clone, Copy, Eq, PartialEq, Hash, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum UserBookmarkEntityType { /// User #[serde(rename = "user")] diff --git a/crates/schema/public/enums_db/src/by_table/user_ratings/entity_type.rs b/crates/schema/public/enums_db/src/by_table/user_ratings/entity_type.rs index 1f932557aa..16633810cf 100644 --- a/crates/schema/public/enums_db/src/by_table/user_ratings/entity_type.rs +++ b/crates/schema/public/enums_db/src/by_table/user_ratings/entity_type.rs @@ -3,6 +3,7 @@ use strum::EnumIter; /// Used in the `user_ratings` table in a `VARCHAR(32)` field named `entity_type`. #[derive(Clone, Copy, Eq, PartialEq, Hash, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] pub enum UserRatingEntityType { /// Media files (inference results, uploads, etc.) #[serde(rename = "media_file")] diff --git a/crates/schema/public/enums_db/src/by_table/user_ratings/rating_value.rs b/crates/schema/public/enums_db/src/by_table/user_ratings/rating_value.rs index ac7572aaed..08896f2d51 100644 --- a/crates/schema/public/enums_db/src/by_table/user_ratings/rating_value.rs +++ b/crates/schema/public/enums_db/src/by_table/user_ratings/rating_value.rs @@ -15,6 +15,7 @@ use strum::EnumIter; /// *DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY!* /// #[derive(Clone, Copy, Eq, PartialEq, Deserialize, Serialize, sqlx::Type, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[sqlx(rename_all = "lowercase")] #[serde(rename_all = "lowercase")] pub enum UserRatingValue { diff --git a/crates/schema/public/enums_db/src/by_table/users/user_feature_flag.rs b/crates/schema/public/enums_db/src/by_table/users/user_feature_flag.rs index b9e2e9b903..67d48fff0b 100644 --- a/crates/schema/public/enums_db/src/by_table/users/user_feature_flag.rs +++ b/crates/schema/public/enums_db/src/by_table/users/user_feature_flag.rs @@ -5,6 +5,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum UserFeatureFlag { /// Grants a user the ability to list media diff --git a/crates/schema/public/enums_db/src/by_table/users/user_signup_source.rs b/crates/schema/public/enums_db/src/by_table/users/user_signup_source.rs index a6a8c9f561..b9e8a539f3 100644 --- a/crates/schema/public/enums_db/src/by_table/users/user_signup_source.rs +++ b/crates/schema/public/enums_db/src/by_table/users/user_signup_source.rs @@ -5,6 +5,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum UserSignupSource { #[deprecated(since = "2026-01-30", note = "Use other Artcraft* enum variants instead")] diff --git a/crates/schema/public/enums_db/src/common/generation/generation_provider.rs b/crates/schema/public/enums_db/src/common/generation/generation_provider.rs index d6f1db195c..dfc0f06117 100644 --- a/crates/schema/public/enums_db/src/common/generation/generation_provider.rs +++ b/crates/schema/public/enums_db/src/common/generation/generation_provider.rs @@ -11,6 +11,7 @@ use strum::EnumIter; /// NB: This will be used by a variety of tables (MySQL and sqlite)! /// Keep the max length to 16 characters. #[derive(Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd, Serialize, Deserialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum GenerationProvider { Artcraft, diff --git a/crates/schema/public/enums_db/src/common/job_status_plus.rs b/crates/schema/public/enums_db/src/common/job_status_plus.rs index 1d00071a42..c0416a089a 100644 --- a/crates/schema/public/enums_db/src/common/job_status_plus.rs +++ b/crates/schema/public/enums_db/src/common/job_status_plus.rs @@ -11,6 +11,7 @@ use strum::EnumIter; /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd, Serialize, Deserialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum JobStatusPlus { Pending, diff --git a/crates/schema/public/enums_db/src/common/model_type.rs b/crates/schema/public/enums_db/src/common/model_type.rs index 5763a97708..ee211da79f 100644 --- a/crates/schema/public/enums_db/src/common/model_type.rs +++ b/crates/schema/public/enums_db/src/common/model_type.rs @@ -4,6 +4,7 @@ use strum::EnumIter; /// NB: This will be used by a variety of tables (MySQL and sqlite)! /// Keep the max length to 24 characters. #[derive(Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd, Serialize, Deserialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum ModelType { // Image models diff --git a/crates/schema/public/enums_db/src/common/payments_namespace.rs b/crates/schema/public/enums_db/src/common/payments_namespace.rs index a0a16cd627..5609d1b668 100644 --- a/crates/schema/public/enums_db/src/common/payments_namespace.rs +++ b/crates/schema/public/enums_db/src/common/payments_namespace.rs @@ -4,6 +4,7 @@ use strum::EnumIter; /// NB: This will be used by a variety of tables (MySQL and sqlite)! /// Keep the max length to 16 characters. #[derive(Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd, Serialize, Deserialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum PaymentsNamespace { #[serde(rename = "artcraft")] diff --git a/crates/schema/public/enums_db/src/common/visibility.rs b/crates/schema/public/enums_db/src/common/visibility.rs index 8a338d5e8f..75d50f7067 100644 --- a/crates/schema/public/enums_db/src/common/visibility.rs +++ b/crates/schema/public/enums_db/src/common/visibility.rs @@ -14,6 +14,7 @@ use strum::EnumIter; /// *DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY!* #[derive(Clone, Copy, Eq, PartialEq, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[derive(sqlx::Type)] #[sqlx(rename_all = "lowercase")] #[serde(rename_all = "lowercase")] diff --git a/crates/schema/public/enums_db/src/no_table/style_transfer/style_transfer_name.rs b/crates/schema/public/enums_db/src/no_table/style_transfer/style_transfer_name.rs index 3a000e20bd..ea852d6058 100644 --- a/crates/schema/public/enums_db/src/no_table/style_transfer/style_transfer_name.rs +++ b/crates/schema/public/enums_db/src/no_table/style_transfer/style_transfer_name.rs @@ -6,6 +6,7 @@ use strum::EnumIter; /// /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY. #[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash, Deserialize, Serialize, EnumIter, EnumCount)] +#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))] #[serde(rename_all = "snake_case")] pub enum StyleTransferName { #[serde(rename = "anime_2_5d")] diff --git a/crates/service/job/deprecated/download_job/Cargo.toml b/crates/service/job/deprecated/download_job/Cargo.toml index 88e1daa904..330b49c9f0 100644 --- a/crates/service/job/deprecated/download_job/Cargo.toml +++ b/crates/service/job/deprecated/download_job/Cargo.toml @@ -27,7 +27,9 @@ concurrency = { path = "../../../../lib/concurrency" } config = { path = "../../../../lib/deprecated/config" } crockford = { path = "../../../../lib/data/crockford" } easyenv = { path = "../../../../lib/easyenv" } -enums.workspace = true +enums_db.workspace = true +enums_api.workspace = true +enums_convert.workspace = true errors.workspace = true filesys.workspace = true google_drive_downloader = { path = "../../../../api_clients/google_drive_downloader" } diff --git a/crates/service/job/deprecated/download_job/src/job_types/dispatch_job_to_handler.rs b/crates/service/job/deprecated/download_job/src/job_types/dispatch_job_to_handler.rs index f4e3129d9d..4536da2979 100644 --- a/crates/service/job/deprecated/download_job/src/job_types/dispatch_job_to_handler.rs +++ b/crates/service/job/deprecated/download_job/src/job_types/dispatch_job_to_handler.rs @@ -1,6 +1,6 @@ use tempdir::TempDir; -use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; +use enums_db::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; use errors::AnyhowResult; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; diff --git a/crates/service/job/deprecated/download_job/src/job_types/tts/tacotron/process_tacotron_model.rs b/crates/service/job/deprecated/download_job/src/job_types/tts/tacotron/process_tacotron_model.rs index 59fec94307..c2426abd48 100644 --- a/crates/service/job/deprecated/download_job/src/job_types/tts/tacotron/process_tacotron_model.rs +++ b/crates/service/job/deprecated/download_job/src/job_types/tts/tacotron/process_tacotron_model.rs @@ -6,8 +6,8 @@ use anyhow::anyhow; use log::{info, warn}; use tempdir::TempDir; -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::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/download_job/src/job_types/tts/vits/process_vits_model.rs b/crates/service/job/deprecated/download_job/src/job_types/tts/vits/process_vits_model.rs index 2da3023151..c31cf67aca 100644 --- a/crates/service/job/deprecated/download_job/src/job_types/tts/vits/process_vits_model.rs +++ b/crates/service/job/deprecated/download_job/src/job_types/tts/vits/process_vits_model.rs @@ -4,8 +4,8 @@ use anyhow::anyhow; use log::{error, info, warn}; use tempdir::TempDir; -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::check_file_exists::check_file_exists; use filesys::file_size::file_size; diff --git a/crates/service/job/deprecated/download_job/src/job_types/vocoder/hifigan_softvc/process_hifigan_softvc_vocoder.rs b/crates/service/job/deprecated/download_job/src/job_types/vocoder/hifigan_softvc/process_hifigan_softvc_vocoder.rs index e193fc0c31..aeb1784bc3 100644 --- a/crates/service/job/deprecated/download_job/src/job_types/vocoder/hifigan_softvc/process_hifigan_softvc_vocoder.rs +++ b/crates/service/job/deprecated/download_job/src/job_types/vocoder/hifigan_softvc/process_hifigan_softvc_vocoder.rs @@ -6,7 +6,7 @@ use anyhow::anyhow; use log::{info, warn}; use tempdir::TempDir; -use enums::common::vocoder_type::VocoderType; +use enums_db::common::vocoder_type::VocoderType; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/download_job/src/job_types/vocoder/hifigan_tacotron/process_hifigan_vocoder.rs b/crates/service/job/deprecated/download_job/src/job_types/vocoder/hifigan_tacotron/process_hifigan_vocoder.rs index 72e43bdc04..9a1f72edc1 100644 --- a/crates/service/job/deprecated/download_job/src/job_types/vocoder/hifigan_tacotron/process_hifigan_vocoder.rs +++ b/crates/service/job/deprecated/download_job/src/job_types/vocoder/hifigan_tacotron/process_hifigan_vocoder.rs @@ -6,7 +6,7 @@ use anyhow::anyhow; use log::{info, warn}; use tempdir::TempDir; -use enums::common::vocoder_type::VocoderType; +use enums_db::common::vocoder_type::VocoderType; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs b/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs index adebafcf31..d20ec09e5d 100644 --- a/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs +++ b/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs @@ -6,10 +6,10 @@ use tempdir::TempDir; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath; use crockford::crockford_entropy_lower; -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::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::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_possible_file::safe_delete_possible_file; diff --git a/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs b/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs index 44ec1941e5..b4a4dcef41 100644 --- a/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs +++ b/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs @@ -5,10 +5,10 @@ use log::{error, info, warn}; use tempdir::TempDir; 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::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::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums_db::common::visibility::Visibility; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; diff --git a/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs b/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs index e55c80689b..93dbde7d48 100644 --- a/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs +++ b/crates/service/job/deprecated/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs @@ -6,8 +6,8 @@ use anyhow::anyhow; use log::{info, warn}; use tempdir::TempDir; -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 filesys::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/download_job/src/util/scoped_downloads.rs b/crates/service/job/deprecated/download_job/src/util/scoped_downloads.rs index 90134a603f..4e0c9c13a1 100644 --- a/crates/service/job/deprecated/download_job/src/util/scoped_downloads.rs +++ b/crates/service/job/deprecated/download_job/src/util/scoped_downloads.rs @@ -3,7 +3,7 @@ use std::collections::BTreeSet; use anyhow::anyhow; use log::info; -use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; +use enums_db::by_table::generic_download_jobs::generic_download_type::GenericDownloadType; use errors::AnyhowResult; /// Download types can be scoped down to only certain model types or categories. @@ -75,7 +75,7 @@ pub fn parse_download_types(comma_separated_types: &str) -> AnyhowResult, diff --git a/crates/service/job/deprecated/inference_job/src/job/job_loop/main_loop.rs b/crates/service/job/deprecated/inference_job/src/job/job_loop/main_loop.rs index 884b3306c3..fd44534f17 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_loop/main_loop.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_loop/main_loop.rs @@ -3,7 +3,7 @@ use std::time::{Duration, Instant}; use log::{error, info, warn}; use opentelemetry::KeyValue as OtelAttribute; -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 filesys::file_exists::file_exists; use jobs_common::noop_logger::NoOpLogger; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_loop/process_single_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_loop/process_single_job.rs index e54b8e600d..7906cc61d3 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_loop/process_single_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_loop/process_single_job.rs @@ -5,8 +5,8 @@ use log::{debug, error, info, warn}; use opentelemetry::KeyValue as OtelAttribute; use r2d2_redis::redis::Commands; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use mysql_queries::queries::generic_inference::job::mark_generic_inference_job_pending_and_grab_lock::mark_generic_inference_job_pending_and_grab_lock; use mysql_queries::queries::generic_inference::job::mark_generic_inference_job_successfully_done::mark_generic_inference_job_successfully_done; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/f5_tts/process_single_f5_tts_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/f5_tts/process_single_f5_tts_job.rs index 639e381d40..e2fec8cd77 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/f5_tts/process_single_f5_tts_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/f5_tts/process_single_f5_tts_job.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use crate::job::job_loop::job_success_result::JobSuccessResult; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/f5_tts/tts_inference/process_single_f5_tts_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/f5_tts/tts_inference/process_single_f5_tts_job.rs index 9fefeb748f..a2e5cab79f 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/f5_tts/tts_inference/process_single_f5_tts_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/f5_tts/tts_inference/process_single_f5_tts_job.rs @@ -13,8 +13,8 @@ use crate::state::job_dependencies::JobDependencies; use crate::util::common_commands::ffmpeg::ffmpeg_audio_truncate_args::FfmpegAudioTruncateArgs; use crate::util::downloaders::maybe_download_file_from_bucket::{maybe_download_file_from_bucket, MaybeDownloadArgs}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::file_exists::file_exists; use filesys::file_size::file_size; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs index ec8919bb30..9050da731f 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs @@ -6,12 +6,12 @@ use anyhow::anyhow; use log::{error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -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_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +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_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/format_conversion/process_single_format_conversion_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/format_conversion/process_single_format_conversion_job.rs index 9d6b919ad6..fcd007b110 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/format_conversion/process_single_format_conversion_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/format_conversion/process_single_format_conversion_job.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use log::error; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use mysql_queries::queries::media_files::get::get_media_file_for_inference::get_media_file_for_inference; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/process_single_gpt_sovits_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/process_single_gpt_sovits_job.rs index fc9251fe9a..b0c2c31cce 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/process_single_gpt_sovits_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/process_single_gpt_sovits_job.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use crate::job::job_loop::job_success_result::JobSuccessResult; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/tts_inference/process_single_gpt_sovits_tts_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/tts_inference/process_single_gpt_sovits_tts_job.rs index 241dbde567..0c9982c6c4 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/tts_inference/process_single_gpt_sovits_tts_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/tts_inference/process_single_gpt_sovits_tts_job.rs @@ -6,8 +6,8 @@ use log::{error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_directory::WeightFileBucketDirectory; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use filesys::check_file_exists::check_file_exists; use filesys::file_exists::file_exists; use filesys::file_size::file_size; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/upload_model/process_gpt_sovits_upload_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/upload_model/process_gpt_sovits_upload_job.rs index a35e593799..d0e1ce17bc 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/upload_model/process_gpt_sovits_upload_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/upload_model/process_gpt_sovits_upload_job.rs @@ -5,10 +5,10 @@ use log::{info, warn}; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_directory::WeightFileBucketDirectory; use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -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::generic_inference_jobs::inference_result_type::InferenceResultType; +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 filesys::file_exists::file_exists; use filesys::file_read_bytes::file_read_bytes; use filesys::file_size::file_size; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/process_single_ig_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/process_single_ig_job.rs index 9d5f25f87f..57d62032d4 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/process_single_ig_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/process_single_ig_job.rs @@ -1,5 +1,5 @@ -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_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use errors::anyhow; use log::info; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs index f8823ec276..433a4b34f0 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs @@ -7,16 +7,16 @@ use log::{error, info, warn}; use bucket_paths::legacy::remote_file_manager_paths::media_descriptor::MediaImagePngDescriptor; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; use composite_identifiers::by_table::batch_generations::batch_generation_entity::BatchGenerationEntity; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -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::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +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::by_table::prompts::prompt_type::PromptType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::common::model_type::ModelType; use filesys::path_to_string::path_to_string; use mysql_queries::payloads::media_file_extra_info::inner_payloads::stable_diffusion_extra_info::StableDiffusionExtraInfo; use mysql_queries::payloads::media_file_extra_info::media_file_extra_info::MediaFileExtraInfo; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_lora_upload.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_lora_upload.rs index e32c0b9ed9..76ff6f14dd 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_lora_upload.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_lora_upload.rs @@ -7,9 +7,9 @@ use log::{error, info, warn}; use bucket_paths::legacy::remote_file_manager_paths::weights_descriptor::WeightsLoRADescriptor; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; use filesys::file_exists::file_exists; use filesys::path_to_string::path_to_string; use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_sd_upload.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_sd_upload.rs index 60b30cbf2e..a44b5b9d66 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_sd_upload.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_sd_upload.rs @@ -8,9 +8,9 @@ use log::{error, info, warn}; use bucket_paths::legacy::remote_file_manager_paths::weights_descriptor::WeightsSD15Descriptor; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_types::WeightsType; use filesys::file_exists::file_exists; use filesys::path_to_string::path_to_string; use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/lipsync/process_single_lipsync_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/lipsync/process_single_lipsync_job.rs index 5031606fde..41b0e6d739 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/lipsync/process_single_lipsync_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/lipsync/process_single_lipsync_job.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use crate::job::job_loop::job_success_result::JobSuccessResult; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs index b40f6af4bf..d6bfafd993 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs @@ -5,7 +5,7 @@ use anyhow::anyhow; use log::{debug, error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; use filesys::path_to_string::path_to_string; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/mocap/mocap_net/process_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/mocap/mocap_net/process_job.rs index 3612a49f7a..9904b46114 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/mocap/mocap_net/process_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/mocap/mocap_net/process_job.rs @@ -7,7 +7,7 @@ use anyhow::anyhow; use log::{error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs index ccb534b688..9952945692 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs @@ -5,12 +5,12 @@ use anyhow::anyhow; use log::{error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -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_product_category::MediaFileOriginProductCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +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_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/studio_gen2/process_single_studio_gen2_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/studio_gen2/process_single_studio_gen2_job.rs index 18fd48b231..8cdc606c6c 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/studio_gen2/process_single_studio_gen2_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/studio_gen2/process_single_studio_gen2_job.rs @@ -15,8 +15,8 @@ use crate::util::common_commands::ffmpeg::ffmpeg_resample_fps_and_duration::Ffmp use crate::util::common_commands::ffmpeg::ffmpeg_resample_fps_args::FfmpegResampleFpsArgs; use anyhow::anyhow; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use filesys::check_file_exists::check_file_exists; use filesys::create_dir_all_if_missing::create_dir_all_if_missing; use filesys::file_deletion::safe_delete_possible_files_and_directories::safe_delete_possible_files_and_directories; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/studio_gen2/validate_and_save_results.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/studio_gen2/validate_and_save_results.rs index 612b28e4bd..805a13a4ac 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/studio_gen2/validate_and_save_results.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/studio_gen2/validate_and_save_results.rs @@ -6,9 +6,9 @@ use anyhow::anyhow; use log::{debug, error, info}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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::prompts::prompt_type::PromptType; +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::prompts::prompt_type::PromptType; use filesys::file_size::file_size; use filesys::path_to_string::path_to_string; use hashing::sha256::sha256_hash_file::sha256_hash_file; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/process_single_tts_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/process_single_tts_job.rs index af4086a1bd..b5ce263729 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/process_single_tts_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/process_single_tts_job.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use log::warn; -use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; -use enums::by_table::tts_models::tts_model_type::TtsModelType; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; +use enums_db::by_table::tts_models::tts_model_type::TtsModelType; use migration::text_to_speech::get_tts_model_for_run_inference_migration::get_tts_model_for_run_inference_migration; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/styletts2/process_job_create_voice.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/styletts2/process_job_create_voice.rs index aec9bdd631..b67591caa5 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/styletts2/process_job_create_voice.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/styletts2/process_job_create_voice.rs @@ -10,11 +10,11 @@ use bucket_paths::legacy::typified_paths::private::zs_voices::bucket_file_path:: use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::bucket_client::BucketClient; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -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_inference_jobs::inference_result_type::InferenceResultType; +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 mysql_queries::queries::voice_designer::datasets::get_dataset::get_dataset_by_token; use mysql_queries::queries::voice_designer::datasets::get_dataset::ZsDataset; use mysql_queries::queries::voice_designer::voice_samples::list_dataset_samples_for_dataset_token::DatasetSampleRecordForList; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/styletts2/process_job_inference_voice.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/styletts2/process_job_inference_voice.rs index 06bd91995f..152db0b92e 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/styletts2/process_job_inference_voice.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/styletts2/process_job_inference_voice.rs @@ -10,8 +10,8 @@ use bucket_paths::legacy::typified_paths::private::zs_voices::bucket_file_path:: use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::bucket_client::BucketClient; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; use filesys::file_size::file_size; use hashing::sha256::sha256_hash_file::sha256_hash_file; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_zero_shot_tts::insert_media_file_from_zero_shot; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/tacotron2/upload_results.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/tacotron2/upload_results.rs index b489ee73b5..43a0ef9d0d 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/tacotron2/upload_results.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/tacotron2/upload_results.rs @@ -5,7 +5,7 @@ use log::info; use tempdir::TempDir; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; use filesys::file_deletion::safe_delete_file::safe_delete_file; use hashing::sha256::sha256_hash_file::sha256_hash_file; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vall_e_x/process_job_create_voice.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vall_e_x/process_job_create_voice.rs index c9ede5aaa3..230faa43b1 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vall_e_x/process_job_create_voice.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vall_e_x/process_job_create_voice.rs @@ -10,11 +10,11 @@ use bucket_paths::legacy::typified_paths::private::zs_voices::bucket_file_path:: use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::bucket_client::BucketClient; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -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_inference_jobs::inference_result_type::InferenceResultType; +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 mysql_queries::queries::voice_designer::datasets::get_dataset::get_dataset_by_token; use mysql_queries::queries::voice_designer::datasets::get_dataset::ZsDataset; use mysql_queries::queries::voice_designer::voice_samples::list_dataset_samples_for_dataset_token::DatasetSampleRecordForList; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vall_e_x/process_job_inference_voice.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vall_e_x/process_job_inference_voice.rs index f4578b55d4..01a33f8901 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vall_e_x/process_job_inference_voice.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vall_e_x/process_job_inference_voice.rs @@ -10,8 +10,8 @@ use bucket_paths::legacy::typified_paths::private::zs_voices::bucket_file_path:: use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::bucket_client::BucketClient; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; use filesys::file_size::file_size; use hashing::sha256::sha256_hash_file::sha256_hash_file; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_zero_shot_tts::insert_media_file_from_zero_shot; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vits/process_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vits/process_job.rs index ab0fa46786..b239e4b746 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vits/process_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/tts/vits/process_job.rs @@ -7,7 +7,7 @@ use anyhow::anyhow; use log::{error, info}; use tempdir::TempDir; -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 filesys::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/process_single_vc_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/process_single_vc_job.rs index 296ac98a97..c90eae09bf 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/process_single_vc_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/process_single_vc_job.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use log::{error, info, warn}; -use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; +use enums_db::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; use migration::voice_conversion::query_vc_model_for_migration::{query_vc_model_for_migration, VcModelType}; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use mysql_queries::queries::media_files::get::get_media_file_for_inference::get_media_file_for_inference; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/dispatch_rvc_v2_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/dispatch_rvc_v2_job.rs index 83c7237adc..a4b4072721 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/dispatch_rvc_v2_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/dispatch_rvc_v2_job.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use log::info; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use crate::job::job_loop::job_success_result::JobSuccessResult; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/process_rvc_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/process_rvc_job.rs index 002bd78723..f638ba56b2 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/process_rvc_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/process_rvc_job.rs @@ -6,7 +6,7 @@ use anyhow::anyhow; use log::{error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::create_dir_all_if_missing::create_dir_all_if_missing; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/process_rvc_job_old_entrypoint_adapter.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/process_rvc_job_old_entrypoint_adapter.rs index cc31ef156b..ff47f11807 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/process_rvc_job_old_entrypoint_adapter.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/rvc_v2/process_rvc_job_old_entrypoint_adapter.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use log::{error, info}; -use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; +use enums_db::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; use migration::voice_conversion::query_vc_model_for_migration::{query_vc_model_for_migration, VcModelType}; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use mysql_queries::queries::media_files::get::get_media_file_for_inference::get_media_file_for_inference; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/seed_vc/process_single_seed_vc_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/seed_vc/process_single_seed_vc_job.rs index 80a84b4f48..1e97473f49 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/seed_vc/process_single_seed_vc_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/seed_vc/process_single_seed_vc_job.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use crate::job::job_loop::job_success_result::JobSuccessResult; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/seed_vc/vc_inference/process_single_seed_vc_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/seed_vc/vc_inference/process_single_seed_vc_job.rs index 08f03e9ce4..80e291a378 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/seed_vc/vc_inference/process_single_seed_vc_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/seed_vc/vc_inference/process_single_seed_vc_job.rs @@ -13,8 +13,8 @@ use crate::state::job_dependencies::JobDependencies; use crate::util::common_commands::ffmpeg::ffmpeg_audio_truncate_args::FfmpegAudioTruncateArgs; use crate::util::downloaders::maybe_download_file_from_bucket::{maybe_download_file_from_bucket, MaybeDownloadArgs}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::file_exists::file_exists; use filesys::file_size::file_size; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/so_vits_svc/process_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/so_vits_svc/process_job.rs index 3e341faf62..40fde6aee7 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/vc/so_vits_svc/process_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/vc/so_vits_svc/process_job.rs @@ -5,7 +5,7 @@ use anyhow::anyhow; use log::{error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::create_dir_all_if_missing::create_dir_all_if_missing; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/videofilter/rerender_a_video/process_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/videofilter/rerender_a_video/process_job.rs index c70567a8c6..e719827404 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/videofilter/rerender_a_video/process_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/videofilter/rerender_a_video/process_job.rs @@ -6,7 +6,7 @@ use log::{error, info, warn}; use serde::{Deserialize, Serialize}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/comfy_ui_inference_command.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/comfy_ui_inference_command.rs index 81a15e760b..cf221eb657 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/comfy_ui_inference_command.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/comfy_ui_inference_command.rs @@ -13,7 +13,7 @@ use tokio::process::Command; use crate::job::job_types::workflow::face_fusion::command_args::FaceFusionCommandArgs; use crate::job::job_types::workflow::live_portrait::command_args::LivePortraitCommandArgs; use crate::util::get_filtered_env_vars::get_filtered_env_vars_hashmap; -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 filesys::path_to_string::path_to_string; use subprocess_common::command_exit_status::CommandExitStatus; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/face_fusion/process_face_fusion_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/face_fusion/process_face_fusion_job.rs index f9e107da94..8f47478a41 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/face_fusion/process_face_fusion_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/face_fusion/process_face_fusion_job.rs @@ -8,8 +8,8 @@ use log::{debug, error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use filesys::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; use filesys::file_deletion::safe_delete_file::safe_delete_file; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/live_portrait/process_live_portrait_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/live_portrait/process_live_portrait_job.rs index 8c44e1bf61..6ec394984c 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/live_portrait/process_live_portrait_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/live_portrait/process_live_portrait_job.rs @@ -8,8 +8,8 @@ use log::{debug, error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; use filesys::path_to_string::path_to_string; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/process_single_workflow_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/process_single_workflow_job.rs index 8ce5fe5f5e..f8bed6fa85 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/process_single_workflow_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/process_single_workflow_job.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use crate::job::job_loop::job_success_result::JobSuccessResult; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/upload_workflow/process_upload_workflow_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/upload_workflow/process_upload_workflow_job.rs index 5fa9500891..75c85bfc8d 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/upload_workflow/process_upload_workflow_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/upload_workflow/process_upload_workflow_job.rs @@ -5,10 +5,10 @@ use log::info; use bucket_paths::legacy::remote_file_manager_paths::weights_descriptor::WeightsWorkflowDescriptor; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -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::generic_inference_jobs::inference_result_type::InferenceResultType; +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 filesys::file_exists::file_exists; use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/process_video_style_transfer_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/process_video_style_transfer_job.rs index d7a7468949..f21d9ee22c 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/process_video_style_transfer_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/process_video_style_transfer_job.rs @@ -12,7 +12,7 @@ use tokio::sync::oneshot; use bucket_paths::legacy::remote_file_manager_paths::remote_cloud_bucket_details::RemoteCloudBucketDetails; use bucket_paths::legacy::typified_paths::public::media_files::bucket_directory::MediaFileBucketDirectory; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; +use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_possible_files_and_directories::safe_delete_possible_files_and_directories; use filesys::file_deletion::safe_recursively_delete_files::safe_recursively_delete_files; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs index 1ba6d2c4c6..05c136d2ef 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs @@ -5,11 +5,11 @@ use anyhow::anyhow; use log::{debug, error, info}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; +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::prompts::prompt_type::PromptType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::common::model_type::ModelType; use filesys::file_size::file_size; use filesys::path_to_string::path_to_string; use hashing::sha256::sha256_hash_file::sha256_hash_file; diff --git a/crates/service/job/deprecated/inference_job/src/state/job_specific_dependencies.rs b/crates/service/job/deprecated/inference_job/src/state/job_specific_dependencies.rs index 09e5185962..8562ba51b8 100644 --- a/crates/service/job/deprecated/inference_job/src/state/job_specific_dependencies.rs +++ b/crates/service/job/deprecated/inference_job/src/state/job_specific_dependencies.rs @@ -17,8 +17,8 @@ use crate::job::job_types::videofilter::rerender_a_video::rerender_dependencies: use crate::job::job_types::workflow::comfy_ui_dependencies::ComfyDependencies; use crate::state::scoped_job_type_execution::ScopedJobTypeExecution; use crate::state::scoped_model_type_execution::ScopedModelTypeExecution; -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_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use errors::AnyhowResult; use crate::job::job_types::studio_gen2::studio_gen2_dependencies::StudioGen2Dependencies; diff --git a/crates/service/job/deprecated/inference_job/src/state/scoped_job_type_execution.rs b/crates/service/job/deprecated/inference_job/src/state/scoped_job_type_execution.rs index d49c319fa5..8d7ecac63c 100644 --- a/crates/service/job/deprecated/inference_job/src/state/scoped_job_type_execution.rs +++ b/crates/service/job/deprecated/inference_job/src/state/scoped_job_type_execution.rs @@ -3,7 +3,7 @@ use std::collections::BTreeSet; use anyhow::anyhow; use log::info; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use errors::AnyhowResult; /// Execution can be scoped down to run on only certain model types or inference categories. @@ -77,7 +77,7 @@ pub fn parse_job_types(comma_separated_types: &str) -> AnyhowResult AnyhowResult StripeArtcraftCreditsPackInfo { diff --git a/crates/service/plugins/billing_artcraft/src/configs/credits_packs/stripe_artcraft_credits_pack_info.rs b/crates/service/plugins/billing_artcraft/src/configs/credits_packs/stripe_artcraft_credits_pack_info.rs index f64342a8f2..c66043c25d 100644 --- a/crates/service/plugins/billing_artcraft/src/configs/credits_packs/stripe_artcraft_credits_pack_info.rs +++ b/crates/service/plugins/billing_artcraft/src/configs/credits_packs/stripe_artcraft_credits_pack_info.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; #[derive(Debug, Clone)] pub struct StripeArtcraftCreditsPackInfo { diff --git a/crates/service/plugins/billing_artcraft/src/configs/credits_packs/stripe_artcraft_credits_pack_info_list.rs b/crates/service/plugins/billing_artcraft/src/configs/credits_packs/stripe_artcraft_credits_pack_info_list.rs index 0773382235..cc3a003716 100644 --- a/crates/service/plugins/billing_artcraft/src/configs/credits_packs/stripe_artcraft_credits_pack_info_list.rs +++ b/crates/service/plugins/billing_artcraft/src/configs/credits_packs/stripe_artcraft_credits_pack_info_list.rs @@ -1,5 +1,5 @@ use crate::configs::credits_packs::stripe_artcraft_credits_pack_info::StripeArtcraftCreditsPackInfo; -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; // // SANDBOX diff --git a/crates/service/plugins/billing_artcraft/src/configs/subscriptions/get_artcraft_subscription_by_slug_and_env.rs b/crates/service/plugins/billing_artcraft/src/configs/subscriptions/get_artcraft_subscription_by_slug_and_env.rs index a681d434e4..f1e5a16e04 100644 --- a/crates/service/plugins/billing_artcraft/src/configs/subscriptions/get_artcraft_subscription_by_slug_and_env.rs +++ b/crates/service/plugins/billing_artcraft/src/configs/subscriptions/get_artcraft_subscription_by_slug_and_env.rs @@ -1,6 +1,6 @@ use crate::configs::subscriptions::stripe_artcraft_subscription_info::StripeArtcraftSubscriptionInfo; use crate::configs::subscriptions::stripe_artcraft_subscription_info_list::{ARTCRAFT_BASIC_PRODUCTION, ARTCRAFT_BASIC_SANDBOX, ARTCRAFT_MAX_PRODUCTION, ARTCRAFT_MAX_SANDBOX, ARTCRAFT_PRO_PRODUCTION, ARTCRAFT_PRO_SANDBOX}; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use reusable_types::server_environment::ServerEnvironment; pub fn get_artcraft_subscription_by_slug_and_env(slug: ArtcraftSubscriptionSlug, env: ServerEnvironment) -> StripeArtcraftSubscriptionInfo { diff --git a/crates/service/plugins/billing_artcraft/src/configs/subscriptions/stripe_artcraft_subscription_info.rs b/crates/service/plugins/billing_artcraft/src/configs/subscriptions/stripe_artcraft_subscription_info.rs index fa1b398be4..bae167a60d 100644 --- a/crates/service/plugins/billing_artcraft/src/configs/subscriptions/stripe_artcraft_subscription_info.rs +++ b/crates/service/plugins/billing_artcraft/src/configs/subscriptions/stripe_artcraft_subscription_info.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; #[derive(Debug, Clone)] pub struct StripeArtcraftSubscriptionInfo { diff --git a/crates/service/plugins/billing_artcraft/src/configs/subscriptions/stripe_artcraft_subscription_info_list.rs b/crates/service/plugins/billing_artcraft/src/configs/subscriptions/stripe_artcraft_subscription_info_list.rs index 47f4af8c95..5e4fbafb85 100644 --- a/crates/service/plugins/billing_artcraft/src/configs/subscriptions/stripe_artcraft_subscription_info_list.rs +++ b/crates/service/plugins/billing_artcraft/src/configs/subscriptions/stripe_artcraft_subscription_info_list.rs @@ -1,5 +1,5 @@ use crate::configs::subscriptions::stripe_artcraft_subscription_info::StripeArtcraftSubscriptionInfo; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; // // SANDBOX diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/checkout/stripe_artcraft_create_credits_pack_checkout_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/checkout/stripe_artcraft_create_credits_pack_checkout_handler.rs index dd5ef07ea0..ab997af448 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/checkout/stripe_artcraft_create_credits_pack_checkout_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/checkout/stripe_artcraft_create_credits_pack_checkout_handler.rs @@ -9,8 +9,8 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::stripe_artcraft::create_credits_pack_checkout::{StripeArtcraftCreateCreditsPackCheckoutRequest, StripeArtcraftCreateCreditsPackCheckoutResponse}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::{PlanBillingCadence, StripeArtcraftCreateSubscriptionCheckoutRequest, StripeArtcraftCreateSubscriptionCheckoutResponse}; use component_traits::traits::internal_user_lookup::InternalUserLookup; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::{error, info, warn}; use mysql_queries::queries::users::user_stripe_customer_links::find_user_stripe_customer_link::find_user_stripe_customer_link_using_connection; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::find_subscription_for_owner_user_using_connection; diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/checkout/stripe_artcraft_create_subscription_checkout_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/checkout/stripe_artcraft_create_subscription_checkout_handler.rs index 175ac01020..f89aa5e4db 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/checkout/stripe_artcraft_create_subscription_checkout_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/checkout/stripe_artcraft_create_subscription_checkout_handler.rs @@ -6,8 +6,8 @@ use actix_web::web::{Data, Json}; use actix_web::{web, HttpRequest}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::{PlanBillingCadence, StripeArtcraftCreateSubscriptionCheckoutRequest, StripeArtcraftCreateSubscriptionCheckoutResponse}; use component_traits::traits::internal_user_lookup::InternalUserLookup; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::{error, info, warn}; use mysql_queries::queries::users::user_subscriptions::find_possibly_inactive_first_subscription_for_owner_user::find_possibly_inactive_first_subscription_for_owner_user_using_connection; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::find_subscription_for_owner_user_using_connection; diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/stripe_artcraft_create_subscription_checkout_with_user_signup_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/stripe_artcraft_create_subscription_checkout_with_user_signup_handler.rs index 9eea25a927..14b68965ed 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/stripe_artcraft_create_subscription_checkout_with_user_signup_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/stripe_artcraft_create_subscription_checkout_with_user_signup_handler.rs @@ -10,8 +10,8 @@ use actix_web::web::{Data, Json}; use actix_web::{web, HttpRequest, HttpResponse}; use artcraft_api_defs::stripe_artcraft::create_create_new_user_account_and_subscription_checkout::{PlanBillingCadence, SessionDetails, StripeArtcraftCreateSubscriptionCheckoutWithUserSignupRequest, StripeArtcraftCreateSubscriptionCheckoutWithUserSignupResponse, UserDetails}; use component_traits::traits::internal_user_lookup::InternalUserLookup; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::common::payments_namespace::PaymentsNamespace; use http_headers::values::content_type::CONTENT_TYPE_APPLICATION_JSON; use log::{error, info, warn}; use mysql_queries::queries::users::user_stripe_customer_links::find_user_stripe_customer_link::find_user_stripe_customer_link_using_connection; diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/user_creation_case.rs b/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/user_creation_case.rs index 26a665f494..89d1102249 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/user_creation_case.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/user_creation_case.rs @@ -5,8 +5,9 @@ use crate::utils::common_web_error::CommonWebError; use crate::utils::create_checkout::create_subscription_checkout_session::{create_subscription_checkout_session, CreateSubscriptionCheckoutSessionArgs}; use actix_artcraft::requests::get_request_signup_source_enum::get_request_signup_source_enum; use actix_web::HttpRequest; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; -use enums::by_table::users::user_signup_source::UserSignupSource; +use enums_api::by_table::users::user_signup_source::UserSignupSource; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_convert::by_table::users::user_signup_source::user_signup_source_to_db; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, info, warn}; use mysql_queries::queries::users::user::create::create_account_error::CreateAccountError; @@ -82,7 +83,7 @@ pub (super) async fn user_creation_case( email_gravatar_hash: &user_email_gravatar_hash, maybe_feature_flags: Some(&user_feature_flags), ip_address: &ip_address, - maybe_source, + maybe_source: maybe_source.as_ref().map(user_signup_source_to_db), maybe_referral_url: maybe_referral_url.clone(), }, Transactor::for_transaction(&mut transaction), diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/user_exists_case.rs b/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/user_exists_case.rs index 2167678b2d..273839406f 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/user_exists_case.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/user_exists_case.rs @@ -5,7 +5,7 @@ use crate::utils::common_web_error::CommonWebError; use crate::utils::create_checkout::create_subscription_checkout_session::{create_subscription_checkout_session, CreateSubscriptionCheckoutSessionArgs}; use actix_web::web::Data; use component_traits::traits::internal_user_lookup::UserMetadata; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::{error, info, warn}; use mysql_queries::queries::users::user_stripe_customer_links::find_user_stripe_customer_link::find_user_stripe_customer_link_using_connection; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::find_subscription_for_owner_user_using_connection; diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_cancel_plan_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_cancel_plan_handler.rs index 91c902f638..79ec17edb2 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_cancel_plan_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_cancel_plan_handler.rs @@ -8,8 +8,8 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::{PlanBillingCadence, StripeArtcraftCreateSubscriptionCheckoutRequest, StripeArtcraftCreateSubscriptionCheckoutResponse}; use artcraft_api_defs::stripe_artcraft::customer_portal_cancel_plan::{StripeArtcraftCustomerPortalCancelPlanRequest, StripeArtcraftCustomerPortalCancelPlanResponse}; use component_traits::traits::internal_user_lookup::InternalUserLookup; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::{error, info, warn}; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::{find_subscription_for_owner_user_using_connection, UserSubscription}; use reusable_types::server_environment::ServerEnvironment; diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_manage_plan_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_manage_plan_handler.rs index 634eaa2ba4..b24870e198 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_manage_plan_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_manage_plan_handler.rs @@ -8,8 +8,8 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::{PlanBillingCadence, StripeArtcraftCreateSubscriptionCheckoutRequest, StripeArtcraftCreateSubscriptionCheckoutResponse}; use artcraft_api_defs::stripe_artcraft::customer_portal_manage_plan::{StripeArtcraftCustomerPortalManagePlanRequest, StripeArtcraftCustomerPortalManagePlanResponse}; use component_traits::traits::internal_user_lookup::InternalUserLookup; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::{error, info, warn}; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::{find_subscription_for_owner_user_using_connection, UserSubscription}; use reusable_types::server_environment::ServerEnvironment; diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_switch_plan_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_switch_plan_handler.rs index 6bfbcee1a8..d41cbae2e5 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_switch_plan_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_switch_plan_handler.rs @@ -9,8 +9,8 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::{PlanBillingCadence, StripeArtcraftCreateSubscriptionCheckoutRequest, StripeArtcraftCreateSubscriptionCheckoutResponse}; use artcraft_api_defs::stripe_artcraft::customer_portal_switch_plan::{PlanBillingCadenceConfirmation, StripeArtcraftCustomerPortalSwitchPlanRequest, StripeArtcraftCustomerPortalSwitchPlanResponse}; use component_traits::traits::internal_user_lookup::InternalUserLookup; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::{error, info, warn}; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::{find_subscription_for_owner_user_using_connection, UserSubscription}; use reusable_types::server_environment::ServerEnvironment; diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_update_payment_method_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_update_payment_method_handler.rs index 41903b81be..56ace85982 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_update_payment_method_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_update_payment_method_handler.rs @@ -10,8 +10,8 @@ use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::{PlanBilli use artcraft_api_defs::stripe_artcraft::customer_portal_switch_plan::{PlanBillingCadenceConfirmation, StripeArtcraftCustomerPortalSwitchPlanRequest, StripeArtcraftCustomerPortalSwitchPlanResponse}; use artcraft_api_defs::stripe_artcraft::customer_portal_update_payment_method::{StripeArtcraftCustomerPortalUpdatePaymentMethodRequest, StripeArtcraftCustomerPortalUpdatePaymentMethodResponse}; use component_traits::traits::internal_user_lookup::InternalUserLookup; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::{error, info, warn}; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::{find_subscription_for_owner_user_using_connection, UserSubscription}; use reusable_types::server_environment::ServerEnvironment; diff --git a/crates/service/plugins/component_traits/Cargo.toml b/crates/service/plugins/component_traits/Cargo.toml index cad0cd6db1..3fbfdb80a0 100644 --- a/crates/service/plugins/component_traits/Cargo.toml +++ b/crates/service/plugins/component_traits/Cargo.toml @@ -22,7 +22,9 @@ workspace-build-acceleration.workspace = true # Internal #url_config = { path = "../../../lib/url_config" } artcraft_api_defs.workspace = true -enums.workspace = true +enums_db.workspace = true +enums_api.workspace = true +enums_convert.workspace = true errors.workspace = true http_server_common = { path = "../../../lib/deprecated/http_server_common" } mysql_queries = { path = "../../../schema/database/mysql_queries" } diff --git a/crates/service/plugins/component_traits/src/traits/internal_user_lookup.rs b/crates/service/plugins/component_traits/src/traits/internal_user_lookup.rs index a65c0cf4ea..3712d72250 100644 --- a/crates/service/plugins/component_traits/src/traits/internal_user_lookup.rs +++ b/crates/service/plugins/component_traits/src/traits/internal_user_lookup.rs @@ -3,7 +3,7 @@ use std::fmt::{Display, Formatter}; use actix_web::HttpRequest; use async_trait::async_trait; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use sqlx::pool::PoolConnection; use sqlx::MySql; use tokens::tokens::users::UserToken; diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index 46a5301dd9..0ee8edd8d2 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -49,7 +49,9 @@ crockford = { path = "../../../lib/data/crockford" } datetimes = { path = "../../../lib/data/datetimes" } easyenv.workspace = true elasticsearch_schema = { path = "../../../schema/database/elasticsearch_schema" } -enums.workspace = true +enums_db = { workspace = true, features = ["utoipa"] } +enums_api.workspace = true +enums_convert.workspace = true enums_public.workspace = true errors.workspace = true fal_client.workspace = true diff --git a/crates/service/web/storyteller_web/src/billing/stripe_internal_subscription_product_lookup_impl.rs b/crates/service/web/storyteller_web/src/billing/stripe_internal_subscription_product_lookup_impl.rs index c74ced066e..04e5ec8cce 100644 --- a/crates/service/web/storyteller_web/src/billing/stripe_internal_subscription_product_lookup_impl.rs +++ b/crates/service/web/storyteller_web/src/billing/stripe_internal_subscription_product_lookup_impl.rs @@ -1,5 +1,5 @@ use billing_component::stripe::traits::internal_subscription_product_lookup::{InternalProductLookupError, InternalSubscriptionProduct, InternalSubscriptionProductLookup}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use crate::configs::plans::plan_list::{PLANS_BY_STRIPE_PRICE_ID, PLANS_BY_STRIPE_PRODUCT_ID}; const SUBSCRIPTION_CATEGORY : PaymentsNamespace = PaymentsNamespace::FakeYou; diff --git a/crates/service/web/storyteller_web/src/billing/wallets/attempt_wallet_deduction.rs b/crates/service/web/storyteller_web/src/billing/wallets/attempt_wallet_deduction.rs index cb2672a2ff..3f2a1cc433 100644 --- a/crates/service/web/storyteller_web/src/billing/wallets/attempt_wallet_deduction.rs +++ b/crates/service/web/storyteller_web/src/billing/wallets/attempt_wallet_deduction.rs @@ -1,5 +1,5 @@ use crate::http_server::common_responses::common_web_error::CommonWebError; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use errors::AnyhowResult; use log::{error, info}; use mysql_queries::queries::wallets::create_new_artcraft_wallet_for_owner_user::create_new_artcraft_wallet_for_owner_user; diff --git a/crates/service/web/storyteller_web/src/billing/wallets/temporary_test_wallet_deduction.rs b/crates/service/web/storyteller_web/src/billing/wallets/temporary_test_wallet_deduction.rs index 4e4dcc3d88..f0ccdb6c74 100644 --- a/crates/service/web/storyteller_web/src/billing/wallets/temporary_test_wallet_deduction.rs +++ b/crates/service/web/storyteller_web/src/billing/wallets/temporary_test_wallet_deduction.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use errors::AnyhowResult; use log::{error, info, warn}; use mysql_queries::queries::wallets::create_new_artcraft_wallet_for_owner_user::create_new_artcraft_wallet_for_owner_user; diff --git a/crates/service/web/storyteller_web/src/configs/artcraft_products/get_artcraft_product_by_slug.rs b/crates/service/web/storyteller_web/src/configs/artcraft_products/get_artcraft_product_by_slug.rs index 04a7361b86..2af7c764c2 100644 --- a/crates/service/web/storyteller_web/src/configs/artcraft_products/get_artcraft_product_by_slug.rs +++ b/crates/service/web/storyteller_web/src/configs/artcraft_products/get_artcraft_product_by_slug.rs @@ -1,6 +1,6 @@ use crate::configs::artcraft_products::stripe_artcraft_product_info::StripeArtcraftProductInfo; use crate::configs::artcraft_products::stripe_artcraft_product_info_list::{ARTCRAFT_BASIC_PRODUCTION, ARTCRAFT_BASIC_SANDBOX, ARTCRAFT_MAX_PRODUCTION, ARTCRAFT_MAX_SANDBOX, ARTCRAFT_PRO_PRODUCTION, ARTCRAFT_PRO_SANDBOX}; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use reusable_types::server_environment::ServerEnvironment; pub fn get_artcraft_product_by_slug(slug: ArtcraftSubscriptionSlug, env: ServerEnvironment) -> StripeArtcraftProductInfo { diff --git a/crates/service/web/storyteller_web/src/configs/artcraft_products/stripe_artcraft_product_info.rs b/crates/service/web/storyteller_web/src/configs/artcraft_products/stripe_artcraft_product_info.rs index 5fa97f61a9..307782ca66 100644 --- a/crates/service/web/storyteller_web/src/configs/artcraft_products/stripe_artcraft_product_info.rs +++ b/crates/service/web/storyteller_web/src/configs/artcraft_products/stripe_artcraft_product_info.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; pub struct StripeArtcraftProductInfo { pub slug: ArtcraftSubscriptionSlug, diff --git a/crates/service/web/storyteller_web/src/configs/artcraft_products/stripe_artcraft_product_info_list.rs b/crates/service/web/storyteller_web/src/configs/artcraft_products/stripe_artcraft_product_info_list.rs index 51c8bb5a89..f48e42b70d 100644 --- a/crates/service/web/storyteller_web/src/configs/artcraft_products/stripe_artcraft_product_info_list.rs +++ b/crates/service/web/storyteller_web/src/configs/artcraft_products/stripe_artcraft_product_info_list.rs @@ -1,5 +1,5 @@ use crate::configs::artcraft_products::stripe_artcraft_product_info::StripeArtcraftProductInfo; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_db::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; // // SANDBOX diff --git a/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs b/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs index e5595bb333..5c97829e01 100644 --- a/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs +++ b/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs @@ -65,7 +65,7 @@ pub mod tests { use std::ops::{Add, Sub}; use chrono::{Duration, Utc}; - use enums::common::payments_namespace::PaymentsNamespace; + use enums_db::common::payments_namespace::PaymentsNamespace; use reusable_types::server_environment::ServerEnvironment; use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session; diff --git a/crates/service/web/storyteller_web/src/configs/static_model/categories/synthetic_category.rs b/crates/service/web/storyteller_web/src/configs/static_model/categories/synthetic_category.rs index bd9ab23e62..2fb69369df 100644 --- a/crates/service/web/storyteller_web/src/configs/static_model/categories/synthetic_category.rs +++ b/crates/service/web/storyteller_web/src/configs/static_model/categories/synthetic_category.rs @@ -1,4 +1,4 @@ -use enums::by_table::model_categories::model_type::ModelType; +use enums_db::by_table::model_categories::model_type::ModelType; #[derive(Clone, Eq, PartialEq, Hash, Debug)] pub struct SyntheticCategory { diff --git a/crates/service/web/storyteller_web/src/configs/static_model/categories/synthetic_category_list.rs b/crates/service/web/storyteller_web/src/configs/static_model/categories/synthetic_category_list.rs index fc32047d58..367e4f24ae 100644 --- a/crates/service/web/storyteller_web/src/configs/static_model/categories/synthetic_category_list.rs +++ b/crates/service/web/storyteller_web/src/configs/static_model/categories/synthetic_category_list.rs @@ -1,6 +1,6 @@ use once_cell::sync::Lazy; -use enums::by_table::model_categories::model_type::ModelType; +use enums_db::by_table::model_categories::model_type::ModelType; use crate::configs::static_model::categories::synthetic_category::SyntheticCategory; diff --git a/crates/service/web/storyteller_web/src/docs/api_doc.rs b/crates/service/web/storyteller_web/src/docs/api_doc.rs index c286c96b99..60ddc961dd 100644 --- a/crates/service/web/storyteller_web/src/docs/api_doc.rs +++ b/crates/service/web/storyteller_web/src/docs/api_doc.rs @@ -191,30 +191,30 @@ use artcraft_api_defs::prompts::create_prompt::CreatePromptResponse; use billing_component::stripe::http_endpoints::checkout::create::stripe_create_checkout_session_error::CreateCheckoutSessionError; use billing_component::stripe::http_endpoints::checkout::create::stripe_create_checkout_session_json_handler::*; use billing_component::users::http_endpoints::list_active_user_subscriptions_handler::*; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use enums::by_table::comments::comment_entity_type::CommentEntityType; -use enums::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; -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::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_subtype::MediaFileSubtype; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::{weights_category::WeightsCategory, weights_types::WeightsType}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; -use enums::by_table::user_ratings::entity_type::UserRatingEntityType; -use enums::by_table::user_ratings::rating_value::UserRatingValue; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; -use enums::common::generation_provider::GenerationProvider; -use enums::common::job_status_plus::JobStatusPlus; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct; +use enums_db::by_table::comments::comment_entity_type::CommentEntityType; +use enums_db::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; +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::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_subtype::MediaFileSubtype; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::model_weights::{weights_category::WeightsCategory, weights_types::WeightsType}; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +use enums_db::by_table::prompts::prompt_type::PromptType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::by_table::user_ratings::entity_type::UserRatingEntityType; +use enums_db::by_table::user_ratings::rating_value::UserRatingValue; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::common::model_type::ModelType; +use enums_db::common::visibility::Visibility; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::media_files::public_media_file_model_type::PublicMediaFileModelType; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use tokens::tokens::batch_generations::*; diff --git a/crates/service/web/storyteller_web/src/http_server/common_requests/auto_product_category.rs b/crates/service/web/storyteller_web/src/http_server/common_requests/auto_product_category.rs index cdd2172d18..a1cdf67aef 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_requests/auto_product_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_requests/auto_product_category.rs @@ -2,7 +2,7 @@ use std::collections::HashSet; use utoipa::ToSchema; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; /// AutoProductCategory can be used in APIs to auto-expand to multiple product categories, /// deprecated product categories, etc. diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/media_file_origin_details.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/media_file_origin_details.rs index f32433ed9a..d0613810d7 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/media_file_origin_details.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/media_file_origin_details.rs @@ -1,8 +1,8 @@ use utoipa::ToSchema; -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_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; +use enums_api::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_public::by_table::media_files::public_media_file_model_type::PublicMediaFileModelType; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_face_animation.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_face_animation.rs index e095312792..b8befe217e 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_face_animation.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_face_animation.rs @@ -10,11 +10,11 @@ use actix_web::http::StatusCode; use actix_web::{web, HttpRequest, HttpResponse}; use log::{info, warn}; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -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_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 http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; use mysql_queries::payloads::generic_inference_args::inner_payloads::lipsync_payload::{FaceEnhancer, LipsyncAnimationAudioSource, LipsyncAnimationImageSource, LipsyncArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs index d27cd84362..5bce5003d1 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs @@ -11,10 +11,10 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::{info, warn}; use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; -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::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/add_synthetic_categories.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/add_synthetic_categories.rs index 3c2b100a3d..db140d2e9b 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/add_synthetic_categories.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/add_synthetic_categories.rs @@ -5,7 +5,7 @@ use std::collections::BTreeSet; -use enums::by_table::trending_model_analytics::window_name::WindowName; +use enums_db::by_table::trending_model_analytics::window_name::WindowName; use mysql_queries::queries::trending_model_analytics::list_trending_tts_models::TrendingModels; use tokens::tokens::model_categories::ModelCategoryToken; use tokens::tokens::tts_models::TtsModelToken; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_categories.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_categories.rs index a802ca6e6e..b7e3602557 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_categories.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_categories.rs @@ -13,7 +13,7 @@ use chrono::{DateTime, Utc}; use log::error; use datetimes::CHRONO_DATETIME_UNIX_EPOCH; -use enums::by_table::model_categories::model_type::ModelType; +use enums_db::by_table::model_categories::model_type::ModelType; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use tokens::tokens::model_categories::ModelCategoryToken; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_fbx_to_gltf_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_fbx_to_gltf_handler.rs index 7ce586e1a9..99ee2cb1b2 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_fbx_to_gltf_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_fbx_to_gltf_handler.rs @@ -11,10 +11,10 @@ use serde::Deserialize; use serde::Serialize; use utoipa::ToSchema; -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::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{ diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_render_engine_scene_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_render_engine_scene_to_video_handler.rs index 2a9c6198f1..424c975a6b 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_render_engine_scene_to_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_render_engine_scene_to_video_handler.rs @@ -12,11 +12,11 @@ use serde::Deserialize; use serde::Serialize; use utoipa::ToSchema; -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::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::visibility::Visibility; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/create_scene_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/create_scene_handler.rs index 477be9975e..4563de90a7 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/create_scene_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/create_scene_handler.rs @@ -7,10 +7,10 @@ use log::{error, info, warn}; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/get_scene_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/get_scene_handler.rs index dbb3499311..a625e53f51 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/get_scene_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/get_scene_handler.rs @@ -10,7 +10,7 @@ use log::warn; use utoipa::ToSchema; 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_db::by_table::media_files::media_file_type::MediaFileType; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/process_upload_media_file.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/process_upload_media_file.rs index 337a84704c..dda8829847 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/process_upload_media_file.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/process_upload_media_file.rs @@ -6,8 +6,8 @@ use actix_web::{web, HttpRequest}; use log::{error, info, warn}; 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 hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use media::decode_basic_audio_info::decode_basic_audio_bytes_info; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/image_gen/enqueue_image_generation.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/image_gen/enqueue_image_generation.rs index 14bc0967d0..8c161f1228 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/image_gen/enqueue_image_generation.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/image_gen/enqueue_image_generation.rs @@ -15,9 +15,9 @@ use serde::Serialize; use utoipa::ToSchema; use web::Data; -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 http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{ @@ -210,7 +210,7 @@ pub async fn enqueue_image_generation_request( // TODO: Brandon need to figure out premium vs not premium let mut maybe_user_token: Option = None; - let visbility = enums::common::visibility::Visibility::Public; + let visbility = enums_db::common::visibility::Visibility::Public; let mut mysql_connection = server_state.mysql_pool.acquire().await.map_err(|err| { warn!("MySql pool error: {:?}", err); diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/common/handle_upload.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/common/handle_upload.rs index 2fceae791c..051c46339e 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/common/handle_upload.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/common/handle_upload.rs @@ -6,9 +6,9 @@ use actix_web::{web, HttpRequest}; use log::{error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePath; -use enums::by_table::media_uploads::media_upload_source::MediaUploadSource; -use enums::by_table::media_uploads::media_upload_type::MediaUploadType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_uploads::media_upload_source::MediaUploadSource; +use enums_db::by_table::media_uploads::media_upload_type::MediaUploadType; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use media::decode_basic_audio_info::decode_basic_audio_bytes_info; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs index 15a1126c0d..ffcaf82606 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs @@ -9,8 +9,8 @@ use chrono::{DateTime, Utc}; use log::warn; use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; -use enums::by_table::media_uploads::media_upload_type::MediaUploadType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_uploads::media_upload_type::MediaUploadType; +use enums_db::common::visibility::Visibility; use mysql_queries::queries::media_uploads::reverse_list_user_media_uploads_of_type::reverse_list_user_media_uploads_of_type_with_connection; use tokens::tokens::media_uploads::MediaUploadToken; use tokens::tokens::users::UserToken; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs index 4350e1035d..c35d8f707a 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs @@ -11,10 +11,10 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; -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::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_plans.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_plans.rs index bc9b1ffe9a..e90dda3907 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_plans.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_plans.rs @@ -6,7 +6,7 @@ use actix_web::http::StatusCode; use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/get_vocoder.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/get_vocoder.rs index edd3c11b3c..abf4b51fb6 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/get_vocoder.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/get_vocoder.rs @@ -13,8 +13,8 @@ use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; -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 mysql_queries::queries::vocoder::get_vocoder_model::get_vocoder_model_by_token; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/list_vocoders.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/list_vocoders.rs index 50976c6b61..e91b76a889 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/list_vocoders.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/list_vocoders.rs @@ -12,7 +12,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; -use enums::common::vocoder_type::VocoderType; +use enums_db::common::vocoder_type::VocoderType; use mysql_queries::queries::vocoder::list_vocoder_models::{list_vocoder_models, VocoderModelListItem}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_result.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_result.rs index 4f84fe0d93..0e11adf063 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_result.rs @@ -12,7 +12,7 @@ use actix_web::web::Path; use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, warn}; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::w2l::w2l_results::edit_w2l_result::{edit_w2l_result, CreatorOrModFields, EditW2lResultArgs}; use mysql_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_template.rs index fc2ebec782..2764a4bb6c 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/edit_w2l_template.rs @@ -12,7 +12,7 @@ use actix_web::web::{Json, Path}; use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use markdown::simple_markdown_to_html::simple_markdown_to_html; use mysql_queries::queries::w2l::w2l_templates::edit_w2l_template::{edit_w2l_template, CreatorOrModFields, EditW2lTemplateArgs, ModFields}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l.rs index 7713d61ea4..5f6d344870 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l.rs @@ -12,7 +12,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::{info, warn}; use redis::Commands; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::w2l::w2l_inference_jobs::insert_w2l_inference_job::{insert_w2l_inference_job, InsertW2lInferenceJobArgs}; use redis_common::redis_keys::RedisKeys; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l_with_uploads.rs index f5838ce303..5ce6b4bf38 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l_with_uploads.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_infer_w2l_with_uploads.rs @@ -14,7 +14,7 @@ use futures::TryStreamExt; use log::{error, info, warn}; use redis::Commands; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use uuid_utils::uuid::generate_random_uuid; use mysql_queries::queries::w2l::w2l_inference_jobs::insert_w2l_inference_job_extended::{insert_w2l_inference_job_extended, InsertW2lInferenceJobExtendedArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_upload_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_upload_w2l_template.rs index ef8c00a20d..94dc37d8dc 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_upload_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/w2l/enqueue_upload_w2l_template.rs @@ -12,7 +12,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use config::is_bad_video_download_url::is_bad_video_download_url; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::w2l::w2l_template_upload_jobs::insert_w2l_template_upload_job::{insert_w2l_template_upload_job, InsertW2lTemplateUploadJobArgs}; use user_input_common::check_for_slurs::contains_slurs; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs index 9f50f9f31e..33fdd2c625 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs @@ -7,10 +7,10 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; use utoipa::ToSchema; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -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::visibility::Visibility; +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::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs index b20399c5b7..09cba32605 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs @@ -7,10 +7,10 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; use utoipa::ToSchema; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -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::visibility::Visibility; +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::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs index b90df509ce..a0cb1bbe2d 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs @@ -10,11 +10,11 @@ use actix_web::{web, HttpRequest}; use log::{error, info, warn}; use utoipa::ToSchema; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -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_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 http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs index d7cc182ff1..6f964dbaa8 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs @@ -10,11 +10,11 @@ use actix_web::{web, HttpRequest}; use log::{error, info, warn}; use utoipa::ToSchema; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -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_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 http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status.rs index c36746b7a6..9fd17900ae 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status.rs @@ -10,8 +10,8 @@ use log::error; use redis::{Commands, RedisResult}; use utoipa::ToSchema; -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 mysql_queries::queries::generic_inference::web::get_inference_job_status::get_inference_job_status; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; use redis_schema::keys::inference_job::style_transfer_progress_key::StyleTransferProgressKey; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status_ws.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status_ws.rs index 22ff3f9e59..56a4db454a 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status_ws.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/get_inference_preview_status_ws.rs @@ -16,8 +16,8 @@ use redis::{Commands, RedisResult}; use utoipa::ToSchema; use web::Data; -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 mysql_queries::queries::generic_inference::web::get_inference_job_status::get_inference_job_status; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; use redis_schema::keys::inference_job::style_transfer_progress_key::StyleTransferProgressKey; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/vst_common/vst_request.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/vst_common/vst_request.rs index 1912160adb..2e22534fd9 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/vst_common/vst_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/vst_common/vst_request.rs @@ -1,7 +1,7 @@ use utoipa::ToSchema; -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; #[derive(Deserialize, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_comfy_ui_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_comfy_ui_handler.rs index e771437a9d..f69ce55dd5 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_comfy_ui_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_comfy_ui_handler.rs @@ -11,11 +11,11 @@ use actix_web::http::StatusCode; use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; -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::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::visibility::Visibility; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_video_style_transfer_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_video_style_transfer_handler.rs index 185eb8fd35..23e60c885a 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_video_style_transfer_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_video_style_transfer_handler.rs @@ -11,11 +11,11 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; use utoipa::ToSchema; -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::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +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 enums_db::common::visibility::Visibility; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_workflow_upload_request.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_workflow_upload_request.rs index a77f0c0b31..fb3e85e1cc 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_workflow_upload_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_workflow_upload_request.rs @@ -15,10 +15,10 @@ use serde::Serialize; use utoipa::ToSchema; use web::Data; -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::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{ diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_app_active_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_app_active_user_handler.rs index ce6ccc1598..ad23712094 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_app_active_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_app_active_user_handler.rs @@ -6,7 +6,7 @@ use actix_helpers::extractors::get_request_user_agent::get_request_user_agent; use actix_web::web::{Json, Query}; use actix_web::{web, HttpRequest}; use artcraft_api_defs::analytics::log_active_user::{LogAppActiveUserRequest, LogAppActiveUserResponse}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use errors::AnyhowResult; use http_server_common::request::get_request_ip::get_request_ip; use log::{info, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_app_active_user_json_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_app_active_user_json_handler.rs index 1c885da0f2..a1bbe50611 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_app_active_user_json_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/analytics/log_app_active_user_json_handler.rs @@ -6,7 +6,7 @@ use actix_helpers::extractors::get_request_user_agent::get_request_user_agent; use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::analytics::log_active_user::{LogAppActiveUserRequest, LogAppActiveUserResponse}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use http_server_common::request::get_request_ip::get_request_ip; use log::{info, warn}; use mysql_queries::queries::analytics_active_users::upsert_analytics_app_active_user::UpsertAnalyticsAppActiveUser; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_permissions.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_permissions.rs index 03576c44a7..f9b3a0b792 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_permissions.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_permissions.rs @@ -1,5 +1,5 @@ use crate::http_server::session::lookup::user_session_extended::{UserSessionExtended, UserSessionRoleAndPermissions}; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; use std::collections::BTreeSet; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs index 4100ed3075..3e4d9a2e10 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs @@ -8,7 +8,7 @@ use log::warn; use utoipa::ToSchema; use crockford::crockford_entropy_lower; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; +use enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct; use mysql_queries::queries::beta_keys::insert_batch_beta_keys::{insert_batch_beta_keys, InsertBatchArgs}; use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs index 3683ac46ad..8a7c9c8add 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs @@ -8,7 +8,7 @@ use chrono::{DateTime, Utc}; use log::warn; use utoipa::{IntoParams, ToSchema}; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; +use enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct; use markdown::markdown_with_socials_to_html::markdown_with_socials_to_html; use mysql_queries::queries::beta_keys::list_beta_keys::{list_beta_keys, FilterToKeys, ListBetaKeysArgs}; use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs index 13b72bbe4e..9617270a45 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs @@ -8,8 +8,8 @@ use log::warn; use utoipa::ToSchema; use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; -use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::beta_keys::get_beta_key_by_value::get_beta_key_by_value; use mysql_queries::queries::beta_keys::redeem_beta_key::redeem_beta_key; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/comments/create_comment_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/comments/create_comment_handler.rs index 33cdf9b035..76b3ec55f6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/comments/create_comment_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/comments/create_comment_handler.rs @@ -12,7 +12,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; -use enums::by_table::comments::comment_entity_type::CommentEntityType; +use enums_db::by_table::comments::comment_entity_type::CommentEntityType; use http_server_common::request::get_request_ip::get_request_ip; use markdown::simple_markdown_to_html::simple_markdown_to_html; use mysql_queries::queries::comments::comment_entity_token::CommentEntityToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/comments/list_comments_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/comments/list_comments_handler.rs index 0488150846..3dd26e732d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/comments/list_comments_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/comments/list_comments_handler.rs @@ -17,7 +17,7 @@ use utoipa::ToSchema; use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight}; -use enums::by_table::comments::comment_entity_type::CommentEntityType; +use enums_db::by_table::comments::comment_entity_type::CommentEntityType; use mysql_queries::queries::comments::comment_entity_token::CommentEntityToken; use mysql_queries::queries::comments::list_comments_for_entity::list_comments_for_entity; use tokens::tokens::comments::CommentToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/credits/get_session_credits_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/credits/get_session_credits_handler.rs index ac01e43d83..bff4d5b0ed 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/credits/get_session_credits_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/credits/get_session_credits_handler.rs @@ -8,7 +8,7 @@ use actix_web::web::{Json, Path}; use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use artcraft_api_defs::credits::get_session_credits::GetSessionCreditsResponse; use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::{error, warn}; use mysql_queries::queries::prompt_context_items::list_prompt_context_items::list_prompt_context_items; use mysql_queries::queries::prompts::get_prompt::{get_prompt, get_prompt_from_connection}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs index 87404114df..e63a81ef7e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs @@ -7,8 +7,8 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::{info, warn}; use config::bad_urls::is_bad_tts_model_download_url; -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 http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::generic_download::web::insert_generic_download_job::{insert_generic_download_job, InsertGenericDownloadJobArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/create_featured_item_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/create_featured_item_handler.rs index 38ee4bcd58..aafa897ef1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/create_featured_item_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/create_featured_item_handler.rs @@ -10,9 +10,9 @@ use utoipa::ToSchema; use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity; use composite_identifiers::by_table::featured_items::featured_item_entity::FeaturedItemEntity; -use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; -use enums::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; -use enums::common::visibility::Visibility; +use enums_db::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; +use enums_db::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::audit_logs::insert_audit_log_transactional::{insert_audit_log_transactional, InsertAuditLogTransactionalArgs}; use mysql_queries::queries::featured_items::upsert_featured_item::{upsert_featured_item, UpsertFeaturedItemArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/delete_featured_item_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/delete_featured_item_handler.rs index 98630dceb2..66d68db22b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/delete_featured_item_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/delete_featured_item_handler.rs @@ -10,8 +10,8 @@ use utoipa::ToSchema; use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity; use composite_identifiers::by_table::featured_items::featured_item_entity::FeaturedItemEntity; -use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; -use enums::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; +use enums_db::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction; +use enums_db::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::audit_logs::insert_audit_log_transactional::{insert_audit_log_transactional, InsertAuditLogTransactionalArgs}; use mysql_queries::queries::featured_items::delete_featured_item::delete_featured_item; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/get_is_featured_item_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/get_is_featured_item_handler.rs index 1eb042f3b3..c7c4880242 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/get_is_featured_item_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/featured_items/get_is_featured_item_handler.rs @@ -9,7 +9,7 @@ use log::warn; use utoipa::ToSchema; use composite_identifiers::by_table::featured_items::featured_item_entity::FeaturedItemEntity; -use enums::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; +use enums_db::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType; use mysql_queries::queries::featured_items::get_is_featured_by_token::get_is_featured_by_token; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/job_failure_test.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/job_failure_test.rs index 9da3052737..25a8c3b3a5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/job_failure_test.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/job_failure_test.rs @@ -1,4 +1,4 @@ -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; pub struct SyntheticFailure { pub frontend_failure_category: FrontendFailureCategory, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/test_synthetic_failure_reason.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/test_synthetic_failure_reason.rs index e45cce9a5c..1a6aa78ffc 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/test_synthetic_failure_reason.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/test_synthetic_failure_reason.rs @@ -1,4 +1,4 @@ -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; pub struct SyntheticFailure { pub frontend_failure_category: FrontendFailureCategory, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/image/estimate_image_cost_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/image/estimate_image_cost_handler.rs index 24e3871f63..1c7ec849ea 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/image/estimate_image_cost_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/image/estimate_image_cost_handler.rs @@ -14,10 +14,10 @@ use artcraft_router::api::provider::Provider as RouterProvider; use artcraft_router::client::generation_mode_mismatch_strategy::GenerationModeMismatchStrategy; use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use artcraft_router::generate::generate_image::generate_image_request::GenerateImageRequest; -use enums::common::generation::common_aspect_ratio::CommonAspectRatio; -use enums::common::generation::common_image_model::CommonImageModel; -use enums::common::generation::common_video_resolution::CommonVideoResolution; -use enums::common::generation_provider::GenerationProvider; +use enums_api::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums_api::common::generation::common_image_model::CommonImageModel; +use enums_api::common::generation::common_video_resolution::CommonVideoResolution; +use enums_db::common::generation::generation_provider::GenerationProvider; /// Estimate the credit and USD cost of an image generation request. /// Does not require authentication and does not charge any credits. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/splat/estimate_splat_cost_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/splat/estimate_splat_cost_handler.rs index a0715ccf85..bab6fcf146 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/splat/estimate_splat_cost_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/splat/estimate_splat_cost_handler.rs @@ -11,8 +11,8 @@ use artcraft_router::api::common_splat_model::CommonSplatModel as RouterSplatMod use artcraft_router::api::image_list_ref::ImageListRef; use artcraft_router::api::provider::Provider as RouterProvider; use artcraft_router::generate::generate_splat::generate_splat_request::GenerateSplatRequest; -use enums::common::generation::common_splat_model::CommonSplatModel; -use enums::common::generation_provider::GenerationProvider; +use enums_api::common::generation::common_splat_model::CommonSplatModel; +use enums_db::common::generation::generation_provider::GenerationProvider; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/video/estimate_video_cost_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/video/estimate_video_cost_handler.rs index e2e627bea2..fd4cd55640 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/video/estimate_video_cost_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/video/estimate_video_cost_handler.rs @@ -13,10 +13,10 @@ use artcraft_router::api::common_video_model::CommonVideoModel as RouterVideoMod use artcraft_router::api::provider::Provider as RouterProvider; use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use artcraft_router::generate::generate_video::generate_video_request::GenerateVideoRequest; -use enums::common::generation::common_aspect_ratio::CommonAspectRatio; -use enums::common::generation::common_video_model::CommonVideoModel; -use enums::common::generation::common_video_resolution::CommonVideoResolution; -use enums::common::generation_provider::GenerationProvider; +use enums_api::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums_api::common::generation::common_video_model::CommonVideoModel; +use enums_api::common::generation::common_video_resolution::CommonVideoResolution; +use enums_db::common::generation::generation_provider::GenerationProvider; /// Estimate the credit and USD cost of a video generation request. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs index 1b1ea5f93e..8fd6f62dc1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs @@ -9,11 +9,11 @@ use crate::util::lookup::lookup_image_urls_as_optional_list::lookup_image_urls_a use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::angle::flux_2_lora_edit_image_angle::{Flux2LoraEditImageAngleImageSize, Flux2LoraEditImageAngleNumImages, Flux2LoraEditImageAngleRequest, Flux2LoraEditImageAngleResponse}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::angle::enqueue_flux_2_lora_edit_image_angle_webhook::{enqueue_flux_2_lora_edit_image_angle_webhook, EnqueueFlux2LoraEditImageAngleArgs, EnqueueFlux2LoraAngleNumImages, EnqueueFlux2LoraAngleImageSize}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs index cf5db2d264..ed65eafd69 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs @@ -9,11 +9,11 @@ use crate::util::lookup::lookup_image_urls_as_optional_list::lookup_image_urls_a use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::angle::qwen_edit_2511_edit_image_angle::{QwenEdit2511EditImageAngleImageSize, QwenEdit2511EditImageAngleNumImages, QwenEdit2511EditImageAngleRequest, QwenEdit2511EditImageAngleResponse}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::angle::enqueue_qwen_edit_2511_edit_image_angle_webhook::{enqueue_qwen_edit_2511_edit_image_angle_webhook, EnqueueQwenEdit2511EditImageAngleArgs, EnqueueQwenEdit2511AngleNumImages, EnqueueQwenEdit2511AngleImageSize}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/flux_pro_kontext_max_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/flux_pro_kontext_max_edit_image_handler.rs index a2a0ebca3b..002b39ae1a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/flux_pro_kontext_max_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/flux_pro_kontext_max_edit_image_handler.rs @@ -11,11 +11,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::edit::flux_pro_kontext_max_edit_image::{FluxProKontextMaxEditImageNumImages, FluxProKontextMaxEditImageRequest, FluxProKontextMaxEditImageResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::webhook::image::edit::enqueue_flux_pro_kontext_max_edit_webhook::{enqueue_flux_pro_kontext_max_edit_webhook, FluxProKontextMaxArgs, FluxProKontextMaxNumImages}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs index 4bcbfe763c..4b8e0217a7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs @@ -10,13 +10,13 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::edit::gemini_25_flash_edit_image::{Gemini25FlashEditImageNumImages, Gemini25FlashEditImageRequest, Gemini25FlashEditImageResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::payments_namespace::PaymentsNamespace; +use enums_db::common::stripe_subscription_status::StripeSubscriptionStatus; +use enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::webhook::image::edit::enqueue_gemini_25_flash_edit_webhook::{enqueue_gemini_25_flash_edit_webhook, Gemini25FlashEditArgs, Gemini25FlashEditNumImages}; use fal_client::requests::webhook::image::edit::enqueue_gpt_image_1_edit_image_webhook::enqueue_gpt_image_1_edit_image_webhook; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs index bd66cb6f31..7360bf5483 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs @@ -11,13 +11,13 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest, GptImage1EditImageResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::payments_namespace::PaymentsNamespace; +use enums_db::common::stripe_subscription_status::StripeSubscriptionStatus; +use enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::edit::enqueue_gpt_image_1_edit_image_webhook::enqueue_gpt_image_1_edit_image_webhook; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/qwen_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/qwen_edit_image_handler.rs index a2c6d19be1..7c3b897e44 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/qwen_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/qwen_edit_image_handler.rs @@ -11,11 +11,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::edit::qwen_edit_image::{QwenEditImageAcceleration, QwenEditImageNumImages, QwenEditImageRequest, QwenEditImageResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::edit::enqueue_qwen_image_edit_webhook::{enqueue_qwen_image_edit_webhook, QwenImageEditArgs, QwenImageEditNumImages}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/seededit_3_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/seededit_3_edit_image_handler.rs index 4ee48bb68a..ed82f1e514 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/seededit_3_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/seededit_3_edit_image_handler.rs @@ -10,11 +10,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::edit::seededit_3_edit_image::{SeedEdit3EditImageRequest, SeedEdit3EditImageResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::webhook::image::edit::enqueue_seededit_v3_edit_webhook::{enqueue_seededit_v3_edit_webhook, SeedEditV3EditArgs}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_dev_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_dev_text_to_image_handler.rs index 6f6522e93d..74ac0428a0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_dev_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_dev_text_to_image_handler.rs @@ -10,11 +10,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::edit::flux_pro_kontext_max_edit_image::FluxProKontextMaxEditImageNumImages; use artcraft_api_defs::generate::image::text::generate_flux_1_dev_text_to_image::{GenerateFlux1DevTextToImageAspectRatio, GenerateFlux1DevTextToImageNumImages, GenerateFlux1DevTextToImageRequest, GenerateFlux1DevTextToImageResponse}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +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 enums_db::common::visibility::Visibility; use fal_client::requests::webhook::image::text::enqueue_flux_1_dev_text_to_image_webhook::enqueue_flux_1_dev_text_to_image_webhook; use fal_client::requests::webhook::image::text::enqueue_flux_1_dev_text_to_image_webhook::{Flux1DevArgs, Flux1DevAspectRatio, Flux1DevNumImages}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_schnell_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_schnell_text_to_image_handler.rs index 148762f529..3ef5d84b4b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_schnell_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_schnell_text_to_image_handler.rs @@ -8,10 +8,10 @@ use crate::state::server_state::ServerState; use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::text::generate_flux_1_schnell_text_to_image::{GenerateFlux1SchnellTextToImageAspectRatio, GenerateFlux1SchnellTextToImageNumImages, GenerateFlux1SchnellTextToImageRequest, GenerateFlux1SchnellTextToImageResponse}; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::webhook::image::text::enqueue_flux_1_schnell_text_to_image_webhook::enqueue_flux_1_schnell_text_to_image_webhook; use fal_client::requests::webhook::image::text::enqueue_flux_1_schnell_text_to_image_webhook::{Flux1SchnellArgs, Flux1SchnellAspectRatio, Flux1SchnellNumImages}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_text_to_image_handler.rs index aca1759669..58014f204e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_text_to_image_handler.rs @@ -11,10 +11,10 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::text::generate_flux_1_schnell_text_to_image::GenerateFlux1SchnellTextToImageNumImages; use artcraft_api_defs::generate::image::text::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageResponse; use artcraft_api_defs::generate::image::text::generate_flux_pro_11_text_to_image::{GenerateFluxPro11TextToImageAspectRatio, GenerateFluxPro11TextToImageNumImages, GenerateFluxPro11TextToImageRequest}; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_text_to_image_webhook::FluxPro11Args; use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_text_to_image_webhook::{enqueue_flux_pro_11_text_to_image_webhook, FluxPro11AspectRatio, FluxPro11NumImages}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_ultra_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_ultra_text_to_image_handler.rs index d09100a203..1609384324 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_ultra_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_ultra_text_to_image_handler.rs @@ -11,10 +11,10 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::text::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageNumImages; use artcraft_api_defs::generate::image::text::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageResponse; use artcraft_api_defs::generate::image::text::generate_flux_pro_11_ultra_text_to_image::{GenerateFluxPro11UltraTextToImageAspectRatio, GenerateFluxPro11UltraTextToImageNumImages, GenerateFluxPro11UltraTextToImageRequest}; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_ultra_text_to_image_webhook::FluxPro11UltraArgs; use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_ultra_text_to_image_webhook::{enqueue_flux_pro_11_ultra_text_to_image_webhook, FluxPro11UltraAspectRatio, FluxPro11UltraNumImages}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_gpt_image_1_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_gpt_image_1_text_to_image_handler.rs index f04966e7c9..12ddf007b9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_gpt_image_1_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_gpt_image_1_text_to_image_handler.rs @@ -11,13 +11,13 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::text::generate_gpt_image_1_text_to_image::{GenerateGptImage1TextToImageImageQuality, GenerateGptImage1TextToImageImageSize, GenerateGptImage1TextToImageNumImages, GenerateGptImage1TextToImageRequest, GenerateGptImage1TextToImageResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::payments_namespace::PaymentsNamespace; +use enums_db::common::stripe_subscription_status::StripeSubscriptionStatus; +use enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::text::enqueue_gpt_image_1_text_to_image_webhook::{enqueue_gpt_image_1_text_to_image_webhook, GptTextToImageByokArgs, GptTextToImageNumImages, GptTextToImageQuality, GptTextToImageSize}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs index 0b0c658b39..1728020b45 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs @@ -10,11 +10,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::inpaint::flux_dev_juggernaut_inpaint_image::{FluxDevJuggernautInpaintImageNumImages, FluxDevJuggernautInpaintImageRequest, FluxDevJuggernautInpaintImageResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::webhook::image::infill::enqueue_flux_dev_juggernaut_infill_webhook::{enqueue_flux_dev_juggernaut_infill_webhook, FluxDevJuggernautInfillArgs, FluxDevJuggernautInfillNumImages}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs index 0393c80fe0..d5b729cc64 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs @@ -10,11 +10,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::inpaint::flux_pro_1_inpaint_image::{FluxPro1InpaintImageNumImages, FluxPro1InpaintImageRequest, FluxPro1InpaintImageResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::webhook::image::infill::enqueue_flux_pro_1_infill_webhook::{enqueue_flux_pro_1_infill_webhook, FluxPro1InfillArgs, FluxPro1InfillNumImages}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs index 2922178b9a..3f013743d0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs @@ -9,11 +9,11 @@ use crate::util::lookup::lookup_image_urls_as_optional_list::lookup_image_urls_a use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::multi_function::bytedance_seedream_5_lite_multi_function_image_gen::{BytedanceSeedream5LiteMultiFunctionImageGenImageSize, BytedanceSeedream5LiteMultiFunctionImageGenNumImages, BytedanceSeedream5LiteMultiFunctionImageGenRequest, BytedanceSeedream5LiteMultiFunctionImageGenResponse}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v5_lite_edit_image_webhook::{enqueue_bytedance_seedream_v5_lite_edit_image_webhook, EnqueueBytedanceSeedreamV5LiteEditImageArgs, EnqueueBytedanceSeedreamV5LiteEditImageNumImages, EnqueueBytedanceSeedreamV5LiteEditImageSize}; use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v5_lite_text_to_image_webhook::{enqueue_bytedance_seedream_v5_lite_text_to_image_webhook, EnqueueBytedanceSeedreamV5LiteTextToImageArgs, EnqueueBytedanceSeedreamV5LiteTextToImageNumImages, EnqueueBytedanceSeedreamV5LiteTextToImageSize}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs index 7720e7ed0f..71cca27e21 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs @@ -14,11 +14,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::multi_function::bytedance_seedream_v4_multi_function_image_gen::{BytedanceSeedreamV4MultiFunctionImageGenImageSize, BytedanceSeedreamV4MultiFunctionImageGenNumImages, BytedanceSeedreamV4MultiFunctionImageGenRequest, BytedanceSeedreamV4MultiFunctionImageGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4_edit_image_webhook::{enqueue_bytedance_seedream_v4_edit_image_webhook, EnqueueBytedanceSeedreamV4EditImageArgs, EnqueueBytedanceSeedreamV4EditImageNumImages, EnqueueBytedanceSeedreamV4EditImageSize}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs index 816941efd8..b32ca8ee9d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs @@ -14,11 +14,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::multi_function::bytedance_seedream_v4p5_multi_function_image_gen::{BytedanceSeedreamV4p5MultiFunctionImageGenImageSize, BytedanceSeedreamV4p5MultiFunctionImageGenNumImages, BytedanceSeedreamV4p5MultiFunctionImageGenRequest, BytedanceSeedreamV4p5MultiFunctionImageGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4p5_edit_image_webhook::{enqueue_bytedance_seedream_v4p5_edit_image_webhook, EnqueueBytedanceSeedreamV4p5EditImageArgs, EnqueueBytedanceSeedreamV4p5EditImageNumImages, EnqueueBytedanceSeedreamV4p5EditImageSize}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs index 5aafcb3152..c7d4aaf72e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs @@ -14,13 +14,13 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::multi_function::gpt_image_1p5_multi_function_image_gen::{GptImage1p5MultiFunctionImageGenBackground, GptImage1p5MultiFunctionImageGenInputFidelity, GptImage1p5MultiFunctionImageGenNumImages, GptImage1p5MultiFunctionImageGenQuality, GptImage1p5MultiFunctionImageGenRequest, GptImage1p5MultiFunctionImageGenResponse, GptImage1p5MultiFunctionImageGenSize}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::payments_namespace::PaymentsNamespace; +use enums_db::common::stripe_subscription_status::StripeSubscriptionStatus; +use enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::edit::enqueue_gpt_image_1p5_edit_image_webhook::{enqueue_gpt_image_1p5_image_edit_webhook, EnqueueGptImage1p5EditImageArgs, EnqueueGptImage1p5EditImageBackground, EnqueueGptImage1p5EditImageInputFidelity, EnqueueGptImage1p5EditImageNumImages, EnqueueGptImage1p5EditImageQuality, EnqueueGptImage1p5EditImageSize}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_2_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_2_multi_function_image_gen_handler.rs index 92ccbe6e45..ef5f601484 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_2_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_2_multi_function_image_gen_handler.rs @@ -9,11 +9,11 @@ use crate::util::lookup::lookup_image_urls_as_optional_list::lookup_image_urls_a use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::multi_function::nano_banana_2_multi_function_image_gen::{NanaBanana2MultiFunctionImageGenAspectRatio, NanaBanana2MultiFunctionImageGenImageResolution, NanaBanana2MultiFunctionImageGenNumImages, NanaBanana2MultiFunctionImageGenRequest, NanaBanana2MultiFunctionImageGenResponse}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::edit::enqueue_nano_banana_2_edit_image_webhook::{enqueue_nano_banana_2_edit_image_webhook, EnqueueNanoBanana2EditImageArgs, EnqueueNanoBanana2EditImageAspectRatio, EnqueueNanoBanana2EditImageNumImages, EnqueueNanoBanana2EditImageResolution}; use fal_client::requests::webhook::image::text::enqueue_nano_banana_2_text_to_image_webhook::{enqueue_nano_banana_2_text_to_image_webhook, EnqueueNanoBanana2TextToImageArgs, EnqueueNanoBanana2TextToImageAspectRatio, EnqueueNanoBanana2TextToImageNumImages, EnqueueNanoBanana2TextToImageResolution}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs index e75b9956fa..171abaf2f3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs @@ -15,13 +15,13 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::edit::gemini_25_flash_edit_image::{Gemini25FlashEditImageNumImages, Gemini25FlashEditImageRequest}; use artcraft_api_defs::generate::image::multi_function::nano_banana_multi_function_image_gen::{NanoBananaMultiFunctionImageGenAspectRatio, NanoBananaMultiFunctionImageGenNumImages, NanoBananaMultiFunctionImageGenRequest, NanoBananaMultiFunctionImageGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::payments_namespace::PaymentsNamespace; +use enums_db::common::stripe_subscription_status::StripeSubscriptionStatus; +use enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::edit::enqueue_gemini_25_flash_edit_webhook::{enqueue_gemini_25_flash_edit_webhook, Gemini25FlashEditArgs, Gemini25FlashEditAspectRatio, Gemini25FlashEditNumImages}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs index f1f59b173c..0434e11329 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs @@ -14,13 +14,13 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::multi_function::nano_banana_pro_multi_function_image_gen::{NanoBananaProMultiFunctionImageGenAspectRatio, NanoBananaProMultiFunctionImageGenImageResolution, NanoBananaProMultiFunctionImageGenNumImages, NanoBananaProMultiFunctionImageGenRequest, NanoBananaProMultiFunctionImageGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::payments_namespace::PaymentsNamespace; +use enums_db::common::stripe_subscription_status::StripeSubscriptionStatus; +use enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::edit::enqueue_nano_banana_pro_edit_image_webhook::{enqueue_nano_banana_pro_image_edit_webhook, EnqueueNanoBananaProEditImageArgs, EnqueueNanoBananaProEditImageAspectRatio, EnqueueNanoBananaProEditImageNumImages, EnqueueNanoBananaProEditImageResolution}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs index 6ce3943489..583de1fd4c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs @@ -10,8 +10,8 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::bg_removal::remove_image_background::RemoveImageBackgroundRequest; use artcraft_api_defs::generate::image::bg_removal::remove_image_background::RemoveImageBackgroundResponse; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::common::model_type::ModelType; +use enums_db::common::visibility::Visibility; use fal_client::requests::webhook::image::background::remove_background_rembg_webhook::{remove_background_rembg_webhook, RemoveBackgroundRembgWebhookArgs}; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, info, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_0_image_to_3d_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_0_image_to_3d_handler.rs index 3f778ec0ed..b968a1ffa5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_0_image_to_3d_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_0_image_to_3d_handler.rs @@ -10,7 +10,7 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::object::generate_hunyuan_2_0_image_to_3d::GenerateHunyuan20ImageTo3dRequest; use artcraft_api_defs::generate::object::generate_hunyuan_2_0_image_to_3d::GenerateHunyuan20ImageTo3dResponse; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use fal_client::requests::webhook::object::enqueue_hunyuan_3d_2_image_to_3d_webhook::enqueue_hunyuan_3d_2_image_to_3d_webhook; use fal_client::requests::webhook::object::enqueue_hunyuan_3d_2_image_to_3d_webhook::Hunyuan3d2Args; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_1_image_to_3d_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_1_image_to_3d_handler.rs index 3ebb5600d8..c55b1cfa23 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_1_image_to_3d_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_1_image_to_3d_handler.rs @@ -10,7 +10,7 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::object::generate_hunyuan_2_1_image_to_3d::GenerateHunyuan21ImageTo3dRequest; use artcraft_api_defs::generate::object::generate_hunyuan_2_1_image_to_3d::GenerateHunyuan21ImageTo3dResponse; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use fal_client::requests::webhook::object::enqueue_hunyuan_3d_21_image_to_3d_webhook::enqueue_hunyuan_3d_2_1_image_to_3d_webhook; use fal_client::requests::webhook::object::enqueue_hunyuan_3d_21_image_to_3d_webhook::Hunyuan3d21Args; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/multi_function/generate_hunyuan3d_v3_multi_function_object_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/multi_function/generate_hunyuan3d_v3_multi_function_object_handler.rs index 6bb0f24360..73718936a4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/multi_function/generate_hunyuan3d_v3_multi_function_object_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/multi_function/generate_hunyuan3d_v3_multi_function_object_handler.rs @@ -12,11 +12,11 @@ use artcraft_api_defs::generate::object::multi_function::hunyuan3d_v3_multi_func Hunyuan3dV3GenerateType, Hunyuan3dV3MultiFunctionObjectGenRequest, Hunyuan3dV3MultiFunctionObjectGenResponse, Hunyuan3dV3PolygonType, }; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::requests::webhook::object::enqueue_hunyuan3d_v3_image_to_3d_webhook::{ enqueue_hunyuan3d_v3_image_to_3d_webhook, EnqueueHunyuan3dV3ImageTo3dArgs, EnqueueHunyuan3dV3ImageTo3dGenerateType, EnqueueHunyuan3dV3ImageTo3dPolygonType, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs index e6d94cfd13..cf5fa29b06 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs @@ -10,11 +10,11 @@ use crate::util::lookup::lookup_image_urls_as_map::lookup_image_urls_as_map; use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::splat::generate_worldlabs_marble_0p1_mini_splat::{GenerateWorldlabsMarble0p1MiniSplatRequest, GenerateWorldlabsMarble0p1MiniSplatResponse}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::worldlabs::insert_generic_inference_job_for_worldlabs_queue_with_apriori_job_token::{insert_generic_inference_job_for_worldlabs_queue_with_apriori_job_token, InsertGenericInferenceForWorldlabsWithAprioriJobTokenArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs index e23a7c6843..59dd04c7f5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs @@ -10,11 +10,11 @@ use crate::util::lookup::lookup_image_urls_as_map::lookup_image_urls_as_map; use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::splat::generate_worldlabs_marble_0p1_plus_splat::{GenerateWorldlabsMarble0p1PlusSplatRequest, GenerateWorldlabsMarble0p1PlusSplatResponse}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::worldlabs::insert_generic_inference_job_for_worldlabs_queue_with_apriori_job_token::{insert_generic_inference_job_for_worldlabs_queue_with_apriori_job_token, InsertGenericInferenceForWorldlabsWithAprioriJobTokenArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_1_6_pro_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_1_6_pro_video_handler.rs index 3b2afdee8d..8b79f9a426 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_1_6_pro_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_1_6_pro_video_handler.rs @@ -14,10 +14,10 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest}; use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProDuration, GenerateKling16ProImageToVideoResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_kling_v1p6_pro_image_to_video_webhook::{enqueue_kling_v1p6_pro_image_to_video_webhook, Kling1p6ProArgs, Kling1p6ProAspectRatio, Kling1p6ProDuration}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_master_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_master_video_handler.rs index 8b8fecdb9d..e3e7ed8ac3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_master_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_master_video_handler.rs @@ -12,10 +12,10 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::generate_kling_2_1_master_image_to_video::{GenerateKling21MasterAspectRatio, GenerateKling21MasterImageToVideoRequest}; use artcraft_api_defs::generate::video::generate_kling_2_1_master_image_to_video::{GenerateKling21MasterDuration, GenerateKling21MasterImageToVideoResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_kling_v2p1_master_image_to_video_webhook::{enqueue_kling_v2p1_master_image_to_video_webhook, Kling2p1MasterArgs, Kling2p1MasterAspectRatio, Kling2p1MasterDuration}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_pro_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_pro_video_handler.rs index 99d96df456..f61c7ad57d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_pro_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_pro_video_handler.rs @@ -14,10 +14,10 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProAspectRatio, GenerateKling21ProImageToVideoRequest}; use artcraft_api_defs::generate::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProDuration, GenerateKling21ProImageToVideoResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_kling_v2p1_pro_image_to_video_webhook::enqueue_kling_v2p1_pro_image_to_video_webhook; use fal_client::requests::webhook::video::image::enqueue_kling_v2p1_pro_image_to_video_webhook::Kling2p1ProArgs; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_lite_image_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_lite_image_to_video_handler.rs index 89591ff7ee..624de58f51 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_lite_image_to_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_lite_image_to_video_handler.rs @@ -16,10 +16,10 @@ use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_vide use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::GenerateSeedance10LiteResolution; use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::{GenerateSeedance10LiteAspectRatio, GenerateSeedance10LiteDuration}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_seedance_1_lite_image_to_video_webhook::Seedance1LiteDuration; use fal_client::requests::webhook::video::image::enqueue_seedance_1_lite_image_to_video_webhook::{enqueue_seedance_1_lite_image_to_video_webhook, Seedance1LiteAspectRatio}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_pro_image_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_pro_image_to_video_handler.rs index fada120a64..322b1153c6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_pro_image_to_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_pro_image_to_video_handler.rs @@ -16,10 +16,10 @@ use artcraft_api_defs::generate::video::generate_seedance_1_0_pro_image_to_video use artcraft_api_defs::generate::video::generate_seedance_1_0_pro_image_to_video::GenerateSeedance10ProImageToVideoResponse; use artcraft_api_defs::generate::video::generate_seedance_1_0_pro_image_to_video::GenerateSeedance10ProResolution; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_seedance_1_pro_image_to_video_webhook::enqueue_seedance_1_pro_image_to_video_webhook; use fal_client::requests::webhook::video::image::enqueue_seedance_1_pro_image_to_video_webhook::Seedance1ProDuration; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_2_image_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_2_image_to_video_handler.rs index 33ad2eec5b..26e29a401b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_2_image_to_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_2_image_to_video_handler.rs @@ -16,10 +16,10 @@ use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::GenerateV use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::GenerateVeo2ImageToVideoRequest; use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::GenerateVeo2ImageToVideoResponse; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_veo_2_image_to_video_webhook::enqueue_veo_2_image_to_video_webhook; use fal_client::requests::webhook::video::image::enqueue_veo_2_image_to_video_webhook::Veo2Args; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_3_fast_image_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_3_fast_image_to_video_handler.rs index 681071ddff..a7ff9ee597 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_3_fast_image_to_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_3_fast_image_to_video_handler.rs @@ -13,10 +13,10 @@ use actix_web::{web, HttpRequest}; use anyhow::anyhow; use artcraft_api_defs::generate::video::generate_veo_3_fast_image_to_video::{GenerateVeo3FastDuration, GenerateVeo3FastImageToVideoRequest, GenerateVeo3FastImageToVideoResponse, GenerateVeo3FastResolution}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_veo_3_fast_image_to_video_webhook::{enqueue_veo_3_fast_image_to_video_webhook, Veo3FastArgs, Veo3FastDuration, Veo3FastResolution}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_3_image_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_3_image_to_video_handler.rs index 3a74f24521..2743870c32 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_3_image_to_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_3_image_to_video_handler.rs @@ -13,10 +13,10 @@ use actix_web::{web, HttpRequest}; use anyhow::anyhow; use artcraft_api_defs::generate::video::generate_veo_3_image_to_video::{GenerateVeo3AspectRatio, GenerateVeo3Duration, GenerateVeo3ImageToVideoRequest, GenerateVeo3ImageToVideoResponse, GenerateVeo3Resolution}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_veo_3_image_to_video_webhook::{enqueue_veo_3_image_to_video_webhook, Veo3Args, Veo3AspectRatio, Veo3Duration, Veo3Resolution}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p5_turbo_pro_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p5_turbo_pro_multi_function_video_gen_handler.rs index c2b7238c21..a50e2ea8b7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p5_turbo_pro_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p5_turbo_pro_multi_function_video_gen_handler.rs @@ -14,11 +14,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::multi_function::kling_2_5_turbo_multi_function_video_gen::{Kling2p5TurboProMultiFunctionVideoGenAspectRatio, Kling2p5TurboProMultiFunctionVideoGenDuration, Kling2p5TurboProMultiFunctionVideoGenRequest, Kling2p5TurboProMultiFunctionVideoGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::edit::enqueue_gpt_image_1p5_edit_image_webhook::{enqueue_gpt_image_1p5_image_edit_webhook, EnqueueGptImage1p5EditImageArgs, EnqueueGptImage1p5EditImageBackground, EnqueueGptImage1p5EditImageInputFidelity, EnqueueGptImage1p5EditImageNumImages, EnqueueGptImage1p5EditImageQuality, EnqueueGptImage1p5EditImageSize}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p6_pro_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p6_pro_multi_function_video_gen_handler.rs index 5acf395212..11847e0720 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p6_pro_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p6_pro_multi_function_video_gen_handler.rs @@ -14,11 +14,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::multi_function::kling_2_6_multi_function_video_gen::{Kling2p6ProMultiFunctionVideoGenAspectRatio, Kling2p6ProMultiFunctionVideoGenDuration, Kling2p6ProMultiFunctionVideoGenRequest, Kling2p6ProMultiFunctionVideoGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_kling_v2p6_pro_image_to_video_webhook::{enqueue_kling_v2p6_pro_image_to_video_webhook, EnqueueKlingV2p6ProImageToVideoArgs, EnqueueKlingV2p6ProImageToVideoDurationSeconds}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_pro_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_pro_multi_function_video_gen_handler.rs index 661794f799..a5a3ac1d4b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_pro_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_pro_multi_function_video_gen_handler.rs @@ -14,11 +14,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::multi_function::kling_3p0_pro_multi_function_video_gen::{Kling3p0ProMultiFunctionVideoGenAspectRatio, Kling3p0ProMultiFunctionVideoGenDuration, Kling3p0ProMultiFunctionVideoGenRequest, Kling3p0ProMultiFunctionVideoGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_kling_3p0_pro_image_to_video_webhook::{enqueue_kling_3p0_pro_image_to_video_webhook, EnqueueKling3p0ProImageToVideoArgs, EnqueueKling3p0ProImageToVideoAspectRatio, EnqueueKling3p0ProImageToVideoDuration}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_standard_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_standard_multi_function_video_gen_handler.rs index 4c9c77a22d..6170362c86 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_standard_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_standard_multi_function_video_gen_handler.rs @@ -14,11 +14,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::multi_function::kling_3p0_standard_multi_function_video_gen::{Kling3p0StandardMultiFunctionVideoGenAspectRatio, Kling3p0StandardMultiFunctionVideoGenDuration, Kling3p0StandardMultiFunctionVideoGenRequest, Kling3p0StandardMultiFunctionVideoGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_kling_3p0_standard_image_to_video_webhook::{enqueue_kling_3p0_standard_image_to_video_webhook, EnqueueKling3p0StandardImageToVideoArgs, EnqueueKling3p0StandardImageToVideoAspectRatio, EnqueueKling3p0StandardImageToVideoDuration}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_1p5_pro_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_1p5_pro_multi_function_video_gen_handler.rs index a487864a49..790acdebbe 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_1p5_pro_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_1p5_pro_multi_function_video_gen_handler.rs @@ -10,11 +10,11 @@ use crate::util::lookup::lookup_image_urls_as_map::lookup_image_urls_as_map; use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::multi_function::seedance_1p5_pro_multi_function_video_gen::{Seedance1p5ProMultiFunctionVideoGenAspectRatio, Seedance1p5ProMultiFunctionVideoGenDuration, Seedance1p5ProMultiFunctionVideoGenRequest, Seedance1p5ProMultiFunctionVideoGenResolution, Seedance1p5ProMultiFunctionVideoGenResponse}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_seedance_1p5_pro_image_to_video_webhook::{enqueue_seedance_1p5_pro_image_to_video_webhook, EnqueueSeedance1p5ProImageToVideoArgs, EnqueueSeedance1p5ProImageToVideoAspectRatio, EnqueueSeedance1p5ProImageToVideoDuration, EnqueueSeedance1p5ProImageToVideoResolution}; use fal_client::requests::webhook::video::text::enqueue_seedance_1p5_pro_text_to_video_webhook::{enqueue_seedance_1p5_pro_text_to_video_webhook, EnqueueSeedance1p5ProTextToVideoArgs, EnqueueSeedance1p5ProTextToVideoAspectRatio, EnqueueSeedance1p5ProTextToVideoDuration, EnqueueSeedance1p5ProTextToVideoResolution}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs index 5a16cfe1f4..0b19d2b82e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs @@ -15,11 +15,11 @@ use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_funct Seedance2p0AspectRatio, Seedance2p0BatchCount, Seedance2p0MultiFunctionVideoGenRequest, Seedance2p0MultiFunctionVideoGenResponse, }; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::seedance2pro::insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token::{ diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_multi_function_video_gen_handler.rs index 8d4cb71177..db88b1d2a8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_multi_function_video_gen_handler.rs @@ -14,11 +14,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::multi_function::sora_2_multi_function_video_gen::{Sora2MultiFunctionVideoGenAspectRatio, Sora2MultiFunctionVideoGenDuration, Sora2MultiFunctionVideoGenRequest, Sora2MultiFunctionVideoGenResolution, Sora2MultiFunctionVideoGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_sora_2_image_to_video_webhook::{enqueue_sora_2_image_to_video_webhook, EnqueueSora2ImageToVideoArgs, EnqueueSora2ImageToVideoAspectRatio, EnqueueSora2ImageToVideoDurationSeconds, EnqueueSora2ImageToVideoResolution}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_pro_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_pro_multi_function_video_gen_handler.rs index 7b604d3cc8..b5ae6eb9c2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_pro_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_pro_multi_function_video_gen_handler.rs @@ -14,11 +14,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::multi_function::sora_2_pro_multi_function_video_gen::{Sora2ProMultiFunctionVideoGenAspectRatio, Sora2ProMultiFunctionVideoGenDuration, Sora2ProMultiFunctionVideoGenRequest, Sora2ProMultiFunctionVideoGenResolution, Sora2ProMultiFunctionVideoGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_sora_2_pro_image_to_video_webhook::{enqueue_sora_2_pro_image_to_video_webhook, EnqueueSora2ProImageToVideoArgs, EnqueueSora2ProImageToVideoAspectRatio, EnqueueSora2ProImageToVideoDurationSeconds, EnqueueSora2ProImageToVideoResolution}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_fast_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_fast_multi_function_video_gen_handler.rs index 342f2ecbed..681d3182f9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_fast_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_fast_multi_function_video_gen_handler.rs @@ -14,11 +14,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::multi_function::veo_3p1_fast_multi_function_video_gen::{Veo3p1FastMultiFunctionVideoGenAspectRatio, Veo3p1FastMultiFunctionVideoGenDuration, Veo3p1FastMultiFunctionVideoGenRequest, Veo3p1FastMultiFunctionVideoGenResolution, Veo3p1FastMultiFunctionVideoGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_veo_3p1_fast_first_last_frame_image_to_video_webhook::{enqueue_veo_3p1_fast_first_last_frame_image_to_video_webhook, EnqueueVeo3p1FastFirstLastFrameImageToVideoArgs, EnqueueVeo3p1FastFirstLastFrameImageToVideoAspectRatio, EnqueueVeo3p1FastFirstLastFrameImageToVideoDurationSeconds, EnqueueVeo3p1FastFirstLastFrameImageToVideoResolution}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_multi_function_video_gen_handler.rs index 8279d1516f..b59221c1f0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_multi_function_video_gen_handler.rs @@ -14,11 +14,11 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::video::multi_function::veo_3p1_multi_function_video_gen::{Veo3p1MultiFunctionVideoGenAspectRatio, Veo3p1MultiFunctionVideoGenDuration, Veo3p1MultiFunctionVideoGenRequest, Veo3p1MultiFunctionVideoGenResolution, Veo3p1MultiFunctionVideoGenResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::common::visibility::Visibility; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::common::visibility::Visibility; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::video::image::enqueue_veo_3p1_first_last_frame_image_to_video_webhook::{enqueue_veo_3p1_first_last_frame_image_to_video_webhook, EnqueueVeo3p1FirstLastFrameImageToVideoArgs, EnqueueVeo3p1FirstLastFrameImageToVideoAspectRatio, EnqueueVeo3p1FirstLastFrameImageToVideoDurationSeconds, EnqueueVeo3p1FirstLastFrameImageToVideoResolution}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/update_gpt_image_job_status_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/update_gpt_image_job_status_handler.rs index 8da01926e1..3bc97c4bfb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/update_gpt_image_job_status_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/update_gpt_image_job_status_handler.rs @@ -11,11 +11,11 @@ use base64::prelude::BASE64_STANDARD; use base64::Engine; 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_class::MediaFileClass; -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::job_status_plus::JobStatusPlus; +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_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::job_status_plus::JobStatusPlus; use errors::AnyhowResult; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use images::image_info::image_info::ImageInfo; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/upload/upload_snapshot_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/upload/upload_snapshot_media_file_handler.rs index f343672924..d50f7f5cc9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/upload/upload_snapshot_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/upload/upload_snapshot_media_file_handler.rs @@ -13,9 +13,9 @@ use once_cell::sync::Lazy; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/admin/kill_inference_jobs_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/admin/kill_inference_jobs_handler.rs index 45c8531491..d53a1572a0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/admin/kill_inference_jobs_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/admin/kill_inference_jobs_handler.rs @@ -7,8 +7,8 @@ use actix_web::http::StatusCode; use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; -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 http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::generic_inference::web::kill_generic_inference_jobs; use mysql_queries::queries::generic_inference::web::kill_generic_inference_jobs::{kill_generic_inference_jobs, KillGenericInferenceJobsArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs index e00de86dd3..04d2189d45 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs @@ -22,10 +22,10 @@ use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use bucket_paths::legacy::typified_paths::public::voice_conversion_results::bucket_file_path::VoiceConversionResultOriginalFilePath; use chrono::{DateTime, Utc}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use log::error; use mysql_queries::queries::generic_inference::web::batch_get_inference_job_status::batch_get_inference_job_status; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs index 19fd7f0f90..2fdf52fe54 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs @@ -20,10 +20,10 @@ use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use bucket_paths::legacy::typified_paths::public::voice_conversion_results::bucket_file_path::VoiceConversionResultOriginalFilePath; use chrono::{DateTime, Utc}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_db::common::job_status_plus::JobStatusPlus; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use log::error; use mysql_queries::queries::generic_inference::web::get_inference_job_status::get_inference_job_status; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; @@ -389,7 +389,7 @@ fn record_to_payload( mod tests { use crate::http_server::common_responses::media::media_domain::MediaDomain; use crate::http_server::endpoints::inference_job::get::get_inference_job_status_handler::record_to_payload; - use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; + use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory; use mysql_queries::queries::generic_inference::web::job_status::{GenericInferenceJobStatus, RequestDetails, ResultDetails}; use server_environment::ServerEnvironment; use url::Url; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs index c199d7da22..1cbb9b4122 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs @@ -21,12 +21,12 @@ use artcraft_api_defs::jobs::list_session_jobs::{ListSessionJobsItem, ListSessio use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use bucket_paths::legacy::typified_paths::public::voice_conversion_results::bucket_file_path::VoiceConversionResultOriginalFilePath; use chrono::{DateTime, Utc}; -use enums::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_api_clients::FrontendFailureCategoryForApiClients; -use enums::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_old_clients::FrontendFailureCategoryForOldClients; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_api::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_api_clients::FrontendFailureCategoryForApiClients; +use enums_api::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_old_clients::FrontendFailureCategoryForOldClients; +use 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::common::job_status_plus::JobStatusPlus; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use log::{error, warn}; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; use mysql_queries::queries::generic_inference::web::list_session_jobs::{list_session_jobs_from_connection, ListSessionJobsForUserArgs, SessionUser}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/estimates/estimate_job_progress.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/estimates/estimate_job_progress.rs index 2365e439d5..fdf6d6872b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/estimates/estimate_job_progress.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/estimates/estimate_job_progress.rs @@ -1,8 +1,8 @@ use std::cmp::min; -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_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 mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; @@ -105,7 +105,7 @@ pub fn estimate_job_progress(job: &GenericInferenceJobStatus, maybe_args: Option mod tests { use chrono::{Duration, Utc}; - use enums::common::job_status_plus::JobStatusPlus; + use enums_db::common::job_status_plus::JobStatusPlus; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; use crate::http_server::endpoints::inference_job::utils::estimates::estimate_job_progress::estimate_job_progress; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs index 2437aaef16..782ea06cea 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs @@ -8,8 +8,8 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::media_files::edit::update_media_file_animation_type::update_media_file_animation_type; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs index f5cb0d2809..25ae3f3f34 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs @@ -8,7 +8,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::media_files::edit::update_media_file_engine_category::update_media_file_engine_category; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_visibility_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_visibility_handler.rs index 34c676c80c..83a65d71ef 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_visibility_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_visibility_handler.rs @@ -8,7 +8,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::response_success_helpers::{simple_json_success, SimpleGenericJsonSuccess}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs index 2e0b978b72..08a4452864 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs @@ -8,7 +8,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::{info, warn}; use utoipa::ToSchema; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::media_files::edit::set_media_file_cover_image::{set_media_file_cover_image, UpdateArgs}; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/update_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/update_media_file_handler.rs index 60dfe4c163..e5afd7e6d1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/update_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/update_media_file_handler.rs @@ -7,7 +7,7 @@ use actix_web::web::Path; use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::response_success_helpers::simple_json_success; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs index 8eefccc75d..fea8d7789e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs @@ -10,15 +10,15 @@ use actix_web_lab::extract::Query; use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_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::no_table::style_transfer::style_transfer_name::StyleTransferName; +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::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use log::warn; use mysql_queries::queries::media_files::get::batch_get_media_files::batch_get_media_files; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs index 280d506737..3d8037e732 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs @@ -19,15 +19,15 @@ use actix_web::{web, HttpRequest, HttpResponse}; use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_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::no_table::style_transfer::style_transfer_name::StyleTransferName; +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::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use log::warn; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_engine_categories.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_engine_categories.rs index 6aa7b48ee4..648454b101 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_engine_categories.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_engine_categories.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; pub fn get_scoped_engine_categories( maybe_query_param: Option<&str> @@ -28,7 +28,7 @@ pub fn get_scoped_engine_categories( mod test { use std::collections::HashSet; - use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; + use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use crate::http_server::endpoints::media_files::helpers::get_scoped_engine_categories::get_scoped_engine_categories; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_classes.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_classes.rs index 1cbc8e448e..c677bfe456 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_classes.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_classes.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use enums::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; pub fn get_scoped_media_classes( maybe_query_param: Option<&str> @@ -34,7 +34,7 @@ pub fn get_scoped_media_classes( mod test { use std::collections::HashSet; - use enums::by_table::media_files::media_file_class::MediaFileClass; + use enums_db::by_table::media_files::media_file_class::MediaFileClass; use crate::http_server::endpoints::media_files::helpers::get_scoped_media_classes::get_scoped_media_classes; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_types.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_types.rs index 65ad137a79..aa0a019f8e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_types.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_types.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::media_files::media_file_type::MediaFileType; pub fn get_scoped_media_types( maybe_query_param: Option<&str> @@ -28,7 +28,7 @@ pub fn get_scoped_media_types( mod test { use std::collections::HashSet; - use enums::by_table::media_files::media_file_type::MediaFileType; + use enums_db::by_table::media_files::media_file_type::MediaFileType; use crate::http_server::endpoints::media_files::helpers::get_scoped_media_types::get_scoped_media_types; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_product_categories.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_product_categories.rs index c364acb2d1..abf52b2ef4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_product_categories.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_product_categories.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; +use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; use crate::http_server::common_requests::auto_product_category::AutoProductCategory; @@ -33,7 +33,7 @@ pub fn get_scoped_product_categories( mod test { use std::collections::HashSet; - use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; + use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; use crate::http_server::endpoints::media_files::helpers::get_scoped_product_categories::get_scoped_product_categories; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_batch_generated_redux_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_batch_generated_redux_media_files_handler.rs index 0fdc50385d..5f660f45f1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_batch_generated_redux_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_batch_generated_redux_media_files_handler.rs @@ -20,15 +20,15 @@ use artcraft_api_defs::common::responses::simple_entity_stats::SimpleEntityStats use artcraft_api_defs::media_file::list_batch_generated_media_files::{BatchGeneratedReduxMediaFileInfo, ListBatchGeneratedReduxMediaFilesPathInfo, ListBatchGeneratedReduxMediaFilesSuccessResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_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::no_table::style_transfer::style_transfer_name::StyleTransferName; +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::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use log::warn; use mysql_queries::queries::media_files::get::batch_get_media_files::batch_get_media_files; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs index aab70e1a7c..115326a852 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs @@ -6,14 +6,14 @@ use actix_web_lab::__reexports::tracing::info; use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_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::view_as::ViewAs; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +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::view_as::ViewAs; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::media_files::public_media_file_model_type::PublicMediaFileModelType; use log::{error, warn}; use mysql_queries::queries::media_files::list::list_featured_media_files::{list_featured_media_files, FeaturedMediaFileListPage, ListFeaturedMediaFilesArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs index 903a286ad5..925ab555c6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs @@ -7,15 +7,15 @@ use actix_web::{web, HttpRequest, HttpResponse}; use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_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::view_as::ViewAs; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +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::view_as::ViewAs; +use enums_db::common::visibility::Visibility; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::media_files::public_media_file_model_type::PublicMediaFileModelType; use log::warn; use mysql_queries::queries::media_files::list::list_media_files_by_batch_token::{list_media_files_by_batch_token, ListMediaFileByBatchArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs index 463952f5aa..9bd932f28f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs @@ -7,15 +7,15 @@ use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_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::view_as::ViewAs; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +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::view_as::ViewAs; +use enums_db::common::visibility::Visibility; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::media_files::public_media_file_model_type::PublicMediaFileModelType; use log::{info, warn}; use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs index 28e33413e3..89d4f5c49c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs @@ -7,15 +7,15 @@ use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_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::view_as::ViewAs; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +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::view_as::ViewAs; +use enums_db::common::visibility::Visibility; +use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::media_files::public_media_file_model_type::PublicMediaFileModelType; use log::warn; use mysql_queries::queries::media_files::list::list_media_files::{list_media_files, ListMediaFilesArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs index 3674621018..ebeefb7ff2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs @@ -6,13 +6,13 @@ use actix_web::{web, HttpRequest, HttpResponse}; use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_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::no_table::style_transfer::style_transfer_name::StyleTransferName; +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::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::media_files::public_media_file_model_type::PublicMediaFileModelType; use log::{debug, error, warn}; use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs index 421c28d5ff..16c7a844dd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs @@ -8,11 +8,11 @@ use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; use elasticsearch_schema::searches::search_media_files::{search_media_files, SearchArgs}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::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_type::MediaFileType; +use enums_db::common::visibility::Visibility; use log::warn; use tokens::tokens::media_files::MediaFileToken; use utoipa::{IntoParams, ToSchema}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs index da66f77d8b..6eeb98eb1c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs @@ -8,11 +8,11 @@ use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; use elasticsearch_schema::searches::search_media_files::{search_media_files, SearchArgs}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::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_type::MediaFileType; +use enums_db::common::visibility::Visibility; use log::warn; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs index 476c0581c0..12ba674559 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs @@ -13,9 +13,9 @@ use once_cell::sync::Lazy; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use media::decode_basic_audio_info::decode_basic_audio_bytes_info; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs index efc6f3cda5..884c0761f6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs @@ -4,8 +4,8 @@ use anyhow::anyhow; use futures::TryStreamExt; use log::warn; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use errors::AnyhowResult; use crate::http_server::web_utils::read_multipart_field_bytes::{checked_read_multipart_bytes, read_multipart_field_as_text}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs index bf66ea5606..fc4cd2cc02 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs @@ -7,9 +7,9 @@ use log::{error, info, warn}; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs index 3d46251eab..a5eb27824f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs @@ -6,10 +6,10 @@ use actix_web::{web, HttpRequest}; use log::{error, info, warn}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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_type::MediaFileType; -use enums::common::visibility::Visibility; +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_type::MediaFileType; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use media::decode_basic_audio_info::decode_basic_audio_bytes_info; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs index ac60314e40..7dd304b382 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs @@ -16,10 +16,10 @@ use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileU use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::generation::generation_provider::GenerationProvider; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs index 5018479f10..a226e73933 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs @@ -11,11 +11,11 @@ use log::{error, info, warn}; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::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_type::MediaFileType; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs index b0a41e2120..bc98533343 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs @@ -11,10 +11,10 @@ use log::{error, info, warn}; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs index 7f94b2d9a3..bd61a66601 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs @@ -10,11 +10,11 @@ use actix_web::{web, HttpRequest}; use log::{error, info, warn}; use utoipa::ToSchema; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::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_type::MediaFileType; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_saved_scene_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_saved_scene_media_file_handler.rs index 551db781c0..3d898fb09b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_saved_scene_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_saved_scene_media_file_handler.rs @@ -11,7 +11,7 @@ use log::{error, info, warn}; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs index a6861feff6..12605bc563 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs @@ -11,10 +11,10 @@ use log::{error, info, warn}; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_spz_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_spz_media_file_handler.rs index 750cb477fa..6ce4fb5ed2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_spz_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_spz_media_file_handler.rs @@ -11,10 +11,10 @@ use log::{error, info, warn}; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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_type::MediaFileType; -use enums::common::visibility::Visibility; +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_type::MediaFileType; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs index 4938b23d40..be562135bd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs @@ -11,8 +11,8 @@ use log::{error, info, warn}; use utoipa::ToSchema; 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 filesys::file_size::file_size; use hashing::sha256::sha256_hash_file::sha256_hash_file; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/upload_new_video_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/upload_new_video_media_file_handler.rs index 07e1efdc01..601efb6c98 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/upload_new_video_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/upload_new_video_media_file_handler.rs @@ -14,9 +14,9 @@ use std::time::Duration; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use ffmpeg_utils::ffmpeg::ffmpeg_trim_and_resample::{ffmpeg_trim_and_resample, Args}; use ffmpeg_utils::ffprobe::ffprobe_get_info::ffprobe_get_info; use filesys::file_read_bytes::file_read_bytes; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/upload_video_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/upload_video_media_file_handler.rs index 9e033e3e9b..9cfd5aa107 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/upload_video_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_old/upload_video_media_file_handler.rs @@ -8,9 +8,9 @@ use once_cell::sync::Lazy; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/drain_multipart_request.rs index ae36a7040f..b54dba9211 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/drain_multipart_request.rs @@ -3,8 +3,8 @@ use actix_web::web::BytesMut; use futures::TryStreamExt; use log::warn; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use tokens::tokens::media_files::MediaFileToken; use crate::http_server::endpoints::media_files::upsert_upload::write_error::MediaFileWriteError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/write_engine_asset_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/write_engine_asset_media_file_handler.rs index c43b14fd18..97002b89d8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/write_engine_asset_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_engine_asset/write_engine_asset_media_file_handler.rs @@ -7,9 +7,9 @@ use log::{error, info, warn}; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_class::MediaFileClass; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/write_scene_file_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/write_scene_file_media_file_handler.rs index 4e4c8027b2..9307b5824a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/write_scene_file_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_upload/write_scene_file/write_scene_file_media_file_handler.rs @@ -7,10 +7,10 @@ use log::{error, info, warn}; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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::common::visibility::Visibility; +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 enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs index 982c0ec662..f1a53e8003 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs @@ -9,10 +9,10 @@ use log::warn; use utoipa::ToSchema; use config::bad_urls::is_bad_tts_model_download_url; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -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::visibility::Visibility; +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::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/edit_user_feature_flags_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/edit_user_feature_flags_handler.rs index 036de5b244..17d9dd34d3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/edit_user_feature_flags_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/edit_user_feature_flags_handler.rs @@ -11,7 +11,7 @@ use log::warn; use redis::{Client, Commands}; use utoipa::ToSchema; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::users::user::get::get_user_token_by_username::get_user_token_by_username; use mysql_queries::queries::users::user::update::set_user_feature_flags::{set_user_feature_flags, SetUserFeatureFlagArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_add_banked_balance_to_wallet_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_add_banked_balance_to_wallet_handler.rs index 135d456554..bd6dea8c36 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_add_banked_balance_to_wallet_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_add_banked_balance_to_wallet_handler.rs @@ -9,7 +9,7 @@ use artcraft_api_defs::moderation::wallets::moderator_add_banked_balance_to_wall ModeratorAddBankedBalanceToWalletRequest, ModeratorAddBankedBalanceToWalletResponse, }; -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 mysql_queries::queries::wallets::add_durable_banked_balance_to_wallet::add_durable_banked_balance_to_wallet; use tokens::tokens::wallets::WalletToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_create_wallet_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_create_wallet_for_user_handler.rs index a4d6339a0f..4fdfdd68c3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_create_wallet_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_create_wallet_for_user_handler.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use actix_web::web::Json; use actix_web::{web, HttpRequest}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use log::{error, warn}; use sqlx::Acquire; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/create_prompt_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/create_prompt_handler.rs index 71e7fd27d9..2e9e414eed 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/create_prompt_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/create_prompt_handler.rs @@ -10,7 +10,7 @@ use crate::state::server_state::ServerState; use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::prompts::create_prompt::{CreatePromptRequest, CreatePromptResponse}; -use enums::by_table::prompts::prompt_type::PromptType; +use enums_db::by_table::prompts::prompt_type::PromptType; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, warn}; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/get_prompt_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/get_prompt_handler.rs index b580fe6ae5..23780e99d6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/get_prompt_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/prompts/get_prompt_handler.rs @@ -12,11 +12,11 @@ use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; +use enums_db::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +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 enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName; use log::{error, warn}; use mysql_queries::queries::prompt_context_items::list_prompt_context_items::list_prompt_context_items; use mysql_queries::queries::prompts::get_prompt::{get_prompt, get_prompt_from_connection}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs index 65d00438ba..857114ef49 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs @@ -12,9 +12,9 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; use utoipa::ToSchema; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; -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_type::InferenceJobType; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::common::watermark_type::WatermarkType; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/get_session_subscription_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/get_session_subscription_handler.rs index 00b76fc782..8d1e372c14 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/get_session_subscription_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/subscriptions/get_session_subscription_handler.rs @@ -9,7 +9,7 @@ use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use artcraft_api_defs::credits::get_session_credits::GetSessionCreditsResponse; use artcraft_api_defs::subscriptions::get_session_subscription::{GetSessionSubscriptionResponse, SubscriptionInfo}; use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::{error, warn}; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::find_subscription_for_owner_user_using_connection; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tags/list_tags_for_entity_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tags/list_tags_for_entity_handler.rs index 4aaa3c4918..9c489da540 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tags/list_tags_for_entity_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tags/list_tags_for_entity_handler.rs @@ -14,7 +14,7 @@ use actix_web::http::StatusCode; use actix_web::web::{Json, Path}; use actix_web::{web, HttpRequest, HttpResponse}; use composite_identifiers::by_table::tag_uses::tag_use_entity::TagUseEntity; -use enums::by_table::tag_uses::tag_use_entity_type::TagUseEntityType; +use enums_db::by_table::tag_uses::tag_use_entity_type::TagUseEntityType; use log::warn; use mysql_queries::queries::tags::list_tags_for_entity::list_tags_for_entity; use mysql_queries::utils::transactor::Transactor; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tags/set_tags_for_entity_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tags/set_tags_for_entity_handler.rs index 5b54fc8590..c24918e76a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tags/set_tags_for_entity_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tags/set_tags_for_entity_handler.rs @@ -15,7 +15,7 @@ use actix_web::http::StatusCode; use actix_web::web::{Data, Json, Path}; use actix_web::{HttpRequest, HttpResponse}; use composite_identifiers::by_table::tag_uses::tag_use_entity::TagUseEntity; -use enums::by_table::tag_uses::tag_use_entity_type::TagUseEntityType; +use enums_db::by_table::tag_uses::tag_use_entity_type::TagUseEntityType; use log::warn; use mysql_queries::queries::media_files::get::get_media_file::get_media_file_with_transactor; use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token_with_transactor; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs index a5fbcbbede..a83e93d119 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/trending/list_trending_tts_models.rs @@ -16,7 +16,7 @@ use actix_web::http::StatusCode; use actix_web::{web, HttpRequest, HttpResponse}; use log::error; -use enums::by_table::trending_model_analytics::window_name::WindowName; +use enums_db::by_table::trending_model_analytics::window_name::WindowName; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::trending_model_analytics::list_trending_tts_models::list_trending_tts_models_with_pool; use tokens::tokens::tts_models::TtsModelToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs index 5d7661bfcd..a6f5d1ad60 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs @@ -18,7 +18,7 @@ use crate::configs::supported_languages_for_models::get_canonicalized_language_t use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::state::server_state::ServerState; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use markdown::simple_markdown_to_html::simple_markdown_to_html; use mysql_queries::column_types::vocoder_type::VocoderType; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs index ddc83fb285..ff135952f3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs @@ -12,7 +12,7 @@ use actix_web::web::Path; use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, warn}; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::tts::tts_results::edit_tts_result::{edit_tts_result, CreatorOrModFields, EditTtsResultArgs}; use mysql_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_f5_tts_handler/enqueue_infer_f5_tts_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_f5_tts_handler/enqueue_infer_f5_tts_handler.rs index 320bb8c677..06d3f791e9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_f5_tts_handler/enqueue_infer_f5_tts_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_f5_tts_handler/enqueue_infer_f5_tts_handler.rs @@ -15,11 +15,11 @@ use rand::seq::IndexedRandom; use rand::Rng; use utoipa::ToSchema; -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::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::common::visibility::Visibility; use http_server_common::request::get_request_api_token::get_request_api_token; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs index d4e2511797..bc8f70a005 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs @@ -16,11 +16,11 @@ use rand::Rng; use redis::Commands; use utoipa::ToSchema; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -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_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 http_server_common::request::get_request_api_token::get_request_api_token; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs index 1e62c0bbe1..4d97545ab6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs @@ -15,8 +15,8 @@ use crate::http_server::validations::validate_model_title::validate_model_title; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; use config::bad_urls::is_bad_tts_model_download_url; -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 http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::generic_download::web::insert_generic_download_job::{insert_generic_download_job, InsertGenericDownloadJobArgs}; use mysql_queries::queries::tts::tts_model_upload_jobs::insert_tts_model_upload_job::{insert_tts_model_upload_job, InsertTtsModelUploadJobArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs index 16f882b95b..e72be16c21 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs @@ -15,8 +15,8 @@ use log::warn; use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; -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 http_server_common::response::serialize_as_json_error::serialize_as_json_error; use migration::text_to_speech::get_tts_model_info_migration::get_tts_model_info_migration; use mysql_queries::column_types::vocoder_type::VocoderType; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs index 867b5a95b5..3fd54eb228 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs @@ -16,8 +16,8 @@ use log::{error, info, warn}; use sqlx::pool::PoolConnection; use sqlx::MySql; -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 migration::text_to_speech::list_tts_models_for_migration::list_tts_models_for_migration; use mysql_queries::queries::tts::tts_category_assignments::fetch_and_build_tts_model_category_map::fetch_and_build_tts_model_category_map_with_connection; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/search_tts_models_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/search_tts_models_handler.rs index da122215b5..f260e17bce 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/search_tts_models_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/search_tts_models_handler.rs @@ -14,7 +14,7 @@ use chrono::{DateTime, Utc}; use log::error; use elasticsearch_schema::searches::search_tts_models::search_tts_models; -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/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/batch_get_user_bookmarks_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/batch_get_user_bookmarks_handler.rs index ade6a1da25..4ccaf3b102 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/batch_get_user_bookmarks_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/batch_get_user_bookmarks_handler.rs @@ -7,7 +7,7 @@ use actix_web_lab::extract::Query; use log::error; use utoipa::{IntoParams, ToSchema}; -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::users::user_bookmarks::batch_get_user_bookmarks::{batch_get_user_bookmarks, BatchUserBookmark}; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/create_user_bookmark_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/create_user_bookmark_handler.rs index a697a8ca44..116022dee5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/create_user_bookmark_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/create_user_bookmark_handler.rs @@ -13,7 +13,7 @@ use log::{error, warn}; use sqlx::Acquire; use utoipa::ToSchema; -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; use mysql_queries::queries::entity_stats::stats_entity_token::StatsEntityToken; use mysql_queries::queries::entity_stats::upsert_entity_stats_on_bookmark_event::{upsert_entity_stats_on_bookmark_event, BookmarkAction, UpsertEntityStatsArgs}; use mysql_queries::queries::users::user_bookmarks::get_total_bookmark_count_for_entity::get_total_bookmark_count_for_entity; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_entity_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_entity_handler.rs index d99c9ac5fe..f67fa9e7e5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_entity_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_entity_handler.rs @@ -15,7 +15,7 @@ use log::warn; use utoipa::ToSchema; use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight}; -use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; +use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType; use mysql_queries::queries::users::user_bookmarks::list_user_bookmarks_for_entity::list_user_bookmarks_for_entity; use mysql_queries::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken; use tokens::tokens::user_bookmarks::UserBookmarkToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_session_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_session_handler.rs index b427cdbcee..077d9e18ef 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_session_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_session_handler.rs @@ -8,7 +8,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; -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::user_bookmarks::UserBookmarkToken; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_user_handler.rs index a14958d9f9..8ef130e8f1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_user_handler.rs @@ -22,10 +22,10 @@ use actix_web::{web, HttpRequest, HttpResponse}; use artcraft_api_defs::common::responses::media_links::MediaLinks; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -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 enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use log::warn; use mysql_queries::queries::users::user_bookmarks::list_user_bookmarks::{list_user_bookmarks_by_maybe_entity_type, ListUserBookmarksForUserArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/batch_get_user_rating_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/batch_get_user_rating_handler.rs index 60d8da4dc6..82b78f2404 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/batch_get_user_rating_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/batch_get_user_rating_handler.rs @@ -7,8 +7,8 @@ use actix_web_lab::extract::Query; use log::error; use utoipa::{IntoParams, ToSchema}; -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 http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::users::user_ratings::batch_get_user_rating::{batch_get_user_ratings, BatchUserRating}; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs index 1865ed40f0..3bdccca89d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/get_user_rating_handler.rs @@ -5,8 +5,8 @@ use actix_web::{web, HttpRequest, HttpResponse, ResponseError}; use log::{error, info}; use utoipa::ToSchema; -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 http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; use mysql_queries::queries::users::user_ratings::get_user_rating::{get_user_rating, Args}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs index b5fbe5cc97..49298026f2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_ratings/set_user_rating_handler.rs @@ -6,8 +6,8 @@ use log::{error, info, warn}; use sqlx::Acquire; use utoipa::ToSchema; -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 http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_wallets/get_or_create_session_artcraft_wallet_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_wallets/get_or_create_session_artcraft_wallet_handler.rs index c99d854067..8a1189443c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_wallets/get_or_create_session_artcraft_wallet_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_wallets/get_or_create_session_artcraft_wallet_handler.rs @@ -4,7 +4,7 @@ use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::state::server_state::ServerState; use actix_web::web::Json; use actix_web::{web, HttpRequest}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_db::common::payments_namespace::PaymentsNamespace; use log::{error, warn}; use mysql_queries::queries::wallets::create_new_artcraft_wallet_for_owner_user::create_new_artcraft_wallet_for_owner_user; use mysql_queries::queries::wallets::find_primary_wallet_token_for_owner::find_primary_wallet_token_for_owner_using_connection; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs index 80edbbf783..c672c1bd87 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs @@ -16,7 +16,7 @@ use actix_artcraft::sessions::http_user_session_manager::HttpUserSessionManager; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{web, HttpRequest, HttpResponse}; -use enums::by_table::users::user_signup_source::UserSignupSource; +use enums_db::by_table::users::user_signup_source::UserSignupSource; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/edit_profile_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/edit_profile_handler.rs index d50b3911a4..1779e641bd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/edit_profile_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/edit_profile_handler.rs @@ -12,7 +12,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use sqlx::MySqlPool; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use markdown::simple_markdown_to_html::simple_markdown_to_html; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs index 0ea5f547a5..0ec4590585 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs @@ -17,8 +17,8 @@ use redis::{Client, Commands}; use sqlx::MySqlPool; use utoipa::ToSchema; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; -use enums::common::visibility::Visibility; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use http_server_common::util::timer::MultiBenchmarkingTimer; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs index 68edcb7d97..2e757a0a35 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs @@ -3,7 +3,7 @@ use crate::http_server::endpoints::users::google_sso::handle_new_sso_account::Ne use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; use actix_artcraft::requests::get_request_signup_source_enum::get_request_signup_source_enum; use actix_web::HttpRequest; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_api::by_table::users::user_feature_flag::UserFeatureFlag; use google_sign_in::claims::claims::Claims; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, info, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs index 8cca9af3c6..598e417868 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs @@ -8,7 +8,7 @@ use sqlx::MySqlPool; use strum_macros::Display; use crockford::crockford_entropy_lower; -use enums::by_table::email_sender_jobs::email_category::EmailCategory; +use enums_db::by_table::email_sender_jobs::email_category::EmailCategory; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use uuid_utils::uuid::generate_random_uuid; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs index 3ed0f75e9e..9cffac196f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs @@ -13,7 +13,7 @@ use sqlx::MySqlPool; use utoipa::ToSchema; use artcraft_api_defs::users::session_info::{FakeYouPlan, SessionInfoSuccessResponse, SessionOnboardingState, SessionUserInfo, StorytellerStreamPlan}; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; use http_server_common::response::response_error_helpers::to_simple_json_error; use crate::http_server::common_responses::user_details_lite_builder::UserDetailsLightBuilder; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_seed_vc_inference_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_seed_vc_inference_handler.rs index 43f779648c..8236787389 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_seed_vc_inference_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_seed_vc_inference_handler.rs @@ -13,11 +13,11 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::{info, warn}; use utoipa::ToSchema; -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::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::common::visibility::Visibility; use http_server_common::request::get_request_api_token::get_request_api_token; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_voice_conversion_inference_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_voice_conversion_inference_handler.rs index 75d81cc9ed..44da29d168 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_voice_conversion_inference_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_voice_conversion_inference_handler.rs @@ -16,12 +16,12 @@ use sqlx::pool::PoolConnection; use sqlx::MySql; use utoipa::ToSchema; -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 http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use migration::voice_conversion::query_vc_model_info_lite_for_migration::query_vc_model_info_lite_for_migration_with_connection; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/list_voice_conversion_models_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/list_voice_conversion_models_handler.rs index 79a48b9fe1..322fbbbe25 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/list_voice_conversion_models_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/list_voice_conversion_models_handler.rs @@ -16,8 +16,8 @@ use sqlx::pool::PoolConnection; use sqlx::MySql; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -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 migration::voice_conversion::list_vc_models_for_migration::list_vc_models_for_migration; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs index b1e943c391..979a4b3538 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs @@ -13,11 +13,11 @@ use serde::Deserialize; use serde::Serialize; use utoipa::ToSchema; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -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_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 http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{ diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/list_samples_by_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/list_samples_by_dataset.rs index 05433ed4e8..335b936781 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/list_samples_by_dataset.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/list_samples_by_dataset.rs @@ -6,7 +6,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use mysql_queries::queries::voice_designer::voice_samples::list_dataset_samples_for_dataset_token::list_dataset_samples_for_dataset_token; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/upload_zs_sample.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/upload_zs_sample.rs index 94f1db0adf..d0123521b9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/upload_zs_sample.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_dataset_samples/upload_zs_sample.rs @@ -7,9 +7,9 @@ use log::{error, info, warn}; use once_cell::sync::Lazy; 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_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_uploads::media_upload_type::MediaUploadType; +use enums_db::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/create_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/create_dataset.rs index ee85a82bf7..027dfed807 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/create_dataset.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/create_dataset.rs @@ -6,7 +6,7 @@ use actix_web::http::StatusCode; use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, warn}; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::voice_designer::datasets::create_dataset::{create_dataset, CreateDatasetArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/get_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/get_dataset.rs index da4f538ec2..a378b85099 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/get_dataset.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/get_dataset.rs @@ -9,7 +9,7 @@ use chrono::{DateTime, Utc}; use log::warn; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use mysql_queries::queries::voice_designer::datasets::get_dataset::get_dataset_by_token; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_session.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_session.rs index 88b789bf2b..986ae096b9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_session.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_session.rs @@ -8,7 +8,7 @@ use chrono::{DateTime, Utc}; use log::warn; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use mysql_queries::queries::voice_designer::datasets::list_datasets_by_username::list_datasets_by_username; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_user.rs index c7d92c08dd..518e40a9fa 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/list_datasets_by_user.rs @@ -10,7 +10,7 @@ use log::warn; use utoipa::ToSchema; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use mysql_queries::queries::voice_designer::datasets::list_datasets_by_username::list_datasets_by_username; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/update_dataset.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/update_dataset.rs index fe9b0d2deb..30660ce604 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/update_dataset.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voice_datasets/update_dataset.rs @@ -7,7 +7,7 @@ use actix_web::web::Path; use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, warn}; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::response_success_helpers::simple_json_success; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs index 5e4dd5aa55..67ca4a6894 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/create_voice.rs @@ -12,10 +12,10 @@ use log::warn; use serde::Deserialize; use serde::Serialize; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -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_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::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; +use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use http_server_common::request::get_request_header_optional::get_request_header_optional; use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::payloads::generic_inference_args::generic_inference_args::{ @@ -194,7 +194,7 @@ pub async fn create_voice_handler( }), maybe_creator_user_token: maybe_user_token.as_ref(), creator_ip_address: &ip_address, - creator_set_visibility: enums::common::visibility::Visibility::Public, + creator_set_visibility: enums_db::common::visibility::Visibility::Public, priority_level, requires_keepalive: true, maybe_avt_token: maybe_avt_token.as_ref(), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/get_voice.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/get_voice.rs index 470ea18f3c..50766439a2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/get_voice.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/get_voice.rs @@ -9,7 +9,7 @@ use chrono::{DateTime, Utc}; use log::warn; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use mysql_queries::queries::voice_designer::voices::get_voice::get_voice_by_token; use tokens::tokens::zs_voices::ZsVoiceToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_available_voices.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_available_voices.rs index 0ec6e14ba5..ccf29dbe84 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_available_voices.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_available_voices.rs @@ -7,7 +7,7 @@ use chrono::{DateTime, Utc}; use log::{info, warn}; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use mysql_queries::queries::voice_designer::voices::list_voices_query_builder::ListVoicesQueryBuilder; use tokens::tokens::zs_voices::ZsVoiceToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_user.rs index 757bbcaec0..b0a633c66a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/list_voices_by_user.rs @@ -9,7 +9,7 @@ use chrono::{DateTime, Utc}; use log::warn; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use mysql_queries::queries::voice_designer::voices::list_voices_by_username::list_zs_voices_by_username; use tokens::tokens::zs_voices::ZsVoiceToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/update_voice.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/update_voice.rs index 80c74dab5e..315cefec1b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/update_voice.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/voices/update_voice.rs @@ -7,7 +7,7 @@ use actix_web::web::Path; use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, warn}; -use enums::common::visibility::Visibility; +use enums_db::common::visibility::Visibility; use http_server_common::response::response_success_helpers::simple_json_success; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::voice_designer::voices::get_voice::get_voice_by_token; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_image_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_image_payload.rs index 26894b400e..5d608a5ec5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_image_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_image_payload.rs @@ -2,9 +2,9 @@ use crate::state::server_state::ServerState; use crate::util::http_download_url_to_bytes::http_download_url_to_bytes; use anyhow::anyhow; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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_type::MediaFileType; +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_type::MediaFileType; use errors::AnyhowResult; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use images::encoding::webp_bytes_to_png_bytes::webp_bytes_to_png_bytes; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_images_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_images_payload.rs index e338803b6d..99796df2f9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_images_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_images_payload.rs @@ -2,9 +2,9 @@ use crate::state::server_state::ServerState; use crate::util::http_download_url_to_bytes::http_download_url_to_bytes; use anyhow::anyhow; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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_type::MediaFileType; +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_type::MediaFileType; use errors::AnyhowResult; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use images::encoding::webp_bytes_to_png_bytes::webp_bytes_to_png_bytes; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_glb_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_glb_payload.rs index 48c9c13a80..a33d2974e7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_glb_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_glb_payload.rs @@ -2,10 +2,10 @@ use crate::state::server_state::ServerState; use crate::util::http_download_url_to_bytes::http_download_url_to_bytes; use anyhow::anyhow; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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_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_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use log::{info, warn}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_mesh_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_mesh_payload.rs index 977e43299f..c6232ec519 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_mesh_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_model_mesh_payload.rs @@ -2,10 +2,10 @@ use crate::state::server_state::ServerState; use crate::util::http_download_url_to_bytes::http_download_url_to_bytes; use anyhow::anyhow; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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_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_origin_category::MediaFileOriginCategory; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use errors::AnyhowResult; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use log::info; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_video_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_video_payload.rs index d1b9dbe71e..a9f624fb40 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_video_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/handle_video_payload.rs @@ -2,9 +2,9 @@ use crate::state::server_state::ServerState; use crate::util::http_download_url_to_bytes::http_download_url_to_bytes; use anyhow::anyhow; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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_type::MediaFileType; +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_type::MediaFileType; use errors::AnyhowResult; use filesys::path_to_string::path_to_string; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/get/get_weight_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/get/get_weight_handler.rs index 98cf173669..b04c0630a7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/get/get_weight_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/get/get_weight_handler.rs @@ -10,8 +10,8 @@ use log::warn; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::common::visibility::Visibility; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token; use primitives::numerics::u64_to_u32_saturating::u64_to_u32_saturating; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/helpers/get_scoped_weights_categories.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/helpers/get_scoped_weights_categories.rs index f32271fcd0..b23623c575 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/helpers/get_scoped_weights_categories.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/helpers/get_scoped_weights_categories.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use enums::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; pub fn get_scoped_weights_categories( maybe_query_param: Option<&str> @@ -28,7 +28,7 @@ pub fn get_scoped_weights_categories( mod test { use std::collections::HashSet; - use enums::by_table::model_weights::weights_category::WeightsCategory; + use enums_db::by_table::model_weights::weights_category::WeightsCategory; use crate::http_server::endpoints::weights::helpers::get_scoped_weights_categories::get_scoped_weights_categories; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/helpers/get_scoped_weights_types.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/helpers/get_scoped_weights_types.rs index 61db8cfbdb..cb05d65bf5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/helpers/get_scoped_weights_types.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/helpers/get_scoped_weights_types.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use enums::by_table::model_weights::weights_types::WeightsType; +use enums_db::by_table::model_weights::weights_types::WeightsType; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; /// Read the interface as PublicWeightsTypes, but convert them to internal WeightsTypes @@ -43,7 +43,7 @@ fn get_scoped_public_weights_types( mod test { use std::collections::HashSet; - use enums::by_table::model_weights::weights_types::WeightsType; + use enums_db::by_table::model_weights::weights_types::WeightsType; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use crate::http_server::endpoints::weights::helpers::get_scoped_weights_types::{get_scoped_public_weights_types, get_scoped_weights_types}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_available_weights_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_available_weights_handler.rs index ebc61599e9..cda3e68515 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_available_weights_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_available_weights_handler.rs @@ -9,11 +9,11 @@ use rand::Rng; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -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 enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use mysql_queries::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder; use primitives::numerics::u64_to_u32_saturating::u64_to_u32_saturating; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_featured_weights_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_featured_weights_handler.rs index c30bdf9b86..c6ef2b468c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_featured_weights_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_featured_weights_handler.rs @@ -9,8 +9,8 @@ use log::warn; use utoipa::{IntoParams, ToSchema}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::view_as::ViewAs; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::common::view_as::ViewAs; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use mysql_queries::queries::model_weights::list::list_featured_weights::{list_featured_weights, ListFeaturedWeightsArgs}; use primitives::numerics::u64_to_u32_saturating::u64_to_u32_saturating; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_pinned_weights_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_pinned_weights_handler.rs index feb6e61bb7..0b9fdac227 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_pinned_weights_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_pinned_weights_handler.rs @@ -9,7 +9,7 @@ use redis::Commands; use utoipa::ToSchema; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use mysql_queries::queries::model_weights::list::list_weights_by_tokens::list_weights_by_tokens; use primitives::numerics::u64_to_u32_saturating::u64_to_u32_saturating; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_weights_by_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_weights_by_user_handler.rs index 6b906a7847..21dc4fa398 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_weights_by_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_weights_by_user_handler.rs @@ -10,9 +10,9 @@ use log::warn; use utoipa::{IntoParams, ToSchema}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::view_as::ViewAs; -use enums::common::visibility::Visibility; +use enums_db::by_table::model_weights::weights_category::WeightsCategory; +use enums_db::common::view_as::ViewAs; +use enums_db::common::visibility::Visibility; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use mysql_queries::queries::model_weights::list::list_weights_by_user::{list_weights_by_creator_username, ListWeightsForUserArgs}; use primitives::numerics::u64_to_u32_saturating::u64_to_u32_saturating; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/search/search_model_weights_impl.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/search/search_model_weights_impl.rs index 717b5bd682..6a3e1080f5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/search/search_model_weights_impl.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/search/search_model_weights_impl.rs @@ -24,9 +24,9 @@ use crate::state::server_state::ServerState; use crate::util::title_to_url_slug::title_to_url_slug; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use elasticsearch_schema::searches::search_model_weights::search_model_weights::{search_model_weights, ModelWeightsSortDirection, ModelWeightsSortField, SearchArgs}; -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 enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use primitives::numerics::i32_to_u32_zero_clamped::i32_to_u32_zero_clamped; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/set_model_weight_cover_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/set_model_weight_cover_image_handler.rs index 3bedd57694..9742125ab3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/set_model_weight_cover_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/set_model_weight_cover_image_handler.rs @@ -8,7 +8,7 @@ use actix_web::{web, HttpRequest, HttpResponse}; use log::warn; use utoipa::ToSchema; -use enums::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::media_files::media_file_type::MediaFileType; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::response_success_helpers::simple_json_success; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs index 5575f6faa8..9e68da08fc 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs @@ -13,9 +13,9 @@ use crate::configs::supported_languages_for_models::{get_canonicalized_language_ use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; use crate::http_server::web_utils::user_session::require_user_session_using_connection::require_user_session_using_connection; use crate::state::server_state::ServerState; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; +use enums_db::by_table::media_files::media_file_type::MediaFileType; +use enums_db::by_table::model_weights::weights_types::WeightsType; +use enums_db::common::visibility::Visibility; use http_server_common::response::response_success_helpers::{simple_json_success, SimpleGenericJsonSuccess}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use markdown::simple_markdown_to_html::simple_markdown_to_html; diff --git a/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_extended.rs b/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_extended.rs index cb2c56cb61..62174cf202 100644 --- a/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_extended.rs +++ b/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_extended.rs @@ -1,6 +1,6 @@ use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; -use enums::common::visibility::Visibility; +use enums_db::common::payments_namespace::PaymentsNamespace; +use enums_db::common::visibility::Visibility; use tokens::tokens::users::UserToken; use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; diff --git a/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_feature_flags.rs b/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_feature_flags.rs index 1270686f39..049a9b221a 100644 --- a/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_feature_flags.rs +++ b/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_feature_flags.rs @@ -1,6 +1,6 @@ use std::collections::BTreeSet; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; #[derive(Default, Clone)] pub struct UserSessionFeatureFlags { @@ -89,7 +89,7 @@ impl UserSessionFeatureFlags { mod tests { use std::collections::BTreeSet; - use enums::by_table::users::user_feature_flag::UserFeatureFlag; + use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; diff --git a/crates/service/web/storyteller_web/src/state/memory_cache/model_token_to_info_cache.rs b/crates/service/web/storyteller_web/src/state/memory_cache/model_token_to_info_cache.rs index 022e453f7a..78f4b1e5c7 100644 --- a/crates/service/web/storyteller_web/src/state/memory_cache/model_token_to_info_cache.rs +++ b/crates/service/web/storyteller_web/src/state/memory_cache/model_token_to_info_cache.rs @@ -3,8 +3,8 @@ use std::sync::{Arc, RwLock}; use anyhow::anyhow; -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 errors::AnyhowResult; /// Associate model tokens with these to know immediately what metadata to populate an inference job with. diff --git a/crates/service/web/storyteller_web/src/threads/poll_model_token_info_thread.rs b/crates/service/web/storyteller_web/src/threads/poll_model_token_info_thread.rs index 2ccb947862..cdb4d20507 100644 --- a/crates/service/web/storyteller_web/src/threads/poll_model_token_info_thread.rs +++ b/crates/service/web/storyteller_web/src/threads/poll_model_token_info_thread.rs @@ -3,10 +3,10 @@ use std::time::Duration; use log::{debug, error, info}; use sqlx::MySqlPool; -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::list_model_weight_info_lite::list_model_weight_info_lite; use mysql_queries::queries::voice_conversion::model_info_lite::list_voice_conversion_model_info_lite::list_voice_conversion_model_info_lite; diff --git a/crates/service/web/storyteller_web/src/util/allowed_explore_media_access.rs b/crates/service/web/storyteller_web/src/util/allowed_explore_media_access.rs index 2deba14b88..3e3267581c 100644 --- a/crates/service/web/storyteller_web/src/util/allowed_explore_media_access.rs +++ b/crates/service/web/storyteller_web/src/util/allowed_explore_media_access.rs @@ -1,4 +1,4 @@ -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; diff --git a/crates/service/web/storyteller_web/src/util/allowed_studio_access.rs b/crates/service/web/storyteller_web/src/util/allowed_studio_access.rs index 475e2a0b67..7544bc875d 100644 --- a/crates/service/web/storyteller_web/src/util/allowed_studio_access.rs +++ b/crates/service/web/storyteller_web/src/util/allowed_studio_access.rs @@ -1,4 +1,4 @@ -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; diff --git a/crates/service/web/storyteller_web/src/util/allowed_video_style_transfer_access.rs b/crates/service/web/storyteller_web/src/util/allowed_video_style_transfer_access.rs index c64f78d113..bcbf1ef40b 100644 --- a/crates/service/web/storyteller_web/src/util/allowed_video_style_transfer_access.rs +++ b/crates/service/web/storyteller_web/src/util/allowed_video_style_transfer_access.rs @@ -1,4 +1,4 @@ -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; diff --git a/crates/service/web/storyteller_web/src/util/enroll_in_studio.rs b/crates/service/web/storyteller_web/src/util/enroll_in_studio.rs index 74461b7b8a..1eec56cfeb 100644 --- a/crates/service/web/storyteller_web/src/util/enroll_in_studio.rs +++ b/crates/service/web/storyteller_web/src/util/enroll_in_studio.rs @@ -1,6 +1,6 @@ use sqlx::MySqlPool; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_db::by_table::users::user_feature_flag::UserFeatureFlag; use errors::AnyhowResult; use mysql_queries::queries::users::user::update::set_can_access_studio_transactional::{set_can_access_studio_transactional, SetCanAccessStudioArgs}; use mysql_queries::queries::users::user::update::set_user_feature_flags_transactional::{set_user_feature_flags_transactional, SetUserFeatureFlagTransactionalArgs};