this is hopeless

This commit is contained in:
Brandon Thomas committed 2026-03-23 11:40:12 -04:00
1 parent 548ceb0118
commit b056fe78de
28 files changed
+70 -44

No files matched your search

@@ -1,8 +1,11 @@
use utoipa::ToSchema;
use enums_api::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums_api::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums_api::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums_api::by_table::media_files::media_file_origin_category::MediaFileOriginCategory as ApiMediaFileOriginCategory;
use enums_api::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType as ApiMediaFileOriginModelType;
use enums_api::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory as ApiMediaFileOriginProductCategory;
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_public::by_table::media_files::public_media_file_model_type::PublicMediaFileModelType;
use tokens::tokens::model_weights::ModelWeightToken;
@@ -10,10 +13,10 @@ use tokens::tokens::model_weights::ModelWeightToken;
#[derive(Clone, Serialize, ToSchema)]
pub struct MediaFileOriginDetails {
/// Where the file came from (broadly)
pub origin_category: MediaFileOriginCategory,
pub origin_category: ApiMediaFileOriginCategory,
/// Where the file came from (specifically, a product area, eg. "face_animator")
pub product_category: MediaFileOriginProductCategory,
pub product_category: ApiMediaFileOriginProductCategory,
/// If the file was produced by a model, the details.
pub maybe_model: Option<MediaFileModelDetails>,
@@ -69,8 +72,8 @@ impl MediaFileOriginDetails {
};
Self {
origin_category,
product_category,
origin_category: enums_convert::by_table::media_files::media_file_origin_category::media_file_origin_category_to_api(&origin_category),
product_category: enums_convert::by_table::media_files::media_file_origin_product_category::media_file_origin_product_category_to_api(&product_category),
maybe_model,
}
}
@@ -83,6 +83,8 @@ pub struct StatusDetailsResponse {
/// An enum the frontend can use to display localized/I18N error
/// messages. These pertain to both transient and permanent failures.
#[schema(value_type = String)]
pub maybe_failure_category: Option<FrontendFailureCategory>,
/// This is an integer number between 0 and 100 (both inclusive) that
@@ -92,6 +92,8 @@ pub struct StatusDetailsResponse {
/// An enum the frontend can use to display localized/I18N error
/// messages. These pertain to both transient and permanent failures.
#[schema(value_type = String)]
pub maybe_failure_category: Option<FrontendFailureCategory>,
/// This is an integer number between 0 and 100 (both inclusive) that
@@ -2,6 +2,7 @@ use utoipa::ToSchema;
use enums_api::common::visibility::Visibility;
use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName;
use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName as ApiStyleTransferName;
use tokens::tokens::media_files::MediaFileToken;
#[derive(Deserialize, ToSchema)]
@@ -10,7 +11,7 @@ pub struct VstRequest {
pub uuid_idempotency_token: String,
/// The name of the style to invoke (required)
pub style: StyleTransferName,
pub style: ApiStyleTransferName,
/// The input video media file (required)
pub input_file: MediaFileToken,
@@ -1,6 +1,8 @@
use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
pub struct SyntheticFailure {
#[schema(value_type = String)]
pub frontend_failure_category: FrontendFailureCategory,
pub frontend_failure_message: Option<String>,
}
@@ -1,6 +1,8 @@
use enums_db::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
pub struct SyntheticFailure {
#[schema(value_type = String)]
pub frontend_failure_category: FrontendFailureCategory,
pub frontend_failure_message: Option<String>,
}
@@ -123,6 +123,8 @@ pub struct BatchStatusDetailsResponse {
/// An enum the frontend can use to display localized/I18N error
/// messages. These pertain to both transient and permanent failures.
#[schema(value_type = String)]
pub maybe_failure_category: Option<FrontendFailureCategory>,
/// This is an integer number between 0 and 100 (both inclusive) that
@@ -114,6 +114,8 @@ pub struct StatusDetailsResponse {
/// An enum the frontend can use to display localized/I18N error
/// messages. These pertain to both transient and permanent failures.
#[schema(value_type = String)]
pub maybe_failure_category: Option<FrontendFailureCategory>,
/// This is an integer number between 0 and 100 (both inclusive) that
@@ -220,16 +220,15 @@ fn records_to_response(
let mut success_count = 0;
records.retain(|record| {
if record.status.status != JobStatusPlus::CompleteSuccess {
if record.status.status != ApiJobStatusPlus::CompleteSuccess {
return true;
}
match record.request.inference_category {
// Show all audio results
InferenceCategory::TextToSpeech
| InferenceCategory::VoiceConversion
| InferenceCategory::SeedVc
| InferenceCategory::F5TTS => return true,
ApiInferenceCategory::TextToSpeech
| ApiInferenceCategory::VoiceConversion
| ApiInferenceCategory::SeedVc
| ApiInferenceCategory::F5TTS => return true,
// Fall through for everything else
_ => {},
}
@@ -144,7 +144,7 @@ pub async fn change_media_file_animation_type_handler(
let query_result = update_media_file_animation_type(
&media_file_token,
request.maybe_animation_type,
enums_convert::by_table::media_files::media_file_animation_type::media_file_animation_type_to_api(&request.maybe_animation_type),
&server_state.mysql_pool
).await;
@@ -123,7 +123,7 @@ pub async fn change_media_file_engine_category_handler(
}
}
if !is_valid_transition(request.engine_category) {
if !is_valid_transition(enums_convert::by_table::media_files::media_file_engine_category::media_file_engine_category_to_api(&request.engine_category)) {
return Err(ChangeMediaFileEngineCategoryError::BadInput(
format!("Invalid engine category: {:?}", request.engine_category)));
}
@@ -138,7 +138,7 @@ pub async fn change_media_file_engine_category_handler(
let query_result = update_media_file_engine_category(
&media_file_token,
request.engine_category,
enums_convert::by_table::media_files::media_file_engine_category::media_file_engine_category_to_api(&request.engine_category),
&server_state.mysql_pool
).await;
@@ -515,8 +515,9 @@ async fn emulate_media_file_with_legacy_tts_result_lookup(
success: true,
media_file: MediaFileInfo {
token,
media_class: MediaFileClass::Audio, // NB: Always audio
media_type: MediaFileType::Audio, // NB: Always audio
media_class: enums_convert::by_table::media_files::media_file_class::media_file_class_to_api(&MediaFileClass::Audio), // NB: Always audio
media_type: enums_convert::by_table::media_files::media_file_type::media_file_type_to_api(&MediaFileType::Audio), // NB: Always audio
maybe_engine_category: None,
maybe_animation_type: None,
maybe_media_subtype: None,
@@ -535,7 +536,8 @@ async fn emulate_media_file_with_legacy_tts_result_lookup(
// NB: These should be reasonable synthetic defaults for emulated TT2 results, even the "ModelWeightToken".
weight_token: ModelWeightToken::new_from_str(&result.tts_model_token),
weight_type: PublicWeightsType::Tacotron2,
weight_category: WeightsCategory::TextToSpeech,
weight_category: enums_convert::by_table::model_weights::weights_category::weights_category_to_api(&WeightsCategory::TextToSpeech),
title: result.tts_model_title.unwrap_or_else(|| "tacotron2 model".to_string()),
maybe_cover_image_public_bucket_path: None,
maybe_weight_creator: None, // NB: Not worth the trouble of synthesizing this
@@ -296,7 +296,7 @@ pub async fn list_media_files_by_batch_token_handler(
origin_product_category: enums_convert::by_table::media_files::media_file_origin_product_category::media_file_origin_product_category_to_api(&record.origin_product_category),
maybe_origin_model_type: record.maybe_origin_model_type
maybe_origin_model_type: enums_convert::by_table::media_files::media_file_origin_model_type::media_file_origin_model_type_to_api(&record.maybe_origin_model_type)
.map(|t| PublicMediaFileModelType::from_enum(t)),
maybe_origin_model_token: record.maybe_origin_model_token,
media_links: MediaLinksBuilder::from_media_path_and_env(
@@ -356,7 +356,7 @@ pub async fn list_media_files_for_user_handler(
origin_product_category: enums_convert::by_table::media_files::media_file_origin_product_category::media_file_origin_product_category_to_api(&record.origin_product_category),
maybe_origin_model_type: record.maybe_origin_model_type
maybe_origin_model_type: enums_convert::by_table::media_files::media_file_origin_model_type::media_file_origin_model_type_to_api(&record.maybe_origin_model_type)
.map(|t| PublicMediaFileModelType::from_enum(t)),
maybe_origin_model_token: record.maybe_origin_model_token,
media_links: MediaLinksBuilder::from_media_path_and_env(
@@ -357,7 +357,7 @@ pub async fn list_media_files_handler(
origin_product_category: enums_convert::by_table::media_files::media_file_origin_product_category::media_file_origin_product_category_to_api(&record.origin_product_category),
maybe_origin_model_type: record.maybe_origin_model_type
maybe_origin_model_type: enums_convert::by_table::media_files::media_file_origin_model_type::media_file_origin_model_type_to_api(&record.maybe_origin_model_type)
.map(|m| PublicMediaFileModelType::from_enum(m)),
maybe_origin_model_token: record.maybe_origin_model_token,
media_links: MediaLinksBuilder::from_media_path_and_env(
@@ -17,6 +17,7 @@ use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngin
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_api::by_table::media_files::media_file_type::MediaFileType as ApiMediaFileType;
use enums_db::common::visibility::Visibility;
use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName as ApiStyleTransferName;
use log::warn;
use tokens::tokens::media_files::MediaFileToken;
use utoipa::{IntoParams, ToSchema};
@@ -138,7 +139,7 @@ pub struct SearchFeaturedMediaFileListItem {
// /// For Comfy / Video Style Transfer jobs, this might include
// /// the name of the selected style.
// pub maybe_style_name: Option<StyleTransferName>,
// pub maybe_style_name: Option<ApiStyleTransferName>,
// /// Duration for audio and video files, if available.
// /// Measured in milliseconds.
@@ -17,6 +17,7 @@ use enums_api::by_table::media_files::media_file_engine_category::MediaFileEngin
use enums_db::by_table::media_files::media_file_type::MediaFileType;
use enums_api::by_table::media_files::media_file_type::MediaFileType as ApiMediaFileType;
use enums_db::common::visibility::Visibility;
use enums_api::no_table::style_transfer::style_transfer_name::StyleTransferName as ApiStyleTransferName;
use log::warn;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
@@ -139,7 +140,7 @@ pub struct SearchMediaFileListItem {
// /// For Comfy / Video Style Transfer jobs, this might include
// /// the name of the selected style.
// pub maybe_style_name: Option<StyleTransferName>,
// pub maybe_style_name: Option<ApiStyleTransferName>,
// /// Duration for audio and video files, if available.
// /// Measured in milliseconds.
@@ -69,7 +69,7 @@ pub async fn moderator_create_wallet_for_user_handler(
let maybe_wallet_token = find_primary_wallet_token_for_owner_using_connection(
user_token,
namespace,
enums_convert::common::payments_namespace::payments_namespace_to_api(&namespace),
&mut mysql_connection,
).await.map_err(|err| {
error!("Error finding wallet for user {:?}: {:?}", user_token, err);
@@ -94,7 +94,7 @@ pub async fn moderator_create_wallet_for_user_handler(
let wallet_token = create_new_wallet_for_owner_user(
user_token,
namespace,
enums_convert::common::payments_namespace::payments_namespace_to_api(&namespace),
&mut transaction,
).await.map_err(|err| {
error!("Error creating wallet for user {:?}: {:?}", user_token, err);
@@ -342,14 +342,15 @@ pub async fn get_prompt_handler(
prompt: PromptInfo {
token: result.token,
maybe_strength,
maybe_model_type: result.maybe_model_type,
maybe_model_type: enums_convert::common::model_type::model_type_to_api(&result.maybe_model_type),
maybe_generation_provider: enums_convert::common::generation::generation_provider::generation_provider_to_api(&result.maybe_generation_provider),
maybe_positive_prompt: result.maybe_positive_prompt,
maybe_negative_prompt: result.maybe_negative_prompt,
maybe_context_images,
maybe_travel_prompt,
maybe_style_name,
enums_convert::no_table::style_transfer::style_transfer_name::style_transfer_name_to_api(&maybe_style_name),
maybe_inference_duration_millis,
used_face_detailer,
used_upscaler,
@@ -8,6 +8,7 @@ use log::error;
use utoipa::{IntoParams, ToSchema};
use enums_api::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
use enums_api::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType as ApiUserBookmarkEntityType;
use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
use mysql_queries::queries::users::user_bookmarks::batch_get_user_bookmarks::{batch_get_user_bookmarks, BatchUserBookmark};
use tokens::tokens::media_files::MediaFileToken;
@@ -49,7 +50,7 @@ pub struct BookmarkRow {
/// The passed token
pub entity_token: String,
/// The type of entity
pub entity_type: UserBookmarkEntityType,
pub entity_type: ApiUserBookmarkEntityType,
/// Whether the entity is bookmarked or not
pub is_bookmarked: bool,
/// If the object is bookmarked, this is the bookmark token (used to delete the bookmark).
@@ -95,7 +95,7 @@ pub async fn list_user_bookmarks_for_entity_handler(
) -> Result<HttpResponse, ListUserBookmarksForEntityError>
{
let entity_token = UserBookmarkEntityToken::from_entity_type_and_token(
path.entity_type, &path.entity_token);
enums_convert::by_table::user_bookmarks::user_bookmark_entity_type::user_bookmark_entity_type_to_api(&path.entity_type), &path.entity_token);
let query_results = list_user_bookmarks_for_entity(
entity_token,
@@ -9,6 +9,7 @@ use chrono::{DateTime, Utc};
use log::warn;
use enums_db::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
use enums_api::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType as ApiUserBookmarkEntityType;
use tokens::tokens::user_bookmarks::UserBookmarkToken;
use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
@@ -38,7 +39,7 @@ pub struct UserBookmark {
#[derive(Serialize)]
pub struct UserBookmarkDetails {
// TODO: This needs titles or some other summary metadata.
pub entity_type: UserBookmarkEntityType,
pub entity_type: ApiUserBookmarkEntityType,
pub entity_token: String,
// TODO: Populate this for TTS
@@ -105,7 +105,9 @@ pub async fn set_user_rating_handler(
// querying the database for entity existence, this is the next best way to prevent incorrect comment
// attachment. This is a bit of a bad process, though, since the token types are supposed to be opaque.
let token = request.entity_token.as_str();
let token_prefix_matches = match request.entity_type {
let entity_type = enums_convert::by_table::user_ratings::entity_type::user_rating_entity_type_to_db(&request.entity_type);
let rating_value = enums_convert::by_table::user_ratings::rating_value::rating_value_to_db(&request.rating_value);
let token_prefix_matches = match entity_type {
// NB: Users had an older prefix (U:) that got replaced with the new prefix (user_)
UserRatingEntityType::MediaFile => token.starts_with(MediaFileToken::token_prefix()),
UserRatingEntityType::ModelWeight => token.starts_with(ModelWeightToken::token_prefix()),
@@ -118,7 +120,7 @@ pub async fn set_user_rating_handler(
};
if !token_prefix_matches {
warn!("invalid token prefix: {:?} for {:?}", request.entity_token, request.entity_type);
warn!("invalid token prefix: {:?} for {:?}", request.entity_token, entity_type);
return Err(SetUserRatingError::BadInput("invalid token prefix".to_string()));
}
@@ -148,7 +150,7 @@ pub async fn set_user_rating_handler(
let ip_address = get_request_ip(&http_request);
let entity= match request.entity_type {
let entity= match entity_type {
UserRatingEntityType::MediaFile => UserRatingEntity::MediaFile(MediaFileToken::new_from_str(&request.entity_token)),
UserRatingEntityType::ModelWeight => UserRatingEntity::ModelWeight(ModelWeightToken::new_from_str(&request.entity_token)),
@@ -182,7 +184,7 @@ pub async fn set_user_rating_handler(
let _r = upsert_user_rating(Args {
user_token: &user_session.user_token,
user_rating_entity: &entity,
user_rating_value: enums_convert::by_table::user_ratings::rating_value::rating_value_to_api(&request.rating_value),
user_rating_value: rating_value,
ip_address: &ip_address,
mysql_executor: &mut *transaction,
@@ -199,7 +201,7 @@ pub async fn set_user_rating_handler(
.unwrap_or(UserRatingValue::Neutral);
let mut maybe_rating_action =
match (existing_rating_value, request.rating_value) {
match (existing_rating_value, rating_value) {
(UserRatingValue::Neutral, UserRatingValue::Neutral) => None,
(UserRatingValue::Neutral, UserRatingValue::Positive) => Some(RatingsAction::NeutralToPositive),
(UserRatingValue::Neutral, UserRatingValue::Negative) => Some(RatingsAction::NeutralToNegative),
@@ -215,7 +217,8 @@ pub async fn set_user_rating_handler(
// NB: Not all rateable things have stats (eg. deprecated record types don't have stats).
let maybe_stats_entity_token =
StatsEntityToken::from_rating_entity_type_and_token(request.entity_type, &request.entity_token);
StatsEntityToken::from_rating_entity_type_and_token(entity_type, &request.entity_token);
if let Some(stats_entity_token) = maybe_stats_entity_token {
@@ -240,7 +243,7 @@ pub async fn set_user_rating_handler(
})?;
// NB: Legacy
match request.entity_type {
match entity_type {
UserRatingEntityType::TtsModel => {
let token = TtsModelToken::new_from_str(&request.entity_token);
update_tts_model_ratings(&token, &mut mysql_connection)
@@ -61,6 +61,7 @@ pub async fn get_or_create_session_artcraft_wallet_handler(
PaymentsNamespace::Artcraft,
&mut mysql_connection,
).await.map_err(|err| {
error!("Error finding primary artcraft wallet for user {:?}: {:?}", user_token, err);
@@ -219,7 +219,7 @@ pub async fn create_account_handler(
email_gravatar_hash: &email_gravatar_hash,
password_hash: &password_hash,
ip_address: &ip_address,
maybe_source,
enums_convert::by_table::users::user_signup_source::user_signup_source_to_api(&maybe_source),
maybe_referral_url,
maybe_user_token: None, // NB: This parameter is for internal testing only
}
@@ -63,7 +63,7 @@ pub async fn handle_new_sso_account_for_new_user(
email_confirmed_by_google: args.claims.email_verified(),
maybe_feature_flags: user_feature_flags.as_deref(),
ip_address: &ip_address,
maybe_source,
enums_convert::by_table::users::user_feature_flag::user_feature_flag_to_api(&maybe_source),
},
Transactor::for_transaction(&mut transaction),
).await;
@@ -181,7 +181,7 @@ pub async fn list_available_weights_handler(
.sort_ascending(sort_ascending)
.cursor_is_reversed(cursor_is_reversed)
.weights_category(query.weight_category)
.weights_type(query.weight_type.map(|wt| wt.to_enum()))
.weights_type(enums_convert::by_table::model_weights::weights_types::weights_type_to_api(&query.weight_type.map(|wt| wt.to_enum())))
.scope_creator_username(None)
.include_user_hidden(include_user_hidden)
.include_user_deleted_results(false) // NB: Mods don't want to see deleted models. We'll improve this later.
@@ -184,8 +184,8 @@ pub async fn search_model_weights_impl(
search_term: &request.search_term,
maybe_creator_user_token: None,
maybe_ietf_primary_language_subtag: request.ietf_language_subtag.as_deref(),
maybe_weights_categories,
maybe_weights_types,
enums_convert::by_table::model_weights::weights_category::weights_category_to_api(&maybe_weights_categories),
enums_convert::by_table::model_weights::weights_types::weights_type_to_api(&maybe_weights_types),
sort_field,
sort_direction,
minimum_score: request.minimum_score,