replace of enums with enums_db appears harmless

This commit is contained in:
Brandon Thomas committed 2026-03-22 13:35:13 -04:00
1 parent 1225414165
commit f2b9a9c5f2
305 files changed
+998 -993

No files matched your search

Generated
+16 -14
View File
@@ -512,7 +512,7 @@ dependencies = [
"datetimes",
"dotenv",
"easyenv",
"enums",
"enums_db",
"errors",
"futures 0.3.32",
"hostname 0.4.0",
@@ -2373,7 +2373,7 @@ dependencies = [
name = "composite_identifiers"
version = "0.0.1"
dependencies = [
"enums",
"enums_db",
"serde",
"serde_derive",
"serde_json",
@@ -2971,7 +2971,7 @@ dependencies = [
"datetimes",
"dotenv",
"easyenv",
"enums",
"enums_db",
"errors",
"futures 0.3.32",
"log",
@@ -3005,7 +3005,7 @@ dependencies = [
"clap 4.5.60",
"dotenv",
"easyenv",
"enums",
"enums_db",
"errors",
"itertools 0.13.0",
"log",
@@ -3136,7 +3136,7 @@ dependencies = [
"config",
"easyenv",
"elasticsearch",
"enums",
"enums_db",
"errors",
"filesys",
"hashing",
@@ -3161,7 +3161,7 @@ dependencies = [
"cloud_storage",
"config",
"easyenv",
"enums",
"enums_db",
"errors",
"filesys",
"log",
@@ -3614,7 +3614,7 @@ dependencies = [
"easyenv",
"elasticsearch",
"elasticsearch_schema",
"enums",
"enums_db",
"errors",
"log",
"mysql_queries",
@@ -3636,7 +3636,7 @@ version = "0.0.1"
dependencies = [
"chrono",
"elasticsearch",
"enums",
"enums_db",
"errors",
"jsonpath_lib",
"log",
@@ -3965,7 +3965,7 @@ dependencies = [
"easyenv",
"elasticsearch",
"elasticsearch_schema",
"enums",
"enums_db",
"errors",
"futures 0.3.32",
"hostname 0.4.0",
@@ -6884,7 +6884,7 @@ dependencies = [
"bucket_paths",
"chrono",
"cloud_storage",
"enums",
"enums_db",
"errors",
"jobs_common",
"mysql_queries",
@@ -6908,7 +6908,7 @@ dependencies = [
"cloud_storage",
"config",
"easyenv",
"enums",
"enums_db",
"errors",
"filesys",
"hashing",
@@ -7130,7 +7130,7 @@ dependencies = [
"bucket_paths",
"chrono",
"composite_identifiers",
"enums",
"enums_db",
"errors",
"log",
"num-traits",
@@ -7143,6 +7143,7 @@ dependencies = [
"serde_json",
"serial_test",
"sqlx",
"strum",
"tokens",
"tokio",
"uuid_utils",
@@ -9297,7 +9298,7 @@ name = "redis_schema"
version = "0.0.1"
dependencies = [
"chrono",
"enums",
"enums_db",
"errors",
"r2d2",
"redis 1.0.2",
@@ -10964,7 +10965,8 @@ version = "0.0.1"
dependencies = [
"anyhow",
"chrono",
"enums",
"enums_db",
"enums_shared",
"errors",
"log",
"once_cell",
@@ -24,7 +24,7 @@ bucket_paths.workspace = true
cloud_storage.workspace = true
config = { path = "../../../lib/deprecated/config" }
easyenv = { path = "../../../lib/easyenv" }
enums.workspace = true
enums_db.workspace = true
errors.workspace = true
filesys.workspace = true
hashing = { path = "../../../lib/files/hashing" }
@@ -3,8 +3,8 @@ use sqlx::{MySql, Pool};
use bucket_paths::legacy::remote_file_manager_paths::media_descriptor::MediaVideoMp4Descriptor;
use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient;
use enums::by_table::media_files::media_file_type::MediaFileType;
use enums::common::visibility::Visibility;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_db::common::visibility::Visibility;
use errors::{anyhow, AnyhowResult};
use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_cli_tool::{insert_media_file_from_cli_tool, InsertArgs};
use mysql_queries::queries::users::user::get::get_user_token_by_username::get_user_token_by_username;
@@ -7,11 +7,11 @@ use sqlx::{MySql, Pool};
use bucket_paths::legacy::remote_file_manager_paths::weights_descriptor::{WeightsLoRADescriptor, WeightsSD15Descriptor, WeightsWorkflowDescriptor};
use bucket_paths::legacy::remote_file_manager_paths::remote_cloud_bucket_details::RemoteCloudBucketDetails;
use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient;
use enums::by_table::model_weights::{
use enums_db::by_table::model_weights::{
weights_category::WeightsCategory,
weights_types::WeightsType,
};
use enums::common::visibility::Visibility;
use enums_db::common::visibility::Visibility;
use errors::{anyhow, AnyhowResult};
use mysql_queries::queries::model_weights::create::create_weight::{create_weight, CreateModelWeightsArgs};
use mysql_queries::queries::users::user::get::get_user_token_by_username::get_user_token_by_username;
@@ -4,8 +4,8 @@ use log::{info, warn};
use sqlx::{MySql, Pool};
use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
use enums::by_table::media_files::media_file_type::MediaFileType;
use enums::common::visibility::Visibility;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use filesys::file_read_bytes::file_read_bytes;
use filesys::file_size::file_size;
@@ -6,7 +6,7 @@ use rand::Rng;
use sqlx::{MySql, Pool};
use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath;
use enums::{
use enums_db::{
by_table::model_weights::{weights_category::WeightsCategory, weights_types::WeightsType},
common::visibility::Visibility,
};
@@ -4,8 +4,8 @@ use log::{info, warn};
use sqlx::{MySql, Pool};
use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier;
use enums::by_table::tts_models::tts_model_type::TtsModelType;
use enums::common::visibility::Visibility;
use enums_db::by_table::tts_models::tts_model_type::TtsModelType;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use filesys::file_read_bytes::file_read_bytes;
use filesys::path_to_string::path_to_string;
@@ -1,7 +1,7 @@
use log::info;
use sqlx::{MySql, Pool};
use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use errors::{anyhow, AnyhowResult};
use mysql_queries::queries::users::user::get::get_user_token_by_username::get_user_token_by_username;
use mysql_queries::queries::voice_conversion::models::insert_voice_conversion_model_from_download_job::{insert_voice_conversion_model_from_download_job, InsertVoiceConversionModelArgs};
@@ -3,12 +3,12 @@ use sqlx::{MySql, Pool};
use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
use cloud_storage::bucket_client::BucketClient;
use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums::by_table::media_uploads::media_upload_type::MediaUploadType;
use enums::by_table::zs_voices::encoding_type::ZsVoiceEncodingType;
use enums::by_table::zs_voices::model_category::ZsVoiceModelCategory;
use enums::by_table::zs_voices::model_type::ZsVoiceModelType;
use enums::common::visibility::Visibility;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_uploads::media_upload_type::MediaUploadType;
use enums_db::by_table::zs_voices::encoding_type::ZsVoiceEncodingType;
use enums_db::by_table::zs_voices::model_category::ZsVoiceModelCategory;
use enums_db::by_table::zs_voices::model_type::ZsVoiceModelType;
use enums_db::common::visibility::Visibility;
use errors::{anyhow, AnyhowResult};
use filesys::file_read_bytes::file_read_bytes;
use uuid_utils::uuid::generate_random_uuid;
@@ -24,7 +24,7 @@ bucket_paths.workspace = true
cloud_storage.workspace = true
config = { path = "../../../lib/deprecated/config" }
easyenv = { path = "../../../lib/easyenv" }
enums.workspace = true
enums_db.workspace = true
errors.workspace = true
filesys.workspace = true
mimetypes.workspace = true
@@ -6,8 +6,8 @@ use sqlx::mysql::MySqlPoolOptions;
use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
use cloud_storage::bucket_client::BucketClient;
use config::shared_constants::{DEFAULT_MYSQL_CONNECTION_STRING, DEFAULT_RUST_LOG};
use enums::by_table::media_files::media_file_type::MediaFileType;
use enums::common::visibility::Visibility;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_db::common::visibility::Visibility;
use errors::{AnyhowResult, bail};
use filesys::file_read_bytes::file_read_bytes;
use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes;
+1 -1
View File
@@ -22,7 +22,7 @@ workspace-build-acceleration = { workspace = true }
# Internal
datetimes = { path = "../../../lib/data/datetimes" }
easyenv = { path = "../../../lib/easyenv" }
enums = { path = "../../../schema/public/enums" }
enums_db.workspace = true
errors = { path = "../../../lib/errors" }
mysql_queries = { path = "../../../schema/database/mysql_queries" }
tokens = { path = "../../../schema/public/tokens" }
+1 -1
View File
@@ -22,7 +22,7 @@ workspace-build-acceleration = { workspace = true }
# Internal
bucket_paths.workspace = true
easyenv = { path = "../../../lib/easyenv" }
enums = { path = "../../../schema/public/enums" }
enums_db.workspace = true
errors = { path = "../../../lib/errors" }
mysql_queries = { path = "../../../schema/database/mysql_queries" }
storyteller_root = { path = "../../../lib/storyteller_root" }
@@ -5,8 +5,8 @@ use std::time::Duration;
use log::info;
use sqlx::{MySql, Pool};
use enums::by_table::media_files::media_file_type::MediaFileType;
use enums::common::view_as::ViewAs;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_db::common::view_as::ViewAs;
use errors::AnyhowResult;
use mysql_queries::queries::media_files::delete::delete_media_file::delete_media_file_as_mod;
use mysql_queries::queries::media_files::list::list_media_files::{list_media_files, ListMediaFilesArgs};
@@ -4,7 +4,7 @@ use std::time::Duration;
use log::info;
use sqlx::{MySql, Pool};
use enums::common::view_as::ViewAs;
use enums_db::common::view_as::ViewAs;
use errors::{anyhow, AnyhowResult};
use mysql_queries::queries::media_files::delete::delete_media_file::delete_media_file_as_mod;
use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs};
@@ -24,7 +24,7 @@ bucket_paths.workspace = true
config = { path = "../../../lib/deprecated/config" }
easyenv = { path = "../../../lib/easyenv" }
elasticsearch_schema = { path = "../../../schema/database/elasticsearch_schema" }
enums = { path = "../../../schema/public/enums" }
enums_db.workspace = true
errors = { path = "../../../lib/errors" }
mysql_queries = { path = "../../../schema/database/mysql_queries" }
primitives = { path = "../../../lib/data/primitives" }
@@ -16,7 +16,7 @@ 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 enums_db::by_table::model_weights::weights_types::WeightsType;
use errors::AnyhowResult;
use crate::cli_args::{parse_cli_args, Action, Environment};
@@ -10,9 +10,9 @@ use sqlx::{MySql, Pool};
use elasticsearch_schema::documents::media_file_document::{MEDIA_FILE_INDEX, MediaFileDocument};
use elasticsearch_schema::traits::document::Document;
use elasticsearch_schema::utils::create_index_if_not_exists::{create_index_if_not_exists, CreateIndexArgs};
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_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use mysql_queries::queries::media_files::list::list_media_files_for_elastic_search_backfill_using_cursor::{list_media_files_for_elastic_search_backfill_using_cursor, ListArgs, MediaFileForElasticsearchRecord};
use mysql_queries::queries::model_weights::list::list_model_weights_for_elastic_search_backfill_using_cursor::{list_model_weights_for_elastic_search_backfill_using_cursor, ModelWeightForElasticsearchRecord};
@@ -4,7 +4,7 @@ use std::iter::FromIterator;
use elasticsearch::Elasticsearch;
use elasticsearch_schema::searches::search_media_files::{search_media_files, SearchArgs};
use enums::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use errors::AnyhowResult;
pub async fn test_search_media_files(client: &Elasticsearch) -> AnyhowResult<()> {
@@ -8,7 +8,7 @@ use sqlx::{MySql, Pool};
use elasticsearch_schema::documents::model_weight_document::{MODEL_WEIGHT_INDEX, ModelWeightDocument};
use elasticsearch_schema::traits::document::Document;
use elasticsearch_schema::utils::create_index_if_not_exists::{create_index_if_not_exists, CreateIndexArgs};
use enums::by_table::model_weights::weights_category::WeightsCategory;
use enums_db::by_table::model_weights::weights_category::WeightsCategory;
use errors::AnyhowResult;
use mysql_queries::queries::model_weights::list::list_model_weights_for_elastic_search_backfill_using_cursor::{list_model_weights_for_elastic_search_backfill_using_cursor, ModelWeightForElasticsearchRecord};
use primitives::numerics::u64_to_i32_saturating::u64_to_i32_saturating;
@@ -1,7 +1,7 @@
use elasticsearch::Elasticsearch;
use elasticsearch_schema::documents::model_weight_document::ModelWeightDocument;
use elasticsearch_schema::searches::search_model_weights::search_model_weights::{search_model_weights, ModelWeightsSortDirection, ModelWeightsSortField, SearchArgs};
use enums::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use errors::AnyhowResult;
use std::collections::HashSet;
use std::iter::FromIterator;
@@ -24,7 +24,7 @@ bucket_paths.workspace = true
cloud_storage.workspace = true
config = { path = "../../../lib/deprecated/config" }
easyenv = { path = "../../../lib/easyenv" }
enums.workspace = true
enums_db.workspace = true
errors.workspace = true
filesys.workspace = true
hashing = { path = "../../../lib/files/hashing" }
@@ -4,7 +4,7 @@ use std::time::Duration;
use log::{info, warn};
use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use errors::AnyhowResult;
use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token;
use mysql_queries::queries::model_weights::migration::upsert_model_weight_from_tts_model::{CopiedTtsFileData, upsert_model_weight_from_tts_model};
@@ -2,7 +2,7 @@ use tempdir::TempDir;
use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath;
use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier;
use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use errors::{anyhow, AnyhowResult};
use filesys::file_deletion::safe_delete_directory::safe_delete_directory;
use filesys::file_deletion::safe_delete_file::safe_delete_file;
@@ -4,7 +4,7 @@ use std::time::Duration;
use log::{info, warn};
use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use errors::AnyhowResult;
use mysql_queries::queries::model_weights::get::get_weight::get_weight_by_token;
use mysql_queries::queries::model_weights::migration::upsert_model_weight_from_voice_conversion_model::{CopiedFileData, upsert_model_weight_from_voice_conversion_model};
@@ -20,7 +20,7 @@ normal = ["workspace-build-acceleration"]
workspace-build-acceleration = { workspace = true }
# Internal
enums = { workspace = true }
enums_db = { workspace = true }
errors = { workspace = true }
tokens = { workspace = true }
@@ -3,12 +3,12 @@ use std::path::PathBuf;
use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
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::common::visibility::Visibility;
use enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums_db::by_table::media_files::media_file_subtype::MediaFileSubtype;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_db::common::visibility::Visibility;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
@@ -3,9 +3,9 @@ use std::path::PathBuf;
use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
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_db::by_table::model_weights::weights_category::WeightsCategory;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use enums_db::common::visibility::Visibility;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::model_weights::ModelWeightToken;
use tokens::tokens::users::UserToken;
@@ -3,7 +3,7 @@ use std::path::PathBuf;
use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
use enums::common::visibility::Visibility;
use enums_db::common::visibility::Visibility;
use tokens::tokens::tts_models::TtsModelToken;
use tokens::tokens::users::UserToken;
@@ -4,9 +4,9 @@ use elasticsearch::{Elasticsearch, SearchParts};
use once_cell::sync::Lazy;
use serde_json::{json, Value};
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_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::users::UserToken;
@@ -196,9 +196,9 @@ mod tests {
use serde_json::Value;
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_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use tokens::tokens::users::UserToken;
use crate::searches::search_media_files::{build_query, SearchArgs};
@@ -1,7 +1,7 @@
use std::collections::HashSet;
use serde_json::{json, Value};
use enums::by_table::model_weights::weights_category::WeightsCategory;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::model_weights::weights_category::WeightsCategory;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use tokens::tokens::users::UserToken;
pub fn must_be_not_deleted() -> Value {
@@ -5,8 +5,8 @@ use log::debug;
use once_cell::sync::Lazy;
use serde_json::{json, Number, Value};
use enums::by_table::model_weights::weights_category::WeightsCategory;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::model_weights::weights_category::WeightsCategory;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use errors::AnyhowResult;
use tokens::tokens::users::UserToken;
@@ -175,8 +175,8 @@ mod tests {
use serde_json::Value;
use enums::by_table::model_weights::weights_category::WeightsCategory;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::model_weights::weights_category::WeightsCategory;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use tokens::tokens::users::UserToken;
use crate::searches::search_model_weights::search_model_weights::build_query;
+1 -1
View File
@@ -23,7 +23,7 @@ workspace-build-acceleration.workspace = true
# Internal
bucket_paths.workspace = true
cloud_storage.workspace = true
enums.workspace = true
enums_db.workspace = true
errors.workspace = true
jobs_common = { path = "../../../lib/jobs_common" }
mysql_queries.workspace = true
@@ -2,9 +2,9 @@ use serde_derive::{Deserialize, Serialize};
use sqlx::MySql;
use sqlx::pool::PoolConnection;
use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums::common::visibility::Visibility;
use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use mysql_queries::queries::model_weights::get::get_weight_for_legacy_tts_enqueue::{get_weight_for_legacy_tts_enqueue_with_connection, ModelWeightForLegacyTtsEnqueue};
use mysql_queries::queries::tts::tts_models::get_tts_model::{get_tts_model_by_token_using_connection, TtsModelRecord};
@@ -5,7 +5,7 @@ use sqlx::MySqlPool;
use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier;
use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath;
use enums::by_table::tts_models::tts_model_type::TtsModelType;
use enums_db::by_table::tts_models::tts_model_type::TtsModelType;
use mysql_queries::queries::model_weights::get::get_weight_for_legacy_tts_inference::{get_weight_for_legacy_tts_inference, ModelWeightForLegacyTtsInference};
use mysql_queries::queries::tts::tts_models::get_tts_model_for_inference_improved::{get_tts_model_for_inference_improved, CustomVocoderFields, TtsModelForInferenceError, TtsModelForInferenceRecord};
use tokens::tokens::model_weights::ModelWeightToken;
@@ -3,8 +3,8 @@ use serde_derive::{Deserialize, Serialize};
use sqlx::MySql;
use sqlx::pool::PoolConnection;
use enums::by_table::tts_models::tts_model_type::TtsModelType;
use enums::common::visibility::Visibility;
use enums_db::by_table::tts_models::tts_model_type::TtsModelType;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use mysql_queries::column_types::vocoder_type::VocoderType;
use mysql_queries::queries::model_weights::get::get_weight_for_legacy_tts_info::{get_weight_for_legacy_tts_info_with_connection, ModelWeightForLegacyTtsInfo};
@@ -2,7 +2,7 @@ use chrono::{DateTime, Utc};
use sqlx::MySql;
use sqlx::pool::PoolConnection;
use enums::common::visibility::Visibility;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use mysql_queries::queries::model_weights::list::list_model_weights_for_text_to_speech::{list_model_weights_for_text_to_speech, ModelWeightForTts};
use mysql_queries::queries::tts::tts_models::list_tts_models::{list_tts_models_with_connection, TtsModelRecordForList};
@@ -2,9 +2,9 @@ use chrono::{DateTime, Utc};
use sqlx::MySql;
use sqlx::pool::PoolConnection;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use enums::common::visibility::Visibility;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use mysql_queries::queries::model_weights::list::list_model_weights_for_voice_conversion::{list_model_weights_for_voice_conversion, ModelWeightForVoiceConversion};
use mysql_queries::queries::voice_conversion::models::list_voice_conversion_models::{list_voice_conversion_models_with_connection, VoiceConversionModelRecordForList};
@@ -4,8 +4,8 @@ use sqlx::MySqlPool;
use bucket_paths::legacy::typified_paths::public::weight_files::bucket_file_path::WeightFileBucketPath;
use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use jobs_common::semi_persistent_cache_dir::SemiPersistentCacheDir;
use mysql_queries::queries::model_weights::inference::get_model_weight_for_voice_conversion_inference::{get_model_weight_for_voice_conversion_inference, ModelWeightError, ModelWeightForVoiceConversionInference};
use mysql_queries::queries::voice_conversion::inference::get_voice_conversion_model_for_inference::{get_voice_conversion_model_for_inference, VoiceConversionModelForInference, VoiceConversionModelForInferenceError};
@@ -219,7 +219,7 @@ mod tests {
use std::path::PathBuf;
use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier;
use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use jobs_common::semi_persistent_cache_dir::SemiPersistentCacheDir;
use mysql_queries::queries::voice_conversion::inference::get_voice_conversion_model_for_inference::VoiceConversionModelForInference;
use tokens::tokens::voice_conversion_models::VoiceConversionModelToken;
@@ -307,7 +307,7 @@ mod tests {
use std::path::PathBuf;
use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use jobs_common::semi_persistent_cache_dir::SemiPersistentCacheDir;
use mysql_queries::queries::model_weights::inference::get_model_weight_for_voice_conversion_inference::ModelWeightForVoiceConversionInference;
use tokens::tokens::model_weights::ModelWeightToken;
@@ -1,10 +1,10 @@
use sqlx::{MySql, MySqlPool};
use sqlx::pool::PoolConnection;
use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use errors::AnyhowResult;
use mysql_queries::queries::model_weights::model_weight_info_lite::get_model_weight_info_lite::get_model_weight_info_lite_with_connection;
use mysql_queries::queries::model_weights::model_weight_info_lite::model_weight_info_lite::ModelWeightInfoLite;
@@ -111,9 +111,9 @@ impl VcModelLite {
mod tests {
mod legacy_voice_conversion_models {
use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums_db::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use mysql_queries::queries::voice_conversion::model_info_lite::model_info_lite::VoiceConversionModelInfoLite;
use tokens::tokens::voice_conversion_models::VoiceConversionModelToken;
@@ -165,9 +165,9 @@ mod tests {
}
mod new_model_weights {
use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums_db::by_table::model_weights::weights_types::WeightsType;
use mysql_queries::queries::model_weights::model_weight_info_lite::model_weight_info_lite::ModelWeightInfoLite;
use tokens::tokens::model_weights::ModelWeightToken;
@@ -22,8 +22,9 @@ workspace-build-acceleration.workspace = true
# Internal
bucket_paths.workspace = true
composite_identifiers = { path = "../../../schema/public/composite_identifiers" }
enums = { workspace = true, features = ["database"] }
enums_db.workspace = true
errors.workspace = true
strum.workspace = true
uuid_utils.workspace = true
reusable_types = { path = "../../../schema/public/reusable_types" }
tokens = { workspace = true, features = ["database"] }
@@ -1,4 +1,4 @@
use enums::by_table::user_ratings::entity_type::UserRatingEntityType;
use enums_db::by_table::user_ratings::entity_type::UserRatingEntityType;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::model_weights::ModelWeightToken;
use tokens::tokens::tts_models::TtsModelToken;
@@ -1,4 +1,4 @@
use enums::common::visibility::Visibility;
use enums_db::common::visibility::Visibility;
#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
pub struct GptSovitsPayload {
@@ -1,5 +1,5 @@
use crate::payloads::generic_inference_args::common::watermark_type::WatermarkType;
use enums::common::visibility::Visibility;
use enums_db::common::visibility::Visibility;
use std::time::Duration;
use tokens::tokens::media_files::MediaFileToken;
@@ -1,7 +1,7 @@
use std::collections::HashMap;
use enums::common::visibility::Visibility;
use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
use enums_db::common::visibility::Visibility;
use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::model_weights::ModelWeightToken;
@@ -1,4 +1,4 @@
use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName;
/// We encode the style name as a string so that we don't accidentally break
/// forward/reverse compatibility as we remove styles.
@@ -1,6 +1,6 @@
use chrono::Duration;
use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
@@ -1,6 +1,6 @@
use crate::errors::mysql_error::MysqlError;
use crate::errors::subtypes::upsert_error::UpsertError;
use enums::common::payments_namespace::PaymentsNamespace;
use enums_db::common::payments_namespace::PaymentsNamespace;
use sqlx::mysql::MySqlArguments;
use sqlx::pool::PoolConnection;
use sqlx::query::Query;
@@ -1,6 +1,6 @@
use crate::errors::mysql_error::MysqlError;
use crate::errors::subtypes::upsert_error::UpsertError;
use enums::common::payments_namespace::PaymentsNamespace;
use enums_db::common::payments_namespace::PaymentsNamespace;
use sqlx::mysql::MySqlArguments;
use sqlx::pool::PoolConnection;
use sqlx::query::Query;
@@ -6,7 +6,7 @@ use anyhow::anyhow;
use sqlx::{Executor, MySql};
use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity;
use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction;
use enums_db::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::audit_logs::AuditLogToken;
@@ -4,7 +4,7 @@ use anyhow::anyhow;
use sqlx::{MySql, Transaction};
use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity;
use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction;
use enums_db::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::audit_logs::AuditLogToken;
@@ -2,7 +2,7 @@ use anyhow::anyhow;
use chrono::{DateTime, Utc};
use sqlx::{Executor, MySql};
use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct;
use enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct;
use errors::AnyhowResult;
use tokens::tokens::beta_keys::BetaKeyToken;
use tokens::tokens::users::UserToken;
@@ -41,7 +41,7 @@ pub async fn get_beta_key_by_value<'e, 'c, E>(
SELECT
b.token as `token: tokens::tokens::beta_keys::BetaKeyToken`,
b.product as `product: enums::by_table::beta_keys::beta_key_product::BetaKeyProduct`,
b.product as `product: enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct`,
b.key_value,
b.maybe_referrer_user_token as `maybe_referrer_user_token: tokens::tokens::users::UserToken`,
@@ -3,7 +3,7 @@ use log::error;
use sqlx::{MySqlPool, QueryBuilder};
use composite_identifiers::by_table::batch_generations::batch_generation_entity::BatchGenerationEntity;
use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct;
use enums_db::by_table::beta_keys::beta_key_product::BetaKeyProduct;
use errors::AnyhowResult;
use tokens::tokens::batch_generations::BatchGenerationToken;
use tokens::tokens::beta_keys::BetaKeyToken;
@@ -3,8 +3,8 @@ use log::info;
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_db::by_table::beta_keys::beta_key_product::BetaKeyProduct;
use enums_db::traits::mysql_from_row::MySqlFromRow;
use errors::AnyhowResult;
use tokens::tokens::beta_keys::BetaKeyToken;
use tokens::tokens::users::UserToken;
@@ -1,4 +1,4 @@
use enums::by_table::comments::comment_entity_type::CommentEntityType;
use enums_db::by_table::comments::comment_entity_type::CommentEntityType;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::model_weights::ModelWeightToken;
use tokens::tokens::tts_models::TtsModelToken;
@@ -2,7 +2,7 @@ use anyhow::anyhow;
use chrono::{DateTime, Utc};
use sqlx::{Executor, MySql};
use enums::by_table::comments::comment_entity_type::CommentEntityType;
use enums_db::by_table::comments::comment_entity_type::CommentEntityType;
use errors::AnyhowResult;
use tokens::tokens::comments::CommentToken;
use tokens::tokens::users::UserToken;
@@ -50,7 +50,7 @@ pub async fn get_comment<'e, 'c, E>(
SELECT
c.token as `token: tokens::tokens::comments::CommentToken`,
c.entity_type as `entity_type: enums::by_table::comments::comment_entity_type::CommentEntityType`,
c.entity_type as `entity_type: enums_db::by_table::comments::comment_entity_type::CommentEntityType`,
c.entity_token,
c.user_token as `user_token: tokens::tokens::users::UserToken`,
@@ -1,7 +1,7 @@
use anyhow::anyhow;
use sqlx::MySqlPool;
use enums::by_table::email_sender_jobs::email_category::EmailCategory;
use enums_db::by_table::email_sender_jobs::email_category::EmailCategory;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::email_sender_job_token::EmailSenderJobToken;
@@ -2,8 +2,8 @@ use anyhow::anyhow;
use chrono::Utc;
use sqlx::MySqlPool;
use enums::by_table::email_sender_jobs::email_category::EmailCategory;
use enums::common::job_status_plus::JobStatusPlus;
use enums_db::by_table::email_sender_jobs::email_category::EmailCategory;
use enums_db::common::job_status_plus::JobStatusPlus;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::email_sender_job_token::EmailSenderJobToken;
@@ -1,6 +1,6 @@
use enums::by_table::entity_stats::stats_entity_type::StatsEntityType;
use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
use enums::by_table::user_ratings::entity_type::UserRatingEntityType;
use enums_db::by_table::entity_stats::stats_entity_type::StatsEntityType;
use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
use enums_db::by_table::user_ratings::entity_type::UserRatingEntityType;
use tokens::tokens::comments::CommentToken;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::model_weights::ModelWeightToken;
@@ -1,11 +1,12 @@
use std::collections::BTreeSet;
use chrono::Utc;
use strum::IntoEnumIterator;
use sqlx::MySqlPool;
use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType;
use enums::common::job_status::JobStatus;
use enums::common::visibility::Visibility;
use enums_db::by_table::generic_download_jobs::generic_download_type::GenericDownloadType;
use enums_db::common::job_status::JobStatus;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::generic_download_jobs::DownloadJobToken;
use tokens::tokens::users::UserToken;
@@ -44,7 +45,7 @@ pub async fn list_available_generic_download_jobs(
{
let download_types = maybe_scoped_download_types
.map(|types| types.clone())
.unwrap_or(GenericDownloadType::all_variants()); // NB: All model types
.unwrap_or_else(|| GenericDownloadType::iter().collect()); // NB: All model types
// NB/TODO(bt,2023-07-20): Non-statically typed SQL can't do type annotations AFAIK
let mut query = String::from(r#"
@@ -166,7 +167,7 @@ struct AvailableDownloadJobRawInternal {
mod tests {
use std::collections::BTreeSet;
use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType;
use enums_db::by_table::generic_download_jobs::generic_download_type::GenericDownloadType;
use crate::queries::generic_download::job::list_available_generic_download_jobs::download_type_clause;
@@ -1,8 +1,8 @@
use anyhow::anyhow;
use sqlx::MySqlPool;
use enums::by_table::generic_download_jobs::generic_download_type::GenericDownloadType;
use enums::common::visibility::Visibility;
use enums_db::by_table::generic_download_jobs::generic_download_type::GenericDownloadType;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::generic_download_jobs::DownloadJobToken;
@@ -4,12 +4,12 @@ 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 enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::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;
@@ -83,9 +83,9 @@ pub async fn get_inference_job_by_fal_id_from_connection(fal_id: &str, mysql_con
SELECT
jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,
jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,
jobs.status as `status: enums_db::common::job_status_plus::JobStatusPlus`,
jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,
jobs.maybe_external_third_party as `external_third_party: enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,
jobs.maybe_external_third_party_id as `external_third_party_id`,
jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,
@@ -1,7 +1,7 @@
use sqlx::{Executor, MySql};
use std::marker::PhantomData;
use enums::common::visibility::Visibility;
use enums_db::common::visibility::Visibility;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::prompts::PromptToken;
@@ -2,9 +2,9 @@ use uuid_utils::uuid::generate_random_uuid;
use sqlx::{Executor, MySql};
use std::marker::PhantomData;
use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums::common::job_status_plus::JobStatusPlus;
use enums::common::visibility::Visibility;
use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::common::visibility::Visibility;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::prompts::PromptToken;
@@ -4,13 +4,13 @@ use sqlx::MySqlPool;
use sqlx::{Executor, MySql};
use std::marker::PhantomData;
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::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums::common::job_status_plus::JobStatusPlus;
use enums::common::visibility::Visibility;
use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::common::visibility::Visibility;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::prompts::PromptToken;
@@ -2,8 +2,8 @@ use anyhow::anyhow;
use sqlx::{Executor, MySql};
use std::marker::PhantomData;
use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
use enums::common::job_status_plus::JobStatusPlus;
use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
use enums_db::common::job_status_plus::JobStatusPlus;
use errors::AnyhowResult;
use tokens::tokens::batch_generations::BatchGenerationToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
@@ -4,12 +4,12 @@ use anyhow::anyhow;
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 enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType;
use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
@@ -157,9 +157,9 @@ fn inference_category_predicate(categories: &BTreeSet<InferenceCategory>) -> Str
mod tests {
use std::collections::BTreeSet;
use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use crate::queries::generic_inference::job::count_untried_jobs_of_type::{inference_category_predicate, job_type_predicate, model_type_predicate};
@@ -5,12 +5,12 @@ use chrono::Utc;
use log::debug;
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 enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType;
use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
@@ -412,9 +412,9 @@ fn inference_category_predicate(categories: &BTreeSet<InferenceCategory>) -> Str
mod tests {
use std::collections::BTreeSet;
use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use crate::queries::generic_inference::job::list_available_generic_inference_jobs::{inference_category_predicate, job_type_predicate, model_type_predicate};
@@ -1,7 +1,7 @@
use anyhow::anyhow;
use sqlx::MySqlPool;
use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use errors::AnyhowResult;
use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
@@ -2,7 +2,7 @@ use anyhow::anyhow;
use sqlx;
use sqlx::MySqlPool;
use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use errors::AnyhowResult;
use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
@@ -3,7 +3,7 @@ use std::time::Duration;
use anyhow::anyhow;
use sqlx::MySqlPool;
use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
use errors::AnyhowResult;
use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
@@ -1,8 +1,8 @@
use anyhow::anyhow;
use sqlx::MySqlPool;
use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums::common::job_status_plus::JobStatusPlus;
use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums_db::common::job_status_plus::JobStatusPlus;
use errors::AnyhowResult;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
@@ -3,12 +3,12 @@ use log::info;
use sqlx::{Executor, MySql};
use std::marker::PhantomData;
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::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums::common::job_status_plus::JobStatusPlus;
use enums::common::visibility::Visibility;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::common::visibility::Visibility;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::prompts::PromptToken;
@@ -2,8 +2,8 @@ use anyhow::anyhow;
use log::warn;
use sqlx::MySqlPool;
use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
use enums::common::visibility::Visibility;
use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
@@ -52,7 +52,7 @@ SELECT
jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,
jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,
jobs.creator_ip_address,
jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
jobs.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,
jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,
jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`
@@ -4,11 +4,11 @@ use sqlx::mysql::MySqlRow;
use sqlx::pool::PoolConnection;
use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row};
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_product_category::InferenceJobProductCategory;
use enums::common::job_status_plus::JobStatusPlus;
use enums::traits::mysql_from_row::MySqlFromRow;
use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::traits::mysql_from_row::MySqlFromRow;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::batch_generations::BatchGenerationToken;
@@ -337,8 +337,8 @@ struct RawGenericInferenceJobStatus {
// cannot have type hints, eg. the following:
//
// m.token as `token: tokens::tokens::media_files::MediaFileToken`,
// m.origin_category as `origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`,
// m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
// m.origin_category as `origin_category: enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`,
// m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,
//
// This results in the automatic mapping not being able to be found by name (for macro derive), and
// in the manual case `row.try_get()` etc. won't have the correct column name (since the name is the
@@ -4,11 +4,11 @@ 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_product_category::InferenceJobProductCategory;
use enums::common::job_status_plus::JobStatusPlus;
use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::batch_generations::BatchGenerationToken;
@@ -44,21 +44,21 @@ pub async fn get_inference_job_status_from_connection(job_token: &InferenceJobTo
SELECT
jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,
jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,
jobs.status as `status: enums_db::common::job_status_plus::JobStatusPlus`,
jobs.attempt_count,
jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,
jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,
jobs.creator_ip_address,
jobs.product_category as `product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,
jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`,
jobs.product_category as `product_category: enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,
jobs.inference_category as `inference_category: enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory`,
jobs.maybe_model_type,
jobs.maybe_model_token,
jobs.maybe_raw_inference_text,
jobs.maybe_inference_args,
jobs.frontend_failure_category as `maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`,
jobs.frontend_failure_category as `maybe_frontend_failure_category: enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`,
jobs.failure_reason,
jobs.on_success_result_entity_type as maybe_result_entity_type,
@@ -309,7 +309,7 @@ struct RawGenericInferenceJobStatus {
#[cfg(test)]
mod tests {
use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use crate::queries::generic_inference::web::get_inference_job_status::{raw_record_to_public_result, RawGenericInferenceJobStatus};
@@ -2,12 +2,12 @@ use anyhow::anyhow;
use sqlx::error::DatabaseError;
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_product_category::InferenceJobProductCategory;
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::visibility::Visibility;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType;
use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums_db::common::visibility::Visibility;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::media_files::MediaFileToken;
@@ -1,10 +1,10 @@
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::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 enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::no_table::style_transfer::style_transfer_name::StyleTransferName;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::batch_generations::BatchGenerationToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
@@ -3,9 +3,9 @@ use std::collections::HashSet;
use anyhow::anyhow;
use sqlx::{MySql, MySqlPool, QueryBuilder};
use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums::common::job_status::JobStatus;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums_db::common::job_status::JobStatus;
use errors::AnyhowResult;
/// Only certain job statuses should be modified.
@@ -107,8 +107,8 @@ mod tests {
use regex::Regex;
use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
use crate::queries::generic_inference::web::kill_generic_inference_jobs::{KillableStatus, KillableTarget, query_builder};
@@ -6,11 +6,11 @@ use sqlx::mysql::MySqlRow;
use sqlx::pool::PoolConnection;
use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row};
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_product_category::InferenceJobProductCategory;
use enums::common::job_status_plus::JobStatusPlus;
use enums::traits::mysql_from_row::MySqlFromRow;
use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::traits::mysql_from_row::MySqlFromRow;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::batch_generations::BatchGenerationToken;
@@ -403,8 +403,8 @@ struct RawGenericInferenceJobStatus {
// cannot have type hints, eg. the following:
//
// m.token as `token: tokens::tokens::media_files::MediaFileToken`,
// m.origin_category as `origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`,
// m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
// m.origin_category as `origin_category: enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`,
// m.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,
//
// This results in the automatic mapping not being able to be found by name (for macro derive), and
// in the manual case `row.try_get()` etc. won't have the correct column name (since the name is the
@@ -2,8 +2,8 @@ use anyhow::anyhow;
use log::warn;
use sqlx::MySqlPool;
use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType;
use enums::common::job_status_plus::JobStatusPlus;
use enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType;
use enums_db::common::job_status_plus::JobStatusPlus;
use errors::AnyhowResult;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::media_files::MediaFileToken;
@@ -29,14 +29,14 @@ pub async fn list_user_jobs_for_moderation(
UserJobForModerationResult,
r#"
SELECT
j.status as `job_status: enums::common::job_status_plus::JobStatusPlus`,
j.status as `job_status: enums_db::common::job_status_plus::JobStatusPlus`,
j.failure_reason as job_failure_reason,
wle.credits_delta,
wle.maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,
j.on_success_result_entity_token as `on_success_result_media_token: tokens::tokens::media_files::MediaFileToken`,
j.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,
wle.token as `wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,
wle.entry_type as `wallet_ledger_entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`
wle.entry_type as `wallet_ledger_entry_type: enums_db::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`
FROM generic_inference_jobs as j
LEFT OUTER JOIN users as u
ON j.maybe_creator_user_token = u.token
@@ -3,7 +3,7 @@ use std::time::Duration;
use anyhow::anyhow;
use sqlx::MySqlPool;
use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
use enums_db::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
use errors::AnyhowResult;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
@@ -3,12 +3,12 @@ use log::info;
use sqlx::{Executor, MySql};
use std::marker::PhantomData;
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::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums::common::job_status_plus::JobStatusPlus;
use enums::common::visibility::Visibility;
use enums_db::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
use enums_db::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory;
use enums_db::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums_db::common::job_status_plus::JobStatusPlus;
use enums_db::common::visibility::Visibility;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::prompts::PromptToken;
@@ -2,8 +2,8 @@ use anyhow::anyhow;
use log::warn;
use sqlx::MySqlPool;
use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
use enums::common::visibility::Visibility;
use enums_db::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
@@ -52,7 +52,7 @@ SELECT
jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,
jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,
jobs.creator_ip_address,
jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
jobs.creator_set_visibility as `creator_set_visibility: enums_db::common::visibility::Visibility`,
jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,
jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`
@@ -2,7 +2,7 @@ use anyhow::anyhow;
use log::warn;
use sqlx::{MySql, Transaction};
use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use errors::AnyhowResult;
use tokens::tokens::users::UserToken;
@@ -2,14 +2,14 @@ use anyhow::anyhow;
use sqlx;
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_engine_category::MediaFileEngineCategory;
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;
use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::batch_generations::BatchGenerationToken;
@@ -1,12 +1,12 @@
use sqlx;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::batch_generations::BatchGenerationToken;
use tokens::tokens::media_files::MediaFileToken;
@@ -1,13 +1,13 @@
use crate::queries::media_files::create::generic_insert::insert_media_file_generic::{insert_media_file_generic, InsertArgs};
use crate::queries::media_files::create::insert_builder::media_file_insert_builder_error::MediaFileInsertBuilderError;
use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
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_engine_category::MediaFileEngineCategory;
use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_db::common::visibility::Visibility;
use sqlx::MySqlPool;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::batch_generations::BatchGenerationToken;
@@ -1,12 +1,12 @@
use sqlx;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use crate::payloads::media_file_extra_info::inner_payloads::face_fusion_video_extra_info::FaceFusionVideoExtraInfo;
@@ -1,11 +1,11 @@
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::model_weights::ModelWeightToken;
@@ -1,12 +1,12 @@
use sqlx;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
@@ -1,13 +1,13 @@
use sqlx;
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;
use enums_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::media_files::MediaFileToken;
@@ -3,10 +3,10 @@ use log::error;
use sqlx;
use sqlx::MySqlPool;
use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
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_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
@@ -2,12 +2,12 @@ use anyhow::anyhow;
use sqlx;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::prompts::PromptToken;
@@ -2,12 +2,12 @@ use anyhow::anyhow;
use sqlx;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
@@ -2,12 +2,12 @@ use anyhow::anyhow;
use sqlx;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
@@ -2,14 +2,14 @@ use anyhow::anyhow;
use sqlx;
use sqlx::MySqlPool;
use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
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_origin_category::MediaFileOriginCategory;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_db::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::batch_generations::BatchGenerationToken;
@@ -2,11 +2,11 @@ use anyhow::anyhow;
use sqlx;
use sqlx::MySqlPool;
use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
@@ -2,11 +2,11 @@ use anyhow::anyhow;
use sqlx;
use sqlx::MySqlPool;
use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
@@ -2,12 +2,12 @@ use anyhow::anyhow;
use sqlx;
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_db::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums_db::by_table::media_files::media_file_class::MediaFileClass;
use enums_db::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_db::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_db::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
Loaded 100 of 305 files, more files were not shown because too many files have changed in this diff. Show more