From aa0e96a232d72d753a552e2d0d15f5091a3a6f3c Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 3 May 2026 19:36:20 -0400 Subject: [PATCH] move old tauri commands to "deprecated" --- .../commands/app_state/reset_artcraft_command.rs | 2 +- .../artcraft/handle_artcraft_flux_kontext_edit.rs | 2 +- .../artcraft/handle_artcraft_gpt_image_1_edit.rs | 2 +- .../artcraft/handle_image_edit_artcraft.rs | 8 ++++---- .../handle_image_edit_artcraft_via_router.rs | 2 +- .../image_edit/artcraft/mod.rs | 0 .../image_edit/enqueue_edit_image_command.rs | 6 +++--- .../image_edit/image_edit_models.rs | 2 +- .../{enqueue => deprecated}/image_edit/mod.rs | 0 .../image_edit/sora/handle_image_edit_sora.rs | 6 +++--- .../image_edit/sora/handle_sora_gpt_image_1_edit.rs | 2 +- .../{enqueue => deprecated}/image_edit/sora/mod.rs | 0 .../handle_artcraft_flux_dev_juggernaut_inpaint.rs | 4 ++-- .../artcraft/handle_artcraft_flux_pro_1_inpaint.rs | 4 ++-- .../handle_artcraft_flux_pro_kontext_inpaint.rs | 4 ++-- .../artcraft/handle_artcraft_nano_banana_inpaint.rs | 4 ++-- .../artcraft/handle_inpaint_artcraft.rs | 10 +++++----- .../image_inpaint/artcraft/mod.rs | 0 .../image_inpaint/enqueue_image_inpaint_command.rs | 6 +++--- .../image_inpaint/inpaint_models.rs | 2 +- .../{enqueue => deprecated}/image_inpaint/mod.rs | 0 .../artcraft/src/core/commands/deprecated/mod.rs | 3 +++ .../handle_artcraft_gpt_image_1_text_to_image.rs | 4 ++-- .../artcraft/handle_text_to_image_artcraft.rs | 8 ++++---- .../handle_text_to_image_artcraft_via_router.rs | 2 +- .../text_to_image/artcraft/mod.rs | 0 .../text_to_image/enqueue_text_to_image_command.rs | 12 ++++++------ .../text_to_image/grok/handle_grok.rs | 2 +- .../text_to_image/grok/mod.rs | 0 .../text_to_image/midjourney/handle_midjourney.rs | 4 ++-- .../text_to_image/midjourney/mod.rs | 0 .../{enqueue => deprecated}/text_to_image/mod.rs | 0 .../sora/handle_gpt_image_1_sora_text_to_image.rs | 2 +- .../text_to_image/sora/handle_text_to_image_sora.rs | 4 ++-- .../text_to_image/sora/mod.rs | 0 .../text_to_image/text_to_image_models.rs | 2 +- .../artcraft/handle_generic_bg_removal_artcraft.rs | 2 +- .../worldlabs/handle_worldlabs_marble.rs | 2 +- .../artcraft/src/core/commands/enqueue/mod.rs | 7 ++----- .../generate_video/grok/handle_grok_video.rs | 4 ++-- crates/desktop/artcraft/src/core/commands/mod.rs | 3 ++- .../commands/storyteller_get_credits_command.rs | 2 +- .../commands/storyteller_get_subscription_command.rs | 2 +- .../storyteller_purge_credentials_command.rs | 2 +- .../storyteller_open_credits_purchase_command.rs | 2 +- ...storyteller_open_subscription_purchase_command.rs | 2 +- ...eller_open_customer_portal_cancel_plan_command.rs | 2 +- ...eller_open_customer_portal_manage_plan_command.rs | 2 +- ...eller_open_customer_portal_switch_plan_command.rs | 2 +- ..._customer_portal_update_payment_method_command.rs | 2 +- 50 files changed, 73 insertions(+), 72 deletions(-) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/artcraft/handle_artcraft_flux_kontext_edit.rs (97%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/artcraft/handle_artcraft_gpt_image_1_edit.rs (97%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/artcraft/handle_image_edit_artcraft.rs (85%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs (98%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/artcraft/mod.rs (100%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/enqueue_edit_image_command.rs (97%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/image_edit_models.rs (91%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/mod.rs (100%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/sora/handle_image_edit_sora.rs (78%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/sora/handle_sora_gpt_image_1_edit.rs (98%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_edit/sora/mod.rs (100%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_inpaint/artcraft/handle_artcraft_flux_dev_juggernaut_inpaint.rs (96%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_inpaint/artcraft/handle_artcraft_flux_pro_1_inpaint.rs (96%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_inpaint/artcraft/handle_artcraft_flux_pro_kontext_inpaint.rs (95%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_inpaint/artcraft/handle_artcraft_nano_banana_inpaint.rs (95%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_inpaint/artcraft/handle_inpaint_artcraft.rs (69%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_inpaint/artcraft/mod.rs (100%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_inpaint/enqueue_image_inpaint_command.rs (97%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_inpaint/inpaint_models.rs (81%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/image_inpaint/mod.rs (100%) create mode 100644 crates/desktop/artcraft/src/core/commands/deprecated/mod.rs rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/artcraft/handle_artcraft_gpt_image_1_text_to_image.rs (95%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/artcraft/handle_text_to_image_artcraft.rs (87%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs (98%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/artcraft/mod.rs (100%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/enqueue_text_to_image_command.rs (95%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/grok/handle_grok.rs (96%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/grok/mod.rs (100%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/midjourney/handle_midjourney.rs (95%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/midjourney/mod.rs (100%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/mod.rs (100%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/sora/handle_gpt_image_1_sora_text_to_image.rs (97%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/sora/handle_text_to_image_sora.rs (72%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/sora/mod.rs (100%) rename crates/desktop/artcraft/src/core/commands/{enqueue => deprecated}/text_to_image/text_to_image_models.rs (92%) diff --git a/crates/desktop/artcraft/src/core/commands/app_state/reset_artcraft_command.rs b/crates/desktop/artcraft/src/core/commands/app_state/reset_artcraft_command.rs index a6b7830273..b60bd65666 100644 --- a/crates/desktop/artcraft/src/core/commands/app_state/reset_artcraft_command.rs +++ b/crates/desktop/artcraft/src/core/commands/app_state/reset_artcraft_command.rs @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::EnqueueEditImageSuccessResponse; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::EnqueueEditImageSuccessResponse; use crate::core::commands::response::shorthand::ResponseOrErrorMessage; use crate::core::commands::response::success_response_wrapper::SerializeMarker; use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager; 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/deprecated/image_edit/artcraft/handle_artcraft_flux_kontext_edit.rs similarity index 97% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_flux_kontext_edit.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/handle_artcraft_flux_kontext_edit.rs index 252dcbbab0..7d36dcd03f 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/deprecated/image_edit/artcraft/handle_artcraft_flux_kontext_edit.rs @@ -1,5 +1,5 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; 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/deprecated/image_edit/artcraft/handle_artcraft_gpt_image_1_edit.rs similarity index 97% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_gpt_image_1_edit.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/handle_artcraft_gpt_image_1_edit.rs index edbf355ec1..0a310651bd 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/deprecated/image_edit/artcraft/handle_artcraft_gpt_image_1_edit.rs @@ -1,5 +1,5 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_image_edit_artcraft.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/handle_image_edit_artcraft.rs similarity index 85% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_image_edit_artcraft.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/handle_image_edit_artcraft.rs index 0901d8755d..68615912aa 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_image_edit_artcraft.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/handle_image_edit_artcraft.rs @@ -1,8 +1,8 @@ use crate::core::commands::enqueue::generate_error::GenerateError; -use crate::core::commands::enqueue::image_edit::artcraft::handle_artcraft_flux_kontext_edit::handle_artcraft_flux_kontext_edit; -use crate::core::commands::enqueue::image_edit::artcraft::handle_artcraft_gpt_image_1_edit::handle_artcraft_gpt_image_1_edit; -use crate::core::commands::enqueue::image_edit::artcraft::handle_image_edit_artcraft_via_router::handle_image_edit_artcraft_via_router; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EnqueueEditImageCommand, ImageEditModel}; +use crate::core::commands::deprecated::image_edit::artcraft::handle_artcraft_flux_kontext_edit::handle_artcraft_flux_kontext_edit; +use crate::core::commands::deprecated::image_edit::artcraft::handle_artcraft_gpt_image_1_edit::handle_artcraft_gpt_image_1_edit; +use crate::core::commands::deprecated::image_edit::artcraft::handle_image_edit_artcraft_via_router::handle_image_edit_artcraft_via_router; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EnqueueEditImageCommand, ImageEditModel}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::events::generation_events::common::GenerationModel; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; 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/deprecated/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs similarity index 98% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs index 809adee479..1168eab52e 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/deprecated/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs @@ -1,6 +1,6 @@ use crate::core::api_adapters::aspect_ratio::common_aspect_ratio::CommonAspectRatio as DesktopCommonAspectRatio; use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError, MissingCredentialsReason}; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{ +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{ EditImageResolution, EditImageSize, EnqueueEditImageCommand, }; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/mod.rs similarity index 100% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/mod.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/mod.rs diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/enqueue_edit_image_command.rs similarity index 97% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/enqueue_edit_image_command.rs index 4dabe4b047..c23b0db205 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/enqueue_edit_image_command.rs @@ -2,9 +2,9 @@ use crate::core::api_adapters::aspect_ratio::common_aspect_ratio::CommonAspectRa use crate::core::api_adapters::quality::common_quality::CommonQuality; use crate::core::commands::enqueue::common::notify_frontend_of_errors::notify_frontend_of_errors; use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; -use crate::core::commands::enqueue::image_edit::artcraft::handle_image_edit_artcraft::handle_image_edit_artcraft; -use crate::core::commands::enqueue::image_edit::image_edit_models::image_edit_model_to_model_type; -use crate::core::commands::enqueue::image_edit::sora::handle_image_edit_sora::handle_image_edit_sora; +use crate::core::commands::deprecated::image_edit::artcraft::handle_image_edit_artcraft::handle_image_edit_artcraft; +use crate::core::commands::deprecated::image_edit::image_edit_models::image_edit_model_to_model_type; +use crate::core::commands::deprecated::image_edit::sora::handle_image_edit_sora::handle_image_edit_sora; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus}; use crate::core::commands::response::shorthand::{Response, ResponseOrErrorType}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/image_edit_models.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/image_edit_models.rs similarity index 91% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/image_edit_models.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/image_edit_models.rs index e6b5b699e5..6a0753e5b7 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/image_edit_models.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/image_edit_models.rs @@ -1,5 +1,5 @@ use enums::common::generation::common_model_type::CommonModelType; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::ImageEditModel; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::ImageEditModel; pub fn image_edit_model_to_model_type(model: ImageEditModel) -> CommonModelType { match model { diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/mod.rs similarity index 100% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/mod.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/mod.rs 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/deprecated/image_edit/sora/handle_image_edit_sora.rs similarity index 78% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_image_edit_sora.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/sora/handle_image_edit_sora.rs index 5e15ec79ec..91799a77f9 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_image_edit_sora.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/sora/handle_image_edit_sora.rs @@ -1,7 +1,7 @@ use crate::core::commands::enqueue::generate_error::GenerateError; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EnqueueEditImageCommand, ImageEditModel}; -use crate::core::commands::enqueue::image_edit::image_edit_models::image_edit_model_to_model_type; -use crate::core::commands::enqueue::image_edit::sora::handle_sora_gpt_image_1_edit::handle_sora_gpt_image_1_edit; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EnqueueEditImageCommand, ImageEditModel}; +use crate::core::commands::deprecated::image_edit::image_edit_models::image_edit_model_to_model_type; +use crate::core::commands::deprecated::image_edit::sora::handle_sora_gpt_image_1_edit::handle_sora_gpt_image_1_edit; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; 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/deprecated/image_edit/sora/handle_sora_gpt_image_1_edit.rs similarity index 98% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_sora_gpt_image_1_edit.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/sora/handle_sora_gpt_image_1_edit.rs index ed0bc273ea..3ae7404283 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/deprecated/image_edit/sora/handle_sora_gpt_image_1_edit.rs @@ -1,5 +1,5 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageSize, EnqueueEditImageCommand, EnqueueEditImageErrorType}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EditImageSize, EnqueueEditImageCommand, EnqueueEditImageErrorType}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus}; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/sora/mod.rs similarity index 100% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/mod.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_edit/sora/mod.rs 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/deprecated/image_inpaint/artcraft/handle_artcraft_flux_dev_juggernaut_inpaint.rs similarity index 96% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_dev_juggernaut_inpaint.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/artcraft/handle_artcraft_flux_dev_juggernaut_inpaint.rs index e8000eb97f..d077bd1ccc 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/deprecated/image_inpaint/artcraft/handle_artcraft_flux_dev_juggernaut_inpaint.rs @@ -1,7 +1,7 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; -use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; +use crate::core::commands::deprecated::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; 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/deprecated/image_inpaint/artcraft/handle_artcraft_flux_pro_1_inpaint.rs similarity index 96% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_1_inpaint.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/artcraft/handle_artcraft_flux_pro_1_inpaint.rs index b3236e9130..d631d543ba 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/deprecated/image_inpaint/artcraft/handle_artcraft_flux_pro_1_inpaint.rs @@ -1,7 +1,7 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; -use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; +use crate::core::commands::deprecated::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; 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/deprecated/image_inpaint/artcraft/handle_artcraft_flux_pro_kontext_inpaint.rs similarity index 95% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_kontext_inpaint.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/artcraft/handle_artcraft_flux_pro_kontext_inpaint.rs index f149efb832..1ebbb9c2c7 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/deprecated/image_inpaint/artcraft/handle_artcraft_flux_pro_kontext_inpaint.rs @@ -1,7 +1,7 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; -use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; +use crate::core::commands::deprecated::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; 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/deprecated/image_inpaint/artcraft/handle_artcraft_nano_banana_inpaint.rs similarity index 95% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_nano_banana_inpaint.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/artcraft/handle_artcraft_nano_banana_inpaint.rs index db5b67f9a7..3084332af3 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/deprecated/image_inpaint/artcraft/handle_artcraft_nano_banana_inpaint.rs @@ -1,7 +1,7 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; -use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; +use crate::core::commands::deprecated::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_inpaint_artcraft.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/artcraft/handle_inpaint_artcraft.rs similarity index 69% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_inpaint_artcraft.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/artcraft/handle_inpaint_artcraft.rs index e3a3056285..66deb9afa5 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_inpaint_artcraft.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/artcraft/handle_inpaint_artcraft.rs @@ -1,9 +1,9 @@ use crate::core::commands::enqueue::generate_error::GenerateError; -use crate::core::commands::enqueue::image_inpaint::artcraft::handle_artcraft_flux_dev_juggernaut_inpaint::handle_artcraft_flux_dev_juggernaut_inpaint; -use crate::core::commands::enqueue::image_inpaint::artcraft::handle_artcraft_flux_pro_1_inpaint::handle_artcraft_flux_pro_1_inpaint; -use crate::core::commands::enqueue::image_inpaint::artcraft::handle_artcraft_flux_pro_kontext_inpaint::handle_artcraft_flux_pro_kontext_inpaint; -use crate::core::commands::enqueue::image_inpaint::artcraft::handle_artcraft_nano_banana_inpaint::handle_artcraft_nano_banana_inpaint; -use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::{EnqueueInpaintImageCommand, ImageInpaintModel}; +use crate::core::commands::deprecated::image_inpaint::artcraft::handle_artcraft_flux_dev_juggernaut_inpaint::handle_artcraft_flux_dev_juggernaut_inpaint; +use crate::core::commands::deprecated::image_inpaint::artcraft::handle_artcraft_flux_pro_1_inpaint::handle_artcraft_flux_pro_1_inpaint; +use crate::core::commands::deprecated::image_inpaint::artcraft::handle_artcraft_flux_pro_kontext_inpaint::handle_artcraft_flux_pro_kontext_inpaint; +use crate::core::commands::deprecated::image_inpaint::artcraft::handle_artcraft_nano_banana_inpaint::handle_artcraft_nano_banana_inpaint; +use crate::core::commands::deprecated::image_inpaint::enqueue_image_inpaint_command::{EnqueueInpaintImageCommand, ImageInpaintModel}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/artcraft/mod.rs similarity index 100% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/mod.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/artcraft/mod.rs diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/enqueue_image_inpaint_command.rs similarity index 97% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/enqueue_image_inpaint_command.rs index 3cd2a0eb05..6ab4469dcc 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/enqueue_image_inpaint_command.rs @@ -1,9 +1,9 @@ use crate::core::api_adapters::quality::common_quality::CommonQuality; use crate::core::commands::enqueue::common::notify_frontend_of_errors::notify_frontend_of_errors; use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; -use crate::core::commands::enqueue::image_edit::image_edit_models::image_edit_model_to_model_type; -use crate::core::commands::enqueue::image_inpaint::artcraft::handle_inpaint_artcraft::handle_inpaint_artcraft; -use crate::core::commands::enqueue::image_inpaint::inpaint_models::image_inpaint_model_to_model_type; +use crate::core::commands::deprecated::image_edit::image_edit_models::image_edit_model_to_model_type; +use crate::core::commands::deprecated::image_inpaint::artcraft::handle_inpaint_artcraft::handle_inpaint_artcraft; +use crate::core::commands::deprecated::image_inpaint::inpaint_models::image_inpaint_model_to_model_type; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus}; use crate::core::commands::response::shorthand::{Response, ResponseOrErrorType}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/inpaint_models.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/inpaint_models.rs similarity index 81% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/inpaint_models.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/inpaint_models.rs index d90cc383a3..30fa56b0c2 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/inpaint_models.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/inpaint_models.rs @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::ImageInpaintModel; +use crate::core::commands::deprecated::image_inpaint::enqueue_image_inpaint_command::ImageInpaintModel; use enums::common::generation::common_model_type::CommonModelType; pub fn image_inpaint_model_to_model_type(model: ImageInpaintModel) -> CommonModelType { diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/mod.rs similarity index 100% rename from crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/mod.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/image_inpaint/mod.rs diff --git a/crates/desktop/artcraft/src/core/commands/deprecated/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/mod.rs new file mode 100644 index 0000000000..7302986596 --- /dev/null +++ b/crates/desktop/artcraft/src/core/commands/deprecated/mod.rs @@ -0,0 +1,3 @@ +pub mod image_edit; +pub mod image_inpaint; +pub mod text_to_image; 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/deprecated/text_to_image/artcraft/handle_artcraft_gpt_image_1_text_to_image.rs similarity index 95% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_artcraft_gpt_image_1_text_to_image.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/artcraft/handle_artcraft_gpt_image_1_text_to_image.rs index 4265016619..70462ebd39 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/deprecated/text_to_image/artcraft/handle_artcraft_gpt_image_1_text_to_image.rs @@ -1,7 +1,7 @@ use crate::core::commands::enqueue::generate_error::GenerateError; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; -use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; +use crate::core::commands::deprecated::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent; 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/deprecated/text_to_image/artcraft/handle_text_to_image_artcraft.rs similarity index 87% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_text_to_image_artcraft.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/artcraft/handle_text_to_image_artcraft.rs index 7503c705d7..b559e29ec0 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/deprecated/text_to_image/artcraft/handle_text_to_image_artcraft.rs @@ -1,9 +1,9 @@ use crate::core::commands::enqueue::generate_error::GenerateError; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; -use crate::core::commands::enqueue::text_to_image::artcraft::handle_artcraft_gpt_image_1_text_to_image::handle_artcraft_gpt_image_1_text_to_image; -use crate::core::commands::enqueue::text_to_image::artcraft::handle_text_to_image_artcraft_via_router::handle_text_to_image_artcraft_via_router; -use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageModel}; -use crate::core::commands::enqueue::text_to_image::text_to_image_models::text_to_image_model_to_model_type; +use crate::core::commands::deprecated::text_to_image::artcraft::handle_artcraft_gpt_image_1_text_to_image::handle_artcraft_gpt_image_1_text_to_image; +use crate::core::commands::deprecated::text_to_image::artcraft::handle_text_to_image_artcraft_via_router::handle_text_to_image_artcraft_via_router; +use crate::core::commands::deprecated::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageModel}; +use crate::core::commands::deprecated::text_to_image::text_to_image_models::text_to_image_model_to_model_type; use crate::core::events::generation_events::common::GenerationModel; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; 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/deprecated/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs similarity index 98% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs index 9094a42422..083da9d137 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/deprecated/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs @@ -2,7 +2,7 @@ use crate::core::api_adapters::aspect_ratio::common_aspect_ratio::CommonAspectRa use crate::core::api_adapters::resolution::common_resolution::CommonResolution as CommonResolution2; use crate::core::commands::enqueue::generate_error::{GenerateError, MissingCredentialsReason}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; -use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::{ +use crate::core::commands::deprecated::text_to_image::enqueue_text_to_image_command::{ EnqueueTextToImageRequest, TextToImageResolution, TextToImageSize, }; use crate::core::events::generation_events::common::GenerationModel; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/artcraft/mod.rs similarity index 100% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/mod.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/artcraft/mod.rs 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/deprecated/text_to_image/enqueue_text_to_image_command.rs similarity index 95% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/enqueue_text_to_image_command.rs index 771db3599d..9b7310b819 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/deprecated/text_to_image/enqueue_text_to_image_command.rs @@ -3,13 +3,13 @@ use crate::core::api_adapters::quality::common_quality::CommonQuality; use crate::core::api_adapters::resolution::common_resolution::CommonResolution; use crate::core::commands::enqueue::common::notify_frontend_of_errors::notify_frontend_of_errors; use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError, MissingCredentialsReason}; -use crate::core::commands::enqueue::image_edit::image_edit_models::image_edit_model_to_model_type; +use crate::core::commands::deprecated::image_edit::image_edit_models::image_edit_model_to_model_type; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; -use crate::core::commands::enqueue::text_to_image::artcraft::handle_text_to_image_artcraft::handle_text_to_image_artcraft; -use crate::core::commands::enqueue::text_to_image::grok::handle_grok::handle_grok; -use crate::core::commands::enqueue::text_to_image::midjourney::handle_midjourney::handle_midjourney; -use crate::core::commands::enqueue::text_to_image::sora::handle_text_to_image_sora::handle_text_to_image_sora; -use crate::core::commands::enqueue::text_to_image::text_to_image_models::text_to_image_model_to_model_type; +use crate::core::commands::deprecated::text_to_image::artcraft::handle_text_to_image_artcraft::handle_text_to_image_artcraft; +use crate::core::commands::deprecated::text_to_image::grok::handle_grok::handle_grok; +use crate::core::commands::deprecated::text_to_image::midjourney::handle_midjourney::handle_midjourney; +use crate::core::commands::deprecated::text_to_image::sora::handle_text_to_image_sora::handle_text_to_image_sora; +use crate::core::commands::deprecated::text_to_image::text_to_image_models::text_to_image_model_to_model_type; use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus}; use crate::core::commands::response::shorthand::Response; use crate::core::commands::response::success_response_wrapper::SerializeMarker; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/grok/handle_grok.rs b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/grok/handle_grok.rs similarity index 96% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/grok/handle_grok.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/grok/handle_grok.rs index 8318f5f6e6..84271c2a57 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/grok/handle_grok.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/grok/handle_grok.rs @@ -1,7 +1,7 @@ use crate::core::api_adapters::aspect_ratio::convert::aspect_ratio_to_grok_image::aspect_ratio_to_grok_image; use crate::core::commands::enqueue::generate_error::GenerateError; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; -use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; +use crate::core::commands::deprecated::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; 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; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/grok/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/grok/mod.rs similarity index 100% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/grok/mod.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/grok/mod.rs diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/midjourney/handle_midjourney.rs b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/midjourney/handle_midjourney.rs similarity index 95% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/midjourney/handle_midjourney.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/midjourney/handle_midjourney.rs index 848ebe8105..4eceda6d30 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/midjourney/handle_midjourney.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/midjourney/handle_midjourney.rs @@ -1,7 +1,7 @@ use crate::core::commands::enqueue::generate_error::{GenerateError, MissingCredentialsReason, ProviderFailureReason}; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; -use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; +use crate::core::commands::deprecated::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; 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::functional_events::show_provider_login_modal_event::ShowProviderLoginModalEvent; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/midjourney/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/midjourney/mod.rs similarity index 100% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/midjourney/mod.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/midjourney/mod.rs diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/mod.rs similarity index 100% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/mod.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/mod.rs 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/deprecated/text_to_image/sora/handle_gpt_image_1_sora_text_to_image.rs similarity index 97% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/sora/handle_gpt_image_1_sora_text_to_image.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/sora/handle_gpt_image_1_sora_text_to_image.rs index 82a1abedbf..04001a9d4f 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/deprecated/text_to_image/sora/handle_gpt_image_1_sora_text_to_image.rs @@ -2,7 +2,7 @@ use crate::core::api_adapters::aspect_ratio::convert::aspect_ratio_to_grok_image use crate::core::api_adapters::aspect_ratio::convert::aspect_ratio_to_sora_native_gpt_image_1::aspect_ratio_to_sora_native_gpt_image_1; use crate::core::commands::enqueue::generate_error::GenerateError; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; -use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; +use crate::core::commands::deprecated::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::functional_events::show_provider_login_modal_event::ShowProviderLoginModalEvent; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/sora/handle_text_to_image_sora.rs b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/sora/handle_text_to_image_sora.rs similarity index 72% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/sora/handle_text_to_image_sora.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/sora/handle_text_to_image_sora.rs index 0e1dbf4aec..b776d84f97 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/sora/handle_text_to_image_sora.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/sora/handle_text_to_image_sora.rs @@ -1,7 +1,7 @@ use crate::core::commands::enqueue::generate_error::GenerateError; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; -use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::EnqueueTextToImageRequest; -use crate::core::commands::enqueue::text_to_image::sora::handle_gpt_image_1_sora_text_to_image::handle_gpt_image_1_sora_text_to_image; +use crate::core::commands::deprecated::text_to_image::enqueue_text_to_image_command::EnqueueTextToImageRequest; +use crate::core::commands::deprecated::text_to_image::sora::handle_gpt_image_1_sora_text_to_image::handle_gpt_image_1_sora_text_to_image; use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; use tauri::AppHandle; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/sora/mod.rs b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/sora/mod.rs similarity index 100% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/sora/mod.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/sora/mod.rs 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/deprecated/text_to_image/text_to_image_models.rs similarity index 92% rename from crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/text_to_image_models.rs rename to crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/text_to_image_models.rs index 6a99dae55e..48c16d5676 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/text_to_image_models.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/text_to_image_models.rs @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::TextToImageModel; +use crate::core::commands::deprecated::text_to_image::enqueue_text_to_image_command::TextToImageModel; use enums::common::generation::common_model_type::CommonModelType; pub fn text_to_image_model_to_model_type(model: TextToImageModel) -> CommonModelType { 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..aa27501fe0 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 @@ -1,6 +1,6 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError, MissingCredentialsReason, ProviderFailureReason}; use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageSize, EnqueueEditImageCommand}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider}; 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..aa6a859940 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 @@ -1,7 +1,7 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError, MissingCredentialsReason}; use crate::core::commands::enqueue::image_to_gaussian::enqueue_image_to_gaussian_command::EnqueueImageToGaussianRequest; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; -use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; +use crate::core::commands::deprecated::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; use crate::core::events::functional_events::show_provider_login_modal_event::ShowProviderLoginModalEvent; use crate::core::events::generation_events::common::GenerationModel; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/mod.rs b/crates/desktop/artcraft/src/core/commands/enqueue/mod.rs index 15cb9119e1..73ce2476cc 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/mod.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/mod.rs @@ -1,9 +1,6 @@ pub mod common; pub mod generate_error; pub mod image_bg_removal; -pub mod image_edit; -pub mod image_inpaint; +pub mod image_to_gaussian; pub mod image_to_object; -pub mod task_enqueue_success; -pub mod text_to_image; -pub mod image_to_gaussian; \ No newline at end of file +pub mod task_enqueue_success; \ No newline at end of file diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_video/grok/handle_grok_video.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_video/grok/handle_grok_video.rs index cd6098172d..6656f0625f 100644 --- a/crates/desktop/artcraft/src/core/commands/generate/generate_video/grok/handle_grok_video.rs +++ b/crates/desktop/artcraft/src/core/commands/generate/generate_video/grok/handle_grok_video.rs @@ -1,6 +1,6 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::EnqueueEditImageCommand; -use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::EnqueueEditImageCommand; +use crate::core::commands::deprecated::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand; use crate::core::commands::generate::generate_video::request::{TauriGenerateVideoRequest, GrokAspectRatio, SoraOrientation}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; use crate::core::events::functional_events::show_provider_login_modal_event::ShowProviderLoginModalEvent; diff --git a/crates/desktop/artcraft/src/core/commands/mod.rs b/crates/desktop/artcraft/src/core/commands/mod.rs index 175603efbb..4baa4c0584 100644 --- a/crates/desktop/artcraft/src/core/commands/mod.rs +++ b/crates/desktop/artcraft/src/core/commands/mod.rs @@ -11,4 +11,5 @@ pub mod media_files; pub mod platform_info_command; pub mod providers; pub mod response; -pub mod task_queue; \ No newline at end of file +pub mod task_queue; +pub mod deprecated; \ No newline at end of file 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 ad717820de..974ea5dc3b 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 @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; use crate::core::commands::response::shorthand::ResponseOrErrorMessage; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; 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 7af897f4eb..a622368982 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 @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; use crate::core::commands::providers::get_provider_order_command::GetProviderOrderResponse; use crate::core::commands::response::shorthand::ResponseOrErrorMessage; use crate::core::commands::response::success_response_wrapper::SerializeMarker; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_purge_credentials_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_purge_credentials_command.rs index 5a3c2028b1..f842c948a8 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_purge_credentials_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_purge_credentials_command.rs @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::EnqueueEditImageSuccessResponse; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::EnqueueEditImageSuccessResponse; use crate::core::commands::response::shorthand::ResponseOrErrorMessage; use crate::core::commands::response::success_response_wrapper::SerializeMarker; use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager; 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 0f326c73e2..021e599576 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 @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::services::midjourney::state::midjourney_credential_manager::MidjourneyCredentialManager; 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 ed5b5f0f6c..bcb06fdc85 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 @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::services::midjourney::state::midjourney_credential_manager::MidjourneyCredentialManager; 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 64b1bb8da6..8eb091a294 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 @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::services::midjourney::state::midjourney_credential_manager::MidjourneyCredentialManager; 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 e4d5de1f36..2b40db7f45 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 @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::services::midjourney::state::midjourney_credential_manager::MidjourneyCredentialManager; 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 b15fe93bf5..4db1bd595c 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 @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::services::midjourney::state::midjourney_credential_manager::MidjourneyCredentialManager; 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 827bc93532..71cde4d1f5 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 @@ -1,4 +1,4 @@ -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; +use crate::core::commands::deprecated::image_edit::enqueue_edit_image_command::{ImageEditModel, EditImageQuality, EditImageSize}; use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs; use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::services::midjourney::state::midjourney_credential_manager::MidjourneyCredentialManager;