diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/jobs/list_session_jobs.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/jobs/list_session_jobs.rs index 54abbfc856..fb50890c10 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/jobs/list_session_jobs.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/jobs/list_session_jobs.rs @@ -1,7 +1,6 @@ use crate::common::responses::job_details::{JobDetailsLipsyncRequest, JobDetailsLivePortraitRequest}; use crate::common::responses::media_links::MediaLinks; use chrono::{DateTime, Utc}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::common::job_status_plus::JobStatusPlus; use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/delete_media_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/delete_media_file.rs index a430ad7eef..ca2a79b496 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/delete_media_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/delete_media_file.rs @@ -5,7 +5,6 @@ use crate::utils::basic_json_delete_request::basic_json_delete_request; use artcraft_api_defs::common::responses::simple_generic_json_success::SimpleGenericJsonSuccess; use artcraft_api_defs::media_file::delete_media_file::DeleteMediaFileRequest; use artcraft_api_defs::subscriptions::get_session_subscription::GetSessionSubscriptionResponse; -use enums::common::payments_namespace::PaymentsNamespace; use log::debug; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs index 272879a397..2b964637bb 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs @@ -7,14 +7,7 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT}; use crate::utils::filter_bad_response::filter_bad_response; use crate::utils::http_get_anonymous::http_get_anonymous; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::common::generation_provider::GenerationProvider; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use uuid_utils::uuid::generate_random_uuid; use log::debug; @@ -52,7 +45,6 @@ pub struct LegacyUploadMediaFileFromFileArgs<'a, P: AsRef> { // pub maybe_batch_token: Option<&'a BatchGenerationToken>, } - /// Upload using the legacy endpoint (spz, etc.) pub async fn legacy_upload_media_file_from_file>( args: LegacyUploadMediaFileFromFileArgs<'_, P>, diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs index 2128e5021a..a915a26851 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs @@ -7,13 +7,6 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT}; use crate::utils::filter_bad_response::filter_bad_response; use crate::utils::http_get_anonymous::http_get_anonymous; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use uuid_utils::uuid::generate_random_uuid; use log::debug; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs index 708963cf0e..fa5efb96e3 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs @@ -7,14 +7,7 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT}; use crate::utils::filter_bad_response::filter_bad_response; use crate::utils::http_get_anonymous::http_get_anonymous; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::common::generation_provider::GenerationProvider; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use uuid_utils::uuid::generate_random_uuid; use log::debug; @@ -52,7 +45,6 @@ pub struct UploadImageFromFileArgs<'a, P: AsRef> { pub maybe_batch_token: Option<&'a BatchGenerationToken>, } - /// Upload an image media file from a file. pub async fn upload_image_media_file_from_file>( args: UploadImageFromFileArgs<'_, P>, diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs index 00c72a474a..f8962323bc 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs @@ -5,13 +5,6 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT}; use crate::utils::filter_bad_response::filter_bad_response; use crate::utils::http_get_anonymous::http_get_anonymous; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use uuid_utils::uuid::generate_random_uuid; use log::debug; diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs index 73800f129c..3aed1bb2af 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs @@ -5,13 +5,6 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT}; use crate::utils::filter_bad_response::filter_bad_response; use crate::utils::http_get_anonymous::http_get_anonymous; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use uuid_utils::uuid::generate_random_uuid; use log::debug; @@ -49,8 +42,6 @@ pub struct UploadVideoFromFileArgs<'a, P: AsRef> { // pub maybe_batch_token: Option<&'a BatchGenerationToken>, } - - // TODO(bt,2025-04-22): Share API definitions between client and server in common crate. #[derive(Deserialize, Debug)] diff --git a/crates/cli/production/elasticsearch-cli/src/main.rs b/crates/cli/production/elasticsearch-cli/src/main.rs index 29d30b3709..e77a8904fb 100644 --- a/crates/cli/production/elasticsearch-cli/src/main.rs +++ b/crates/cli/production/elasticsearch-cli/src/main.rs @@ -16,7 +16,6 @@ use std::iter::FromIterator; use config::shared_constants::DEFAULT_RUST_LOG; use elasticsearch_schema::searches::search_tts_models::search_tts_models; -use enums::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use crate::cli_args::{parse_cli_args, Action, Environment}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/enqueue_image_bg_removal_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/enqueue_image_bg_removal_command.rs index 15447e0031..d18b85217b 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/enqueue_image_bg_removal_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/enqueue_image_bg_removal_command.rs @@ -23,8 +23,6 @@ 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 errors::AnyhowError; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs index 32a2c40705..aa815dd5a3 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs @@ -25,8 +25,6 @@ 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 errors::AnyhowError; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs index 36a089f607..6601f0c018 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs @@ -24,8 +24,6 @@ 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 errors::AnyhowError; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/enqueue_image_to_gaussian_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/enqueue_image_to_gaussian_command.rs index 9c42060b18..3e0c1f9404 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/enqueue_image_to_gaussian_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/enqueue_image_to_gaussian_command.rs @@ -23,8 +23,6 @@ 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 log::{error, info, warn}; use serde::{Deserialize, Serialize}; @@ -84,7 +82,6 @@ pub struct EnqueueImageToGaussianRequest { pub frontend_subscriber_payload: Option, } - #[derive(Serialize)] pub struct EnqueueImageToGaussianSuccessResponse { } @@ -104,7 +101,6 @@ pub enum EnqueueImageToGaussianErrorType { NeedsStorytellerCredentials, } - #[tauri::command] pub async fn enqueue_image_to_gaussian_command( request: EnqueueImageToGaussianRequest, @@ -179,7 +175,6 @@ pub async fn enqueue_image_to_gaussian_command( } } - pub async fn handle_request( request: EnqueueImageToGaussianRequest, app: &AppHandle, diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs index 5dd79fce68..9876f5f6ec 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs @@ -30,8 +30,6 @@ 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 log::{error, info, warn}; use serde::{Deserialize, Serialize}; @@ -184,7 +182,6 @@ pub enum EnqueueTextToImageErrorType { NeedsStorytellerCredentials, } - #[tauri::command] pub async fn enqueue_text_to_image_command( request: EnqueueTextToImageRequest, @@ -276,7 +273,6 @@ pub async fn enqueue_text_to_image_command( } } - pub async fn handle_request( request: EnqueueTextToImageRequest, app: &AppHandle, diff --git a/crates/desktop/artcraft/src/core/commands/task_queue/mark_task_as_dismissed_command.rs b/crates/desktop/artcraft/src/core/commands/task_queue/mark_task_as_dismissed_command.rs index ef7dfe0e96..cbdeff9633 100644 --- a/crates/desktop/artcraft/src/core/commands/task_queue/mark_task_as_dismissed_command.rs +++ b/crates/desktop/artcraft/src/core/commands/task_queue/mark_task_as_dismissed_command.rs @@ -8,10 +8,6 @@ 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 errors::AnyhowResult; use log::{error, info, warn}; use serde_derive::{Deserialize, Serialize}; diff --git a/crates/desktop/artcraft/src/core/commands/task_queue/tasks_nuke_all_command.rs b/crates/desktop/artcraft/src/core/commands/task_queue/tasks_nuke_all_command.rs index f7685d5237..dac2300aab 100644 --- a/crates/desktop/artcraft/src/core/commands/task_queue/tasks_nuke_all_command.rs +++ b/crates/desktop/artcraft/src/core/commands/task_queue/tasks_nuke_all_command.rs @@ -8,10 +8,6 @@ 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 errors::AnyhowResult; use log::{error, info, warn}; use serde_derive::{Deserialize, Serialize}; diff --git a/crates/desktop/artcraft/src/services/grok/threads/grok_image_websocket_thread/grok_image_websocket_thread.rs b/crates/desktop/artcraft/src/services/grok/threads/grok_image_websocket_thread/grok_image_websocket_thread.rs index ce8cfb721d..f022ec9e52 100644 --- a/crates/desktop/artcraft/src/services/grok/threads/grok_image_websocket_thread/grok_image_websocket_thread.rs +++ b/crates/desktop/artcraft/src/services/grok/threads/grok_image_websocket_thread/grok_image_websocket_thread.rs @@ -16,7 +16,6 @@ use artcraft_api_defs::utils::media_links_to_thumbnail_template::media_links_to_ 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 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}; diff --git a/crates/desktop/artcraft/src/services/grok/threads/grok_video_task_polling/grok_video_task_polling_thread.rs b/crates/desktop/artcraft/src/services/grok/threads/grok_video_task_polling/grok_video_task_polling_thread.rs index 336b170e46..6d9442c30d 100644 --- a/crates/desktop/artcraft/src/services/grok/threads/grok_video_task_polling/grok_video_task_polling_thread.rs +++ b/crates/desktop/artcraft/src/services/grok/threads/grok_video_task_polling/grok_video_task_polling_thread.rs @@ -14,11 +14,9 @@ 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 errors::AnyhowResult; use grok_client::credentials::grok_full_credentials::GrokFullCredentials; use grok_client::error::grok_error::GrokError; diff --git a/crates/desktop/artcraft/src/services/grok/util/get_or_upgrade_grok_full_credentials.rs b/crates/desktop/artcraft/src/services/grok/util/get_or_upgrade_grok_full_credentials.rs index 830ac7eb84..2294b184e2 100644 --- a/crates/desktop/artcraft/src/services/grok/util/get_or_upgrade_grok_full_credentials.rs +++ b/crates/desktop/artcraft/src/services/grok/util/get_or_upgrade_grok_full_credentials.rs @@ -1,7 +1,6 @@ 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 grok_client::credentials::grok_cookies::GrokCookies; use grok_client::credentials::grok_full_credentials::GrokFullCredentials; use grok_client::error::grok_client_error::GrokClientError; diff --git a/crates/desktop/artcraft/src/services/midjourney/threads/midjourney_long_polling_thread.rs b/crates/desktop/artcraft/src/services/midjourney/threads/midjourney_long_polling_thread.rs index 429e410cb2..583d742691 100644 --- a/crates/desktop/artcraft/src/services/midjourney/threads/midjourney_long_polling_thread.rs +++ b/crates/desktop/artcraft/src/services/midjourney/threads/midjourney_long_polling_thread.rs @@ -13,11 +13,9 @@ 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 errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info}; diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs index 15b54c8b95..e8bb8acc55 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs @@ -18,7 +18,6 @@ use artcraft_api_defs::utils::media_links_to_thumbnail_template::media_links_to_ 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 errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info, warn}; @@ -56,7 +55,6 @@ pub struct GenerationItem { pub url: String, } - pub async fn handle_classic_successful_generations( app_handle: &AppHandle, app_data_root: &AppDataRoot, @@ -183,7 +181,6 @@ pub async fn handle_classic_successful_generations( Ok(()) } - async fn download_generation_item( generation: &GenerationItem, app_data_root: &AppDataRoot, diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_classic_sora_tasks.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_classic_sora_tasks.rs index 9a85ad3f6a..673985ad83 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_classic_sora_tasks.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_classic_sora_tasks.rs @@ -15,9 +15,7 @@ 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 errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_sora_2_tasks.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_sora_2_tasks.rs index 8ef9d1ea38..da912e0d02 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_sora_2_tasks.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_sora_2_tasks.rs @@ -15,9 +15,7 @@ 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 errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info, warn}; @@ -102,7 +100,6 @@ pub async fn poll_sora_2_tasks( &sora_task_queue, ).await?; - // Process succeeded tasks. handle_classic_successful_generations( &app_handle, diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/sora_task_polling_thread.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/sora_task_polling_thread.rs index e56f0c0092..4bfb232ebc 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/sora_task_polling_thread.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/sora_task_polling_thread.rs @@ -17,8 +17,6 @@ use crate::services::sora::threads::sora_task_polling::helpers::poll_sora_2_task 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 errors::AnyhowResult; use uuid_utils::uuid::generate_random_uuid; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_credits_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_credits_command.rs index a47cba35a6..ad717820de 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_credits_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_credits_command.rs @@ -9,10 +9,7 @@ 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 errors::AnyhowResult; use log::{error, info}; use serde_derive::{Deserialize, Serialize}; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_subscription_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_subscription_command.rs index 031d92e0cc..7af897f4eb 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_subscription_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/storyteller_get_subscription_command.rs @@ -12,10 +12,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_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 errors::AnyhowResult; use log::{error, info}; use serde_derive::{Deserialize, Serialize}; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_credits_purchase_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_credits_purchase_command.rs index 6e34588193..0f326c73e2 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 @@ -8,8 +8,6 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte 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 errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_subscription_purchase_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_checkout/storyteller_open_subscription_purchase_command.rs index 3c7b39c517..ed5b5f0f6c 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 @@ -8,7 +8,6 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte 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 errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_cancel_plan_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_cancel_plan_command.rs index 057d4dbf92..64b1bb8da6 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_cancel_plan_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_cancel_plan_command.rs @@ -7,9 +7,6 @@ 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 errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_manage_plan_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_manage_plan_command.rs index 6b217c11ae..e4d5de1f36 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_manage_plan_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_manage_plan_command.rs @@ -7,9 +7,6 @@ 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 errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_switch_plan_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_switch_plan_command.rs index d4ef00b883..b15fe93bf5 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_switch_plan_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_switch_plan_command.rs @@ -8,9 +8,7 @@ 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 errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_update_payment_method_command.rs b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_update_payment_method_command.rs index d04fac37f1..827bc93532 100644 --- a/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_update_payment_method_command.rs +++ b/crates/desktop/artcraft/src/services/storyteller/commands/stripe_customer_portal/storyteller_open_customer_portal_update_payment_method_command.rs @@ -8,9 +8,6 @@ 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 errors::AnyhowResult; use log::{error, info}; use serde_derive::Deserialize; diff --git a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_frontend_caller_notification.rs b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_frontend_caller_notification.rs index 5684ddd7f8..62c4187f7e 100644 --- a/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_frontend_caller_notification.rs +++ b/crates/desktop/artcraft/src/services/storyteller/threads/storyteller_task_polling_thread/events/maybe_handle_frontend_caller_notification.rs @@ -10,7 +10,6 @@ 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 errors::AnyhowResult; use log::{error, warn}; use sqlite_tasks::queries::list_tasks_by_provider_and_tokens::{list_tasks_by_provider_and_tokens, ListTasksArgs}; diff --git a/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs b/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs index 81821fb460..ea946b0e39 100644 --- a/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs +++ b/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs @@ -16,11 +16,8 @@ use crate::services::worldlabs::state::worldlabs_credential_manager::WorldlabsCr use artcraft_api_defs::prompts::create_prompt::CreatePromptRequest; use artcraft_api_defs::utils::media_links_to_thumbnail_template::media_links_to_thumbnail_template; use cookie_store::cookie_store::CookieStore; -use enums::by_table::prompts::prompt_type::PromptType; use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; -use enums::tauri::tasks::task_status::TaskStatus; use errors::AnyhowResult; use futures::poll; use grok_client::credentials::grok_full_credentials::GrokFullCredentials; @@ -192,7 +189,6 @@ async fn poll_grok_tasks( }) .collect::>(); - for (world_id, local_task) in local_tasks_by_world_labs_world_id.iter() { let world_id = WorldObjectId(world_id.to_string()); @@ -216,7 +212,6 @@ async fn poll_grok_tasks( } }; - upload_spz_splat( &app_handle, &app_env_configs, @@ -228,7 +223,6 @@ async fn poll_grok_tasks( ).await?; } - tokio::time::sleep(Duration::from_millis(5_000)).await; Ok(()) diff --git a/crates/schema/database/mysql_queries/src/queries/beta_keys/list_beta_keys.rs b/crates/schema/database/mysql_queries/src/queries/beta_keys/list_beta_keys.rs index d607453239..7c18ad1c02 100644 --- a/crates/schema/database/mysql_queries/src/queries/beta_keys/list_beta_keys.rs +++ b/crates/schema/database/mysql_queries/src/queries/beta_keys/list_beta_keys.rs @@ -4,7 +4,7 @@ use sqlx::{Execute, FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; -use enums::traits::mysql_from_row::MySqlFromRow; +use enums::traits::mysql_from_row::MySqlFromRow as _; use errors::AnyhowResult; use tokens::tokens::beta_keys::BetaKeyToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/get_inference_job_by_fal_id.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/get_inference_job_by_fal_id.rs index 9203d30032..c758082dee 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/get_inference_job_by_fal_id.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/fal/get_inference_job_by_fal_id.rs @@ -4,12 +4,8 @@ use log::warn; use sqlx::pool::PoolConnection; use sqlx::{MySql, MySqlPool}; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; -use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty; -use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; @@ -68,7 +64,6 @@ pub async fn get_inference_job_by_fal_id(fal_id: &str, mysql_pool: &MySqlPool) get_inference_job_by_fal_id_from_connection(fal_id, &mut connection).await } - /// Returns Ok(None) when the record cannot be found. pub async fn get_inference_job_by_fal_id_from_connection(fal_id: &str, mysql_connection: &mut PoolConnection) -> AnyhowResult> diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/count_untried_jobs_of_type.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/count_untried_jobs_of_type.rs index 919b93d58e..80ed17cda3 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/job/count_untried_jobs_of_type.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/job/count_untried_jobs_of_type.rs @@ -5,11 +5,8 @@ use chrono::Utc; use sqlx::MySqlPool; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; -use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; -use enums::common::job_status_plus::JobStatusPlus; -use enums::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::generic_inference_jobs::InferenceJobToken; @@ -113,7 +110,6 @@ WHERE query } - #[derive(Debug)] #[derive(sqlx::FromRow)] struct UntriedJobCountRawInternal { @@ -184,7 +180,6 @@ mod tests { assert_eq!(job_type_predicate(&types), "\"mocap_net\", \"rvc_v2\"".to_string()); } - #[test] fn test_model_type_predicate() { // None diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/batch_get_inference_job_status.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/batch_get_inference_job_status.rs index b9852716a3..848ab3936f 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/batch_get_inference_job_status.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/batch_get_inference_job_status.rs @@ -5,10 +5,10 @@ use sqlx::pool::PoolConnection; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; use enums::common::job_status_plus::JobStatusPlus; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; @@ -35,7 +35,6 @@ pub async fn batch_get_inference_job_status(job_tokens: &[InferenceJobToken], my batch_get_inference_job_status_from_connection(job_tokens, &mut connection).await } - /// Look up job status. /// Returns Ok(Vec::new()) when the records cannot be found. pub async fn batch_get_inference_job_status_from_connection( diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs index 0ab944ad06..37a3742e83 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs @@ -8,7 +8,6 @@ use enums::by_table::generic_inference_jobs::frontend_failure_category::Frontend use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; @@ -28,7 +27,6 @@ pub async fn get_inference_job_status(job_token: &InferenceJobToken, mysql_pool: get_inference_job_status_from_connection(job_token, &mut connection).await } - /// Look up job status. /// Returns Ok(None) when the record cannot be found. pub async fn get_inference_job_status_from_connection(job_token: &InferenceJobToken, mysql_connection: &mut PoolConnection) diff --git a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_session_jobs.rs b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_session_jobs.rs index 8dfada1e25..3030a8294c 100644 --- a/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_session_jobs.rs +++ b/crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_session_jobs.rs @@ -7,10 +7,10 @@ use sqlx::pool::PoolConnection; use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory; use enums::common::job_status_plus::JobStatusPlus; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; @@ -46,7 +46,6 @@ pub async fn list_session_jobs( list_session_jobs_from_connection(args, &mut connection).await } - /// Look up job status. /// Returns Ok(Vec::new()) when the records cannot be found. pub async fn list_session_jobs_from_connection( diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs index 459704418a..411def761e 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs @@ -4,7 +4,6 @@ use sqlx::MySqlPool; use enums::by_table::generic_synthetic_ids::id_category::IdCategory; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; -use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs b/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs index 68ff9c9efd..a491ce0490 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files.rs @@ -9,6 +9,7 @@ use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_subtype::MediaFileSubtype; @@ -16,7 +17,6 @@ use enums::by_table::media_files::media_file_type::MediaFileType; use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::by_table::model_weights::weights_types::WeightsType; use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs b/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs index c0a70ea2d4..c635ecb012 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs @@ -3,6 +3,7 @@ use sqlx::mysql::MySqlRow; use sqlx::{Acquire, FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::pool::PoolConnection; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; @@ -10,7 +11,6 @@ use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginM use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_featured_media_files.rs b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_featured_media_files.rs index 0e6e8e13bf..f785b985f1 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_featured_media_files.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_featured_media_files.rs @@ -5,6 +5,7 @@ use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; @@ -13,7 +14,6 @@ use enums::by_table::media_files::media_file_origin_product_category::MediaFileO use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::view_as::ViewAs; use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files.rs b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files.rs index e62ff24973..8f5cdf27d0 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files.rs @@ -5,6 +5,7 @@ use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; @@ -13,7 +14,6 @@ use enums::by_table::media_files::media_file_origin_product_category::MediaFileO use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::view_as::ViewAs; use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs index 7e5f8077a0..fb18a62ab1 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs @@ -3,6 +3,7 @@ use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; @@ -11,7 +12,6 @@ use enums::by_table::media_files::media_file_origin_product_category::MediaFileO use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::view_as::ViewAs; use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; @@ -71,7 +71,6 @@ pub struct MediaFileListItem { pub updated_at: DateTime, } - pub struct ListMediaFileByBatchArgs<'a> { pub batch_token: &'a BatchGenerationToken, pub page_size: usize, @@ -158,7 +157,6 @@ pub async fn list_media_files_by_batch_token(args: ListMediaFileByBatchArgs<'_>) }) } - fn select_result_fields() -> String { r#" m.id, diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_for_elastic_search_backfill_using_cursor.rs b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_for_elastic_search_backfill_using_cursor.rs index 5644a84140..9e9008bf0d 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_for_elastic_search_backfill_using_cursor.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_for_elastic_search_backfill_using_cursor.rs @@ -8,6 +8,7 @@ use sqlx::mysql::MySqlRow; use sqlx::pool::PoolConnection; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; @@ -15,9 +16,7 @@ use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginM use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; use enums::by_table::media_files::media_file_subtype::MediaFileSubtype; use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::view_as::ViewAs; use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken; use tokens::tokens::batch_generations::BatchGenerationToken; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs index 5e2073998d..d4c7331db8 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs @@ -5,6 +5,7 @@ use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; @@ -13,7 +14,6 @@ use enums::by_table::media_files::media_file_origin_product_category::MediaFileO use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::view_as::ViewAs; use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; @@ -76,7 +76,6 @@ pub struct MediaFileListItem { pub updated_at: DateTime, } - pub struct ListMediaFileForUserArgs<'a> { pub username: &'a str, pub maybe_filter_media_types: Option<&'a HashSet>, @@ -178,7 +177,6 @@ pub async fn list_media_files_for_user(args: ListMediaFileForUserArgs<'_>) -> An }) } - fn select_result_fields() -> String { r#" m.id, diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/batch_get/batch_get_model_weights_for_elastic_search_backfill.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/batch_get/batch_get_model_weights_for_elastic_search_backfill.rs index 51276e5f0b..41e47e97dd 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/batch_get/batch_get_model_weights_for_elastic_search_backfill.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/batch_get/batch_get_model_weights_for_elastic_search_backfill.rs @@ -5,9 +5,9 @@ use sqlx::{Executor, FromRow, MySql, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; use enums::by_table::model_weights::weights_category::WeightsCategory; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::by_table::model_weights::weights_types::WeightsType; use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_cached_usage_backfill.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_cached_usage_backfill.rs index 65d768854d..bdc4f3cf93 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_cached_usage_backfill.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_all_model_weight_tokens_for_cached_usage_backfill.rs @@ -1,7 +1,6 @@ use chrono::{DateTime, Utc}; use sqlx::{Executor, MySql}; -use enums::by_table::model_weights::weights_types::WeightsType; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs index 7ca7204bb1..f8c08ac3d0 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs @@ -8,8 +8,8 @@ use enums::by_table::model_weights::{ weights_types::WeightsType, }; use enums::common::view_as::ViewAs; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; @@ -323,7 +323,6 @@ LEFT OUTER JOIN entity_stats query_builder } - async fn map_to_weights(dataset:Vec) -> Vec { let weights: Vec = dataset .into_iter() @@ -373,7 +372,6 @@ async fn map_to_weights(dataset:Vec) -> Vec { weights } - struct RawWeightJoinUser { id: i64, token: ModelWeightToken, diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_tokens.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_tokens.rs index 9ea5e2c160..59cbd02fd6 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_tokens.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_tokens.rs @@ -1,4 +1,5 @@ use chrono::{DateTime, Utc}; +use enums::traits::mysql_from_row::MySqlFromRow as _; use sqlx::{Acquire, FromRow, MySql, MySqlConnection, MySqlPool, QueryBuilder, Row}; use sqlx::mysql::MySqlRow; @@ -6,7 +7,6 @@ use enums::by_table::model_weights::{ weights_category::WeightsCategory, weights_types::WeightsType, }; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; diff --git a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs index 0f6e5ebd9e..ec51a0ff82 100644 --- a/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs +++ b/crates/schema/database/mysql_queries/src/queries/model_weights/list/list_weights_by_user.rs @@ -7,8 +7,8 @@ use enums::by_table::model_weights::{ weights_types::WeightsType, }; use enums::common::view_as::ViewAs; +use enums::traits::mysql_from_row::MySqlFromRow as _; use enums::common::visibility::Visibility; -use enums::traits::mysql_from_row::MySqlFromRow; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; @@ -250,7 +250,6 @@ LEFT OUTER JOIN entity_stats query_builder } - async fn map_to_weights(dataset:Vec) -> Vec { let weights: Vec = dataset .into_iter() @@ -304,7 +303,6 @@ async fn map_to_weights(dataset:Vec) -> Vec, diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_manage_plan_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_manage_plan_handler.rs index 634eaa2ba4..fe39a168bd 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_manage_plan_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_manage_plan_handler.rs @@ -8,7 +8,6 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::{PlanBillingCadence, StripeArtcraftCreateSubscriptionCheckoutRequest, StripeArtcraftCreateSubscriptionCheckoutResponse}; use artcraft_api_defs::stripe_artcraft::customer_portal_manage_plan::{StripeArtcraftCustomerPortalManagePlanRequest, StripeArtcraftCustomerPortalManagePlanResponse}; use component_traits::traits::internal_user_lookup::InternalUserLookup; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use enums::common::payments_namespace::PaymentsNamespace; use log::{error, info, warn}; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::{find_subscription_for_owner_user_using_connection, UserSubscription}; diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_switch_plan_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_switch_plan_handler.rs index 6bfbcee1a8..425aceff41 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_switch_plan_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_switch_plan_handler.rs @@ -9,7 +9,6 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::{PlanBillingCadence, StripeArtcraftCreateSubscriptionCheckoutRequest, StripeArtcraftCreateSubscriptionCheckoutResponse}; use artcraft_api_defs::stripe_artcraft::customer_portal_switch_plan::{PlanBillingCadenceConfirmation, StripeArtcraftCustomerPortalSwitchPlanRequest, StripeArtcraftCustomerPortalSwitchPlanResponse}; use component_traits::traits::internal_user_lookup::InternalUserLookup; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use enums::common::payments_namespace::PaymentsNamespace; use log::{error, info, warn}; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::{find_subscription_for_owner_user_using_connection, UserSubscription}; diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_update_payment_method_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_update_payment_method_handler.rs index 41903b81be..f8f0c19208 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_update_payment_method_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/customer_portal/stripe_artcraft_customer_portal_update_payment_method_handler.rs @@ -10,7 +10,6 @@ use artcraft_api_defs::stripe_artcraft::create_subscription_checkout::{PlanBilli use artcraft_api_defs::stripe_artcraft::customer_portal_switch_plan::{PlanBillingCadenceConfirmation, StripeArtcraftCustomerPortalSwitchPlanRequest, StripeArtcraftCustomerPortalSwitchPlanResponse}; use artcraft_api_defs::stripe_artcraft::customer_portal_update_payment_method::{StripeArtcraftCustomerPortalUpdatePaymentMethodRequest, StripeArtcraftCustomerPortalUpdatePaymentMethodResponse}; use component_traits::traits::internal_user_lookup::InternalUserLookup; -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use enums::common::payments_namespace::PaymentsNamespace; use log::{error, info, warn}; use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::{find_subscription_for_owner_user_using_connection, UserSubscription}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_gpt_image_1_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_gpt_image_1_text_to_image_handler.rs index f04966e7c9..d30970dee3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_gpt_image_1_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_gpt_image_1_text_to_image_handler.rs @@ -11,7 +11,6 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::text::generate_gpt_image_1_text_to_image::{GenerateGptImage1TextToImageImageQuality, GenerateGptImage1TextToImageImageSize, GenerateGptImage1TextToImageNumImages, GenerateGptImage1TextToImageRequest, GenerateGptImage1TextToImageResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; use enums::by_table::prompts::prompt_type::PromptType; use enums::common::generation_provider::GenerationProvider; use enums::common::model_type::ModelType; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs index 6ce3943489..15dce619e1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs @@ -10,7 +10,6 @@ use actix_web::{web, HttpRequest}; use artcraft_api_defs::generate::image::bg_removal::remove_image_background::RemoveImageBackgroundRequest; use artcraft_api_defs::generate::image::bg_removal::remove_image_background::RemoveImageBackgroundResponse; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use enums::common::model_type::ModelType; use enums::common::visibility::Visibility; use fal_client::requests::webhook::image::background::remove_background_rembg_webhook::{remove_background_rembg_webhook, RemoveBackgroundRembgWebhookArgs}; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs index c199d7da22..414335d994 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs @@ -23,10 +23,8 @@ use bucket_paths::legacy::typified_paths::public::voice_conversion_results::buck use chrono::{DateTime, Utc}; use enums::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_api_clients::FrontendFailureCategoryForApiClients; use enums::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_old_clients::FrontendFailureCategoryForOldClients; -use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::common::job_status_plus::JobStatusPlus; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use log::{error, warn}; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; use mysql_queries::queries::generic_inference::web::list_session_jobs::{list_session_jobs_from_connection, ListSessionJobsForUserArgs, SessionUser}; @@ -78,7 +76,6 @@ impl fmt::Display for ListSessionJobsError { } } - /// List job statuses for jobs that are associated with the user's session. /// /// The user must be logged in. This endpoint will only show the last 36 hours diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_batch_generated_redux_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_batch_generated_redux_media_files_handler.rs index 0fdc50385d..a896f671ac 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_batch_generated_redux_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_batch_generated_redux_media_files_handler.rs @@ -20,15 +20,6 @@ use artcraft_api_defs::common::responses::simple_entity_stats::SimpleEntityStats use artcraft_api_defs::media_file::list_batch_generated_media_files::{BatchGeneratedReduxMediaFileInfo, ListBatchGeneratedReduxMediaFilesPathInfo, ListBatchGeneratedReduxMediaFilesSuccessResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; -use enums::by_table::media_files::media_file_subtype::MediaFileSubtype; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::by_table::model_weights::weights_category::WeightsCategory; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::common::visibility::Visibility; -use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use log::warn; use mysql_queries::queries::media_files::get::batch_get_media_files::batch_get_media_files; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs index ac60314e40..6b64e14adb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs @@ -18,7 +18,6 @@ use crate::state::server_state::ServerState; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::generation_provider::GenerationProvider; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; use http_server_common::request::get_request_ip::get_request_ip;