wip

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",

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

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;

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;

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;

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};

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;

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;

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;

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};

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 {

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(

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};

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;

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;

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;

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;

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};

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 {

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(

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};

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;

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;

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};

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;
 

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};

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;

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;

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;

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;

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(

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(

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};

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;

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;

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};

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 {

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;

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};

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};

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;

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;

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;

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;

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;

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;

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;

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, 

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;
 

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;
 

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;

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;

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;

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)]

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)]

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)]

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)]

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;
 

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)]

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 {

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 {

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;
 

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(

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(

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;

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;

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};

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(

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;

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;

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(

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};

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};

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};

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;

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};

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::<ArtcraftSubscriptionSlug>(&format!("\"{}\"", &sub.product_slug)) {
             Ok(product_slug) => product_slug,
             Err(err) => {
               error!("Received unknown product slug from storyteller: {:?}, error: {:?}", sub.product_slug, err);

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;

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;

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;

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;

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;

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;

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};

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};

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};