begin replacing enums with enums_api

This commit is contained in:
Brandon Thomas committed 2026-03-22 13:04:58 -04:00
1 parent 83a8852cef
commit 5ab2bb47da
35 files changed
+94 -95

No files matched your search

Generated
+3 -3
View File
@@ -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",
@@ -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
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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";
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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
@@ -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)
}
@@ -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<JobStatusPlus>) -> String {
states.iter()
.map(|state| state.to_str())
.map(|state| serde_json::to_string(state).unwrap().replace('"', ""))
.collect::<Vec<_>>()
.join(",")
}
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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)
}
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
@@ -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<UserSignupSource> {
@@ -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() {