From 5ab2bb47da0f378ad90a404ddfb36dfba8e79bd7 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 22 Mar 2026 13:04:58 -0400 Subject: [PATCH] begin replacing enums with enums_api --- Cargo.lock | 6 +++--- .../artcraft/artcraft_api_defs/Cargo.toml | 2 +- .../cost_estimate/estimate_image_cost.rs | 8 ++++---- .../cost_estimate/estimate_splat_cost.rs | 4 ++-- .../cost_estimate/estimate_video_cost.rs | 8 ++++---- .../src/jobs/list_session_jobs.rs | 11 +++++------ .../list_batch_generated_media_files.rs | 6 +++--- .../src/moderation/jobs/user/list_user_jobs.rs | 4 ++-- .../user/user_lookup_by_stripe_customer_id.rs | 2 +- .../list_wallet_ledger_entries_by_wallet.rs | 2 +- .../moderator_get_wallet_ledger_entry.rs | 2 +- .../src/moderation/wallets/list_user_wallets.rs | 2 +- .../wallets/moderator_create_wallet_for_user.rs | 2 +- .../moderation/wallets/moderator_get_wallet.rs | 2 +- .../src/prompts/create_prompt.rs | 4 ++-- ...new_user_account_and_subscription_checkout.rs | 2 +- .../create_credits_pack_checkout.rs | 2 +- .../create_subscription_checkout.rs | 2 +- .../customer_portal_switch_plan.rs | 2 +- .../subscriptions/get_session_subscription.rs | 2 +- .../artcraft_api_defs/src/users/session_info.rs | 2 +- .../artcraft/artcraft_client/Cargo.toml | 2 +- .../src/endpoints/credits/get_session_credits.rs | 4 ++-- .../src/endpoints/jobs/list_session_jobs.rs | 4 ++-- .../endpoints/media_files/delete_media_file.rs | 2 +- .../src/endpoints/media_files/get_media_file.rs | 14 +++++++------- .../legacy_upload_media_file_from_file.rs | 16 ++++++++-------- .../upload_image_media_file_from_bytes.rs | 14 +++++++------- .../upload_image_media_file_from_file.rs | 16 ++++++++-------- .../upload_new_engine_asset_from_file.rs | 14 +++++++------- .../upload_video_media_file_from_file.rs | 14 +++++++------- .../subscriptions/get_session_subscription.rs | 4 ++-- crates/api_clients/fakeyou_client/Cargo.toml | 2 +- crates/lib/actix_artcraft/Cargo.toml | 2 +- .../requests/get_request_signup_source_enum.rs | 4 ++-- 35 files changed, 94 insertions(+), 95 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 400d353ddf..896ea7b8a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -339,7 +339,7 @@ dependencies = [ "actix-web", "actix_helpers", "anyhow", - "enums", + "enums_api", "errors", "http_headers", "jwt_signer", @@ -726,7 +726,7 @@ version = "0.0.1" dependencies = [ "anyhow", "chrono", - "enums", + "enums_api", "enums_public", "serde", "serde_derive", @@ -747,7 +747,7 @@ dependencies = [ "chrono", "cloudflare_errors", "cookie 0.18.1", - "enums", + "enums_api", "enums_public", "errors", "log", diff --git a/crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml b/crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml index 31654ea0f2..ad461ce407 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml +++ b/crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml @@ -20,7 +20,7 @@ path = "src/lib.rs" workspace-build-acceleration.workspace = true # Internal -enums.workspace = true +enums_api.workspace = true enums_public.workspace = true tokens.workspace = true diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs index fc5e1ad9c2..58c856b860 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs @@ -1,10 +1,10 @@ use serde::{Deserialize, Serialize}; use utoipa::ToSchema; -use enums::common::generation::common_aspect_ratio::CommonAspectRatio; -use enums::common::generation::common_image_model::CommonImageModel; -use enums::common::generation::common_video_resolution::CommonVideoResolution; -use enums::common::generation_provider::GenerationProvider; +use enums_api::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums_api::common::generation::common_image_model::CommonImageModel; +use enums_api::common::generation::common_video_resolution::CommonVideoResolution; +use enums_api::common::generation::generation_provider::GenerationProvider; pub const ESTIMATE_IMAGE_COST_PATH: &str = "/v1/generate/cost_estimate/image"; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_splat_cost.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_splat_cost.rs index a42355bfe8..8fe1fc3541 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_splat_cost.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_splat_cost.rs @@ -1,8 +1,8 @@ use serde::{Deserialize, Serialize}; use utoipa::ToSchema; -use enums::common::generation::common_splat_model::CommonSplatModel; -use enums::common::generation_provider::GenerationProvider; +use enums_api::common::generation::common_splat_model::CommonSplatModel; +use enums_api::common::generation::generation_provider::GenerationProvider; pub const ESTIMATE_SPLAT_COST_PATH: &str = "/v1/generate/cost_estimate/splat"; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_video_cost.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_video_cost.rs index 32cf88424e..c1f0d1dc12 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_video_cost.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_video_cost.rs @@ -1,10 +1,10 @@ use serde::{Deserialize, Serialize}; use utoipa::ToSchema; -use enums::common::generation::common_aspect_ratio::CommonAspectRatio; -use enums::common::generation::common_video_model::CommonVideoModel; -use enums::common::generation::common_video_resolution::CommonVideoResolution; -use enums::common::generation_provider::GenerationProvider; +use enums_api::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums_api::common::generation::common_video_model::CommonVideoModel; +use enums_api::common::generation::common_video_resolution::CommonVideoResolution; +use enums_api::common::generation::generation_provider::GenerationProvider; pub const ESTIMATE_VIDEO_COST_PATH: &str = "/v1/generate/cost_estimate/video"; 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..d7ff781174 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,16 +1,15 @@ 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; +use enums_api::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums_api::common::job_status_plus::JobStatusPlus; +use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName; use serde::Deserialize; use serde::Serialize; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use utoipa::{IntoParams, ToSchema}; -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_api::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_api_clients::FrontendFailureCategoryForApiClients; +use enums_api::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_old_clients::FrontendFailureCategoryForOldClients; use tokens::tokens::batch_generations::BatchGenerationToken; pub const LIST_SESSION_JOBS_URL_PATH: &str = "/v1/jobs/session"; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs index e49833fde7..6305d316b9 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs @@ -2,9 +2,9 @@ use crate::common::responses::media_file_cover_image_details::MediaFileCoverImag use crate::common::responses::media_links::MediaLinks; use crate::common::responses::user_details_light::UserDetailsLight; use chrono::{DateTime, Utc}; -use enums::by_table::media_files::media_file_class::MediaFileClass; -use enums::by_table::media_files::media_file_type::MediaFileType; -use enums::common::visibility::Visibility; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::common::visibility::Visibility; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::batch_generations::BatchGenerationToken; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs index ef9b8e899a..f6d5e3b92f 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs @@ -1,5 +1,5 @@ -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; -use enums::common::job_status_plus::JobStatusPlus; +use enums_api::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_api::common::job_status_plus::JobStatusPlus; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/user_lookup_by_stripe_customer_id.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/user_lookup_by_stripe_customer_id.rs index 46636aa2a1..0c375a4fe7 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/user_lookup_by_stripe_customer_id.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/user_lookup_by_stripe_customer_id.rs @@ -1,4 +1,4 @@ -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::users::UserToken; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs index 2b0d33612e..36770d9b9a 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_api::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry.rs index 49343351e3..b912f6d0c2 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; +use enums_api::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/list_user_wallets.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/list_user_wallets.rs index fa7ffeda6a..4f58d240dc 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/list_user_wallets.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/list_user_wallets.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::users::UserToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_create_wallet_for_user.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_create_wallet_for_user.rs index 6661ae5828..5075f313b7 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_create_wallet_for_user.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_create_wallet_for_user.rs @@ -1,4 +1,4 @@ -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::users::UserToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_get_wallet.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_get_wallet.rs index f88ad68fe6..ffeb89a47a 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_get_wallet.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_get_wallet.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::users::UserToken; use tokens::tokens::wallets::WalletToken; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/create_prompt.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/create_prompt.rs index 8d58e3d057..7e23ca1a18 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/create_prompt.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/create_prompt.rs @@ -1,8 +1,8 @@ use serde_derive::{Deserialize, Serialize}; use tokens::tokens::prompts::PromptToken; use utoipa::ToSchema; -use enums::common::generation_provider::GenerationProvider; -use enums::common::model_type::ModelType; +use enums_api::common::generation::generation_provider::GenerationProvider; +use enums_api::common::model_type::ModelType; pub const CREATE_PROMPT_PATH: &str = "/v1/prompts/create"; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_create_new_user_account_and_subscription_checkout.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_create_new_user_account_and_subscription_checkout.rs index 0ebc0aa085..bc1c3e43a9 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_create_new_user_account_and_subscription_checkout.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_create_new_user_account_and_subscription_checkout.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use serde_derive::{Deserialize, Serialize}; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs index 4aed91b671..4ebda49438 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; +use enums_api::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug; use serde_derive::{Deserialize, Serialize}; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs index 2d30193d87..df6990cc6c 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use serde_derive::{Deserialize, Serialize}; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/customer_portal_switch_plan.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/customer_portal_switch_plan.rs index f04285f2bd..33e01a0215 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/customer_portal_switch_plan.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/stripe_artcraft/customer_portal_switch_plan.rs @@ -1,4 +1,4 @@ -use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; +use enums_api::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug; use serde_derive::{Deserialize, Serialize}; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/subscriptions/get_session_subscription.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/subscriptions/get_session_subscription.rs index aa7a0088dd..365eea29c7 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/subscriptions/get_session_subscription.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/subscriptions/get_session_subscription.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use serde_derive::{Deserialize, Serialize}; use tokens::tokens::user_subscriptions::UserSubscriptionToken; use utoipa::ToSchema; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/users/session_info.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/users/session_info.rs index a4baac7c97..ea34194a18 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/users/session_info.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/users/session_info.rs @@ -1,5 +1,5 @@ use crate::common::responses::user_details_light::UserDetailsLight; -use enums::by_table::users::user_feature_flag::UserFeatureFlag; +use enums_api::by_table::users::user_feature_flag::UserFeatureFlag; use serde_derive::Serialize; use std::collections::BTreeSet; use tokens::tokens::users::UserToken; diff --git a/crates/api_clients/artcraft/artcraft_client/Cargo.toml b/crates/api_clients/artcraft/artcraft_client/Cargo.toml index f3660a06a7..e1700e6fc7 100644 --- a/crates/api_clients/artcraft/artcraft_client/Cargo.toml +++ b/crates/api_clients/artcraft/artcraft_client/Cargo.toml @@ -25,7 +25,7 @@ workspace-build-acceleration.workspace = true # Internal artcraft_api_defs.workspace = true cloudflare_errors.workspace = true -enums.workspace = true +enums_api.workspace = true enums_public.workspace = true errors.workspace = true uuid_utils.workspace = true diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs index 55a4bf7a2c..684ed563f7 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/credits/get_session_credits.rs @@ -3,7 +3,7 @@ use crate::error::storyteller_error::StorytellerError; use crate::utils::api_host::ApiHost; use crate::utils::basic_json_get_request::basic_json_get_request; use artcraft_api_defs::credits::get_session_credits::GetSessionCreditsResponse; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; pub async fn get_session_credits( api_host: &ApiHost, @@ -21,7 +21,7 @@ pub async fn get_session_credits( fn get_url_path(payments_namespace: PaymentsNamespace) -> String { - let payments_namespace = payments_namespace.to_str(); + let payments_namespace = serde_json::to_string(&payments_namespace).unwrap().replace('"', ""); format!("/v1/credits/namespace/{}", payments_namespace) } diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs index accf2a6043..eb7e07381d 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/jobs/list_session_jobs.rs @@ -3,7 +3,7 @@ use crate::error::storyteller_error::StorytellerError; use crate::utils::api_host::ApiHost; use crate::utils::basic_json_get_request::basic_json_get_request; use artcraft_api_defs::jobs::list_session_jobs::{ListSessionJobsSuccessResponse, LIST_SESSION_JOBS_URL_PATH}; -use enums::common::job_status_plus::JobStatusPlus; +use enums_api::common::job_status_plus::JobStatusPlus; use std::collections::HashSet; #[derive(Clone)] @@ -37,7 +37,7 @@ pub async fn list_session_jobs( fn states_string(states: &HashSet) -> String { states.iter() - .map(|state| state.to_str()) + .map(|state| serde_json::to_string(state).unwrap().replace('"', "")) .collect::>() .join(",") } \ No newline at end of file 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..f2051ebb2e 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,7 @@ 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 enums_api::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/get_media_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/get_media_file.rs index d782591e08..45dfac1def 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/get_media_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/get_media_file.rs @@ -8,13 +8,13 @@ use artcraft_api_defs::common::responses::media_links::MediaLinks; use artcraft_api_defs::common::responses::simple_entity_stats::SimpleEntityStats; use artcraft_api_defs::common::responses::user_details_light::UserDetailsLight; 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_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::visibility::Visibility; +use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType; use log::debug; use serde_derive::Deserialize; 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..c913f708c2 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,14 @@ 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_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::generation::generation_provider::GenerationProvider; +use enums_api::common::visibility::Visibility; +use enums_api::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_bytes.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs index 2128e5021a..cd1530fd2f 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,13 @@ 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_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::visibility::Visibility; +use enums_api::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..3c5aa1ee21 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,14 @@ 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_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::generation::generation_provider::GenerationProvider; +use enums_api::common::visibility::Visibility; +use enums_api::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_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..292cce71f3 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,13 @@ 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_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::visibility::Visibility; +use enums_api::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..42f0e2e35a 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,13 @@ 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_api::by_table::media_files::media_file_animation_type::MediaFileAnimationType; +use enums_api::by_table::media_files::media_file_class::MediaFileClass; +use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngineCategory; +use enums_api::by_table::media_files::media_file_type::MediaFileType; +use enums_api::by_table::model_weights::weights_category::WeightsCategory; +use enums_api::common::visibility::Visibility; +use enums_api::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/subscriptions/get_session_subscription.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs index e0fb5b0142..740a1694f1 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/subscriptions/get_session_subscription.rs @@ -3,7 +3,7 @@ use crate::error::storyteller_error::StorytellerError; use crate::utils::api_host::ApiHost; use crate::utils::basic_json_get_request::basic_json_get_request; use artcraft_api_defs::subscriptions::get_session_subscription::GetSessionSubscriptionResponse; -use enums::common::payments_namespace::PaymentsNamespace; +use enums_api::common::payments_namespace::PaymentsNamespace; use log::debug; pub async fn get_session_subscription( @@ -23,6 +23,6 @@ pub async fn get_session_subscription( } fn get_url_path(payments_namespace: PaymentsNamespace) -> String { - let payments_namespace = payments_namespace.to_str(); + let payments_namespace = serde_json::to_string(&payments_namespace).unwrap().replace('"', ""); format!("/v1/subscriptions/namespace/{}", payments_namespace) } diff --git a/crates/api_clients/fakeyou_client/Cargo.toml b/crates/api_clients/fakeyou_client/Cargo.toml index db62b5d498..410ea6a98e 100644 --- a/crates/api_clients/fakeyou_client/Cargo.toml +++ b/crates/api_clients/fakeyou_client/Cargo.toml @@ -20,7 +20,7 @@ path = "src/lib.rs" workspace-build-acceleration.workspace = true # Internal -enums.workspace = true +enums_api.workspace = true errors.workspace = true tokens.workspace = true diff --git a/crates/lib/actix_artcraft/Cargo.toml b/crates/lib/actix_artcraft/Cargo.toml index a1dec467af..bc2c96453f 100644 --- a/crates/lib/actix_artcraft/Cargo.toml +++ b/crates/lib/actix_artcraft/Cargo.toml @@ -23,7 +23,7 @@ workspace-build-acceleration.workspace = true # Internal actix_helpers.workspace = true jwt_signer.workspace = true -enums.workspace = true +enums_api.workspace = true errors.workspace = true http_headers.workspace = true tokens.workspace = true diff --git a/crates/lib/actix_artcraft/src/requests/get_request_signup_source_enum.rs b/crates/lib/actix_artcraft/src/requests/get_request_signup_source_enum.rs index 55bccfe413..2290e7a3cf 100644 --- a/crates/lib/actix_artcraft/src/requests/get_request_signup_source_enum.rs +++ b/crates/lib/actix_artcraft/src/requests/get_request_signup_source_enum.rs @@ -1,6 +1,6 @@ use actix_helpers::extractors::get_request_origin_uri::get_request_origin_uri; use actix_web::HttpRequest; -use enums::by_table::users::user_signup_source::UserSignupSource; +use enums_api::by_table::users::user_signup_source::UserSignupSource; use log::warn; pub fn get_request_signup_source_enum(http_request: &HttpRequest) -> Option { @@ -52,7 +52,7 @@ mod tests { mod origin_header_enum { use super::*; use crate::requests::get_request_signup_source_enum::get_request_signup_source_enum; - use enums::by_table::users::user_signup_source::UserSignupSource; + use enums_api::by_table::users::user_signup_source::UserSignupSource; #[test] fn artcraft_dot_ai() {