cleanup

Cargo.lock

@@ -730,7 +730,6 @@ dependencies = [
  "chrono",
  "enums",
  "enums_api",
- "enums_public",
  "serde",
  "serde_derive",
  "serde_json",
@@ -752,8 +751,6 @@ dependencies = [
  "cookie 0.18.1",
  "enums",
  "enums_api",
- "enums_db",
- "enums_public",
  "errors",
  "log",
  "mimetypes",

crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml

@@ -22,7 +22,6 @@ workspace-build-acceleration.workspace = true
 # Internal
 enums.workspace = true
 enums_api.workspace = true
-enums_public.workspace = true
 tokens.workspace = true
 
 # External

crates/api_clients/artcraft/artcraft_client/Cargo.toml

@@ -27,12 +27,10 @@ artcraft_api_defs.workspace = true
 cloudflare_errors.workspace = true
 enums.workspace = true
 enums_api.workspace = true
-enums_db.workspace = true
-enums_public.workspace = true
 errors.workspace = true
-uuid_utils.workspace = true
 mimetypes.workspace = true
 tokens.workspace = true
+uuid_utils.workspace = true
 
 # External
 anyhow.workspace = true

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/delete_media_file.rs

@@ -4,8 +4,6 @@ use crate::utils::api_host::ApiHost;
 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;
 

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/get_media_file.rs

@@ -1,4 +1,3 @@
-use enums_db::by_table::model_weights::weights_types::WeightsType;
 use crate::error::api_error::ApiError;
 use crate::error::storyteller_error::StorytellerError;
 use crate::utils::api_host::ApiHost;
@@ -16,6 +15,7 @@ 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::model_weights::weights_types::WeightsType;
 use log::debug;
 use serde_derive::Deserialize;
 use tokens::tokens::batch_generations::BatchGenerationToken;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs

@@ -1,4 +1,3 @@
-use enums_db::by_table::model_weights::weights_types::WeightsType;
 use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use crate::error::api_error::ApiError;
 use crate::error::client_error::ClientError;
@@ -6,27 +5,13 @@ use crate::error::storyteller_error::StorytellerError;
 use crate::utils::api_host::ApiHost;
 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_api::common::generation::generation_provider::GenerationProvider;
-use enums::common::visibility::Visibility;
-use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
-use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
-use serde_derive::{Deserialize, Serialize};
+use serde_derive::Deserialize;
 use std::path::Path;
-use tokens::tokens::batch_generations::BatchGenerationToken;
 use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::model_weights::ModelWeightToken;
-use tokens::tokens::prompts::PromptToken;
-use uuid::uuid;
+use uuid_utils::uuid::generate_random_uuid;
 
 pub struct LegacyUploadMediaFileFromFileArgs<'a, P: AsRef<Path>> {
   pub api_host: &'a ApiHost,

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs

@@ -1,4 +1,3 @@
-use enums_db::by_table::model_weights::weights_types::WeightsType;
 use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use crate::error::api_error::ApiError;
 use crate::error::client_error::ClientError;
@@ -6,28 +5,12 @@ use crate::error::storyteller_error::StorytellerError;
 use crate::utils::api_host::ApiHost;
 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 uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
-use serde_derive::{Deserialize, Serialize};
-use std::fs::File;
-use std::io::Read;
-use std::path::Path;
-use tokens::tokens::batch_generations::BatchGenerationToken;
+use serde_derive::Deserialize;
 use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::model_weights::ModelWeightToken;
-use tokens::tokens::prompts::PromptToken;
-use uuid::uuid;
+use uuid_utils::uuid::generate_random_uuid;
 
 pub struct UploadImageBytesArgs<'a> {
   pub api_host: &'a ApiHost,

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs

@@ -1,4 +1,3 @@
-use enums_db::by_table::model_weights::weights_types::WeightsType;
 use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use crate::error::api_error::ApiError;
 use crate::error::client_error::ClientError;
@@ -6,27 +5,15 @@ use crate::error::storyteller_error::StorytellerError;
 use crate::utils::api_host::ApiHost;
 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_api::common::generation::generation_provider::GenerationProvider;
-use enums::common::visibility::Visibility;
-use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
-use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
-use serde_derive::{Deserialize, Serialize};
+use serde_derive::Deserialize;
 use std::path::Path;
 use tokens::tokens::batch_generations::BatchGenerationToken;
 use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::prompts::PromptToken;
-use uuid::uuid;
+use uuid_utils::uuid::generate_random_uuid;
 
 pub struct UploadImageFromFileArgs<'a, P: AsRef<Path>> {
   pub api_host: &'a ApiHost,

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs

@@ -1,29 +1,15 @@
-use enums_db::by_table::model_weights::weights_types::WeightsType;
 use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use crate::error::api_error::ApiError;
 use crate::utils::api_host::ApiHost;
 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 uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
-use serde_derive::{Deserialize, Serialize};
+use serde_derive::Deserialize;
 use std::path::Path;
-use tokens::tokens::batch_generations::BatchGenerationToken;
 use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::model_weights::ModelWeightToken;
-use tokens::tokens::prompts::PromptToken;
-use uuid::uuid;
+use uuid_utils::uuid::generate_random_uuid;
 
 // TODO: The naming of these methods is ridiculous. It needs to be cleaned up.
 

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs

@@ -1,29 +1,16 @@
-use enums_db::by_table::model_weights::weights_types::WeightsType;
 use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use crate::error::api_error::ApiError;
 use crate::utils::api_host::ApiHost;
 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 uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
-use serde_derive::{Deserialize, Serialize};
+use serde_derive::Deserialize;
 use std::path::Path;
-use tokens::tokens::batch_generations::BatchGenerationToken;
 use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::prompts::PromptToken;
-use uuid::uuid;
+use uuid_utils::uuid::generate_random_uuid;
 
 pub struct UploadVideoFromFileArgs<'a, P: AsRef<Path>> {
   pub api_host: &'a ApiHost,
@@ -110,4 +97,3 @@ fn get_route(api_host: &ApiHost) -> String {
   let api_hostname_and_scheme = api_host.to_api_hostname_and_scheme();
   format!("{}/v1/media_files/upload/new_video", api_hostname_and_scheme)
 }
-

crates/schema/public/enums_api/src/by_table/model_weights/mod.rs

@@ -1 +1 @@
-pub mod public_weights_types;
+pub mod weights_types;

crates/service/web/storyteller_web/src/docs/api_doc.rs

@@ -1,5 +1,5 @@
 use enums::by_table::model_weights::weights_category::WeightsCategory;
-use enums_api::by_table::model_weights::public_weights_types::WeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType;
 use utoipa::OpenApi;
 
 use crate::http_server::common_requests::auto_product_category::AutoProductCategory;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs

@@ -1,4 +1,4 @@
-use enums_api::by_table::model_weights::public_weights_types::WeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType;
 use enums_db::by_table::model_weights::weights_types::WeightsType as DbWeightsType;
 use std::collections::HashSet;
 use std::fmt;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs

@@ -1,4 +1,4 @@
-use enums_api::by_table::model_weights::public_weights_types::WeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType;
 use enums_db::by_table::model_weights::weights_types::WeightsType as DbWeightsType;
 use std::fmt;
 use std::sync::Arc;

crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_user_handler.rs

@@ -3,7 +3,7 @@
 #![forbid(unused_mut)]
 #![forbid(unused_variables)]
 
-use enums_api::by_table::model_weights::public_weights_types::WeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType;
 use enums_db::by_table::model_weights::weights_types::WeightsType as DbWeightsType;
 use std::fmt;
 use std::sync::Arc;

crates/service/web/storyteller_web/src/http_server/endpoints/weights/get/get_weight_handler.rs

@@ -1,4 +1,4 @@
-use enums_api::by_table::model_weights::public_weights_types::WeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType;
 use std::fmt;
 use std::sync::Arc;
 

crates/service/web/storyteller_web/src/http_server/endpoints/weights/helpers/get_scoped_weights_types.rs

@@ -1,4 +1,4 @@
-use enums_api::by_table::model_weights::public_weights_types::WeightsType as ApiWeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType as ApiWeightsType;
 use enums_db::by_table::model_weights::weights_types::WeightsType as DbWeightsType;
 use std::collections::HashSet;
 
@@ -44,7 +44,7 @@ mod test {
   use std::collections::HashSet;
 
 
-  use enums_api::by_table::model_weights::public_weights_types::WeightsType as ApiWeightsType;
+  use enums_api::by_table::model_weights::weights_types::WeightsType as ApiWeightsType;
   use enums_db::by_table::model_weights::weights_types::WeightsType as DbWeightsType;
   use crate::http_server::endpoints::weights::helpers::get_scoped_weights_types::{get_scoped_public_weights_types, get_scoped_weights_types};
 

crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_available_weights_handler.rs

@@ -1,4 +1,4 @@
-use enums_api::by_table::model_weights::public_weights_types::WeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType;
 use std::sync::Arc;
 
 use actix_web::error::ResponseError;

crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_featured_weights_handler.rs

@@ -1,4 +1,4 @@
-use enums_api::by_table::model_weights::public_weights_types::WeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType;
 use std::sync::Arc;
 
 use actix_web::error::ResponseError;

crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_pinned_weights_handler.rs

@@ -1,4 +1,4 @@
-use enums_api::by_table::model_weights::public_weights_types::WeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType;
 use std::sync::Arc;
 
 use actix_web::error::ResponseError;

crates/service/web/storyteller_web/src/http_server/endpoints/weights/list/list_weights_by_user_handler.rs

@@ -1,4 +1,4 @@
-use enums_api::by_table::model_weights::public_weights_types::WeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType;
 use std::fmt;
 use std::sync::Arc;
 

crates/service/web/storyteller_web/src/http_server/endpoints/weights/search/search_model_weights_impl.rs

@@ -3,7 +3,7 @@
 #![forbid(unused_mut)]
 #![forbid(unused_variables)]
 
-use enums_api::by_table::model_weights::public_weights_types::WeightsType;
+use enums_api::by_table::model_weights::weights_types::WeightsType;
 use std::collections::HashSet;
 use std::fmt;
 use std::sync::Arc;