diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs index 748cb46d98..9c10eb9e61 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs @@ -26,8 +26,12 @@ pub struct MediaFileListItem { pub origin_category: MediaFileOriginCategory, pub origin_product_category: MediaFileOriginProductCategory, + pub maybe_origin_model_type: Option, pub maybe_origin_model_token: Option, + + // NB: The title won't be populated for `tts_models` records or non-`model_weights` records. + pub maybe_origin_model_title: Option, pub media_type: MediaFileType, pub public_bucket_directory_hash: String, @@ -97,6 +101,7 @@ pub async fn list_media_files_for_user(args: ListMediaFileForUserArgs<'_>) -> An origin_product_category: record.origin_product_category, maybe_origin_model_type: record.maybe_origin_model_type, maybe_origin_model_token: record.maybe_origin_model_token, + maybe_origin_model_title: record.maybe_origin_model_title, media_type: record.media_type, public_bucket_directory_hash: record.public_bucket_directory_hash, maybe_public_bucket_prefix: record.maybe_public_bucket_prefix, @@ -125,13 +130,15 @@ fn select_result_fields() -> String { m.id, m.token, + m.media_type, + m.origin_category, m.origin_product_category, m.maybe_origin_model_type, m.maybe_origin_model_token, - - m.media_type, + + w.title as maybe_origin_model_title, m.public_bucket_directory_hash, m.maybe_public_bucket_prefix, @@ -175,6 +182,8 @@ SELECT FROM media_files AS m LEFT OUTER JOIN users AS u ON m.maybe_creator_user_token = u.token +LEFT OUTER JOIN model_weights as w + ON m.maybe_origin_model_token = w.token LEFT OUTER JOIN entity_stats ON entity_stats.entity_type = "media_file" AND entity_stats.entity_token = m.token @@ -227,8 +236,12 @@ struct MediaFileListItemInternal { origin_category: MediaFileOriginCategory, origin_product_category: MediaFileOriginProductCategory, + maybe_origin_model_type: Option, maybe_origin_model_token: Option, + + // NB: The title won't be populated for `tts_models` records or non-`model_weights` records. + maybe_origin_model_title: Option, media_type: MediaFileType, public_bucket_directory_hash: String, @@ -266,6 +279,7 @@ impl FromRow<'_, MySqlRow> for MediaFileListItemInternal { origin_product_category: MediaFileOriginProductCategory::try_from_mysql_row(row, "origin_product_category")?, maybe_origin_model_type: MediaFileOriginModelType::try_from_mysql_row_nullable(row, "maybe_origin_model_type")?, maybe_origin_model_token: row.try_get("maybe_origin_model_token")?, + maybe_origin_model_title: row.try_get("maybe_origin_model_title")?, media_type: MediaFileType::try_from_mysql_row(row, "media_type")?, public_bucket_directory_hash: row.try_get("public_bucket_directory_hash")?, maybe_public_bucket_prefix: row.try_get("maybe_public_bucket_prefix")?, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list_media_files_for_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list_media_files_for_user.rs index 87fcecca7d..845087a2f8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list_media_files_for_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list_media_files_for_user.rs @@ -17,6 +17,7 @@ use enums::common::view_as::ViewAs; use enums::common::visibility::Visibility; use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs}; use tokens::tokens::media_files::MediaFileToken; +use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; use crate::http_server::common_responses::pagination_page::PaginationPage; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; @@ -47,13 +48,23 @@ pub struct ListMediaFilesForUserSuccessResponse { pub struct MediaFileForUserListItem { pub token: MediaFileToken, - pub origin_category: MediaFileOriginCategory, - pub origin_product_category: MediaFileOriginProductCategory, - pub maybe_origin_model_type: Option, - pub maybe_origin_model_token: Option, - pub media_type: MediaFileType, + /// Details where the media file came from. + pub origin: MediaFileOriginDetails, + + #[deprecated(note="Use MediaFileOriginDetails instead")] + pub origin_category: MediaFileOriginCategory, + + #[deprecated(note="Use MediaFileOriginDetails instead")] + pub origin_product_category: MediaFileOriginProductCategory, + + #[deprecated(note="Use MediaFileOriginDetails instead")] + pub maybe_origin_model_type: Option, + + #[deprecated(note="Use MediaFileOriginDetails instead")] + pub maybe_origin_model_token: Option, + /// URL to the media file. pub public_bucket_path: String, @@ -168,11 +179,17 @@ pub async fn list_media_files_for_user_handler( let results = results_page.records.into_iter() .map(|record| MediaFileForUserListItem { token: record.token, + media_type: record.media_type, + origin: MediaFileOriginDetails::from_db_fields_str( + record.origin_category, + record.origin_product_category, + record.maybe_origin_model_type, + record.maybe_origin_model_token.as_deref(), + record.maybe_origin_model_title.as_deref()), origin_category: record.origin_category, origin_product_category: record.origin_product_category, maybe_origin_model_type: record.maybe_origin_model_type, maybe_origin_model_token: record.maybe_origin_model_token, - media_type: record.media_type, public_bucket_path: MediaFileBucketPath::from_object_hash( &record.public_bucket_directory_hash, record.maybe_public_bucket_prefix.as_deref(),