diff --git a/.sqlx/query-1c74e9c2dcc9205e2c9fe60a6de0828208e497e68560246e588092bafd03eb59.json b/.sqlx/query-1c74e9c2dcc9205e2c9fe60a6de0828208e497e68560246e588092bafd03eb59.json deleted file mode 100644 index 3a1f4df42b..0000000000 --- a/.sqlx/query-1c74e9c2dcc9205e2c9fe60a6de0828208e497e68560246e588092bafd03eb59.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "db_name": "MySQL", - "query": "\n INSERT INTO media_files\n SET\n token = ?,\n\n media_class = ?,\n media_type = ?,\n\n is_user_upload = ?,\n is_intermediate_system_file = ?,\n\n origin_category = ?, \n origin_product_category = ?, \n maybe_origin_model_type = ?, \n maybe_origin_model_token = ?, \n maybe_origin_filename = ?,\n\n maybe_batch_token = ?,\n\n maybe_mime_type = ?,\n file_size_bytes = ?,\n maybe_duration_millis = ?,\n maybe_audio_encoding = ?, \n maybe_video_encoding = ?, \n maybe_frame_width = ?, \n maybe_frame_height = ?,\n maybe_prompt_token = ?,\n checksum_sha2 = ?,\n \n maybe_engine_category = ?,\n\n maybe_title = ?,\n maybe_text_transcript = ?,\n\n maybe_scene_source_media_file_token = ?,\n\n public_bucket_directory_hash = ?, \n maybe_public_bucket_prefix = ?, \n maybe_public_bucket_extension = ?, \n\n maybe_creator_user_token = ?, \n maybe_creator_anonymous_visitor_token = ?, \n\n creator_ip_address = ?, \n creator_set_visibility = ?, \n\n maybe_creator_file_synthetic_id = ?, \n maybe_creator_category_synthetic_id = ?,\n\n extra_file_modification_info = ?,\n\n maybe_generation_provider = ?,\n\n platform_type = ?,\n\n maybe_cover_image_media_file_token = ?,\n\n maybe_mod_user_token = ?,\n is_generated_on_prem = ?,\n generated_by_worker = ?,\n generated_by_cluster = ?\n ", - "describe": { - "columns": [], - "parameters": { - "Right": 41 - }, - "nullable": [] - }, - "hash": "1c74e9c2dcc9205e2c9fe60a6de0828208e497e68560246e588092bafd03eb59" -} diff --git a/.sqlx/query-73540435892b7b4dbc11c6c63712abdb18fd8b3db2bcd56b8518c968b8169de7.json b/.sqlx/query-73540435892b7b4dbc11c6c63712abdb18fd8b3db2bcd56b8518c968b8169de7.json new file mode 100644 index 0000000000..8b573746b7 --- /dev/null +++ b/.sqlx/query-73540435892b7b4dbc11c6c63712abdb18fd8b3db2bcd56b8518c968b8169de7.json @@ -0,0 +1,223 @@ +{ + "db_name": "MySQL", + "query": "\nSELECT\n m.id as `id: u64`,\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n m.maybe_title,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m FORCE INDEX (fk_maybe_creator_user_token)\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nWHERE\n m.maybe_creator_user_token = ?\n AND m.media_class = ?\n AND m.user_deleted_at IS NULL\n AND m.mod_deleted_at IS NULL\n AND NOT m.is_intermediate_system_file\n AND m.id < ?\nORDER BY m.id DESC\nLIMIT ?\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id: u64", + "type_info": { + "type": "LongLong", + "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT", + "char_set": 63, + "max_size": 20 + } + }, + { + "ordinal": 1, + "name": "token: tokens::tokens::media_files::MediaFileToken", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 2, + "name": "media_class: enums::by_table::media_files::media_file_class::MediaFileClass", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 3, + "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 4, + "name": "public_bucket_directory_hash", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 5, + "name": "maybe_public_bucket_prefix", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 6, + "name": "maybe_public_bucket_extension", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 7, + "name": "maybe_creator_user_token: tokens::tokens::users::UserToken", + "type_info": { + "type": "VarString", + "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 8, + "name": "maybe_creator_username", + "type_info": { + "type": "VarString", + "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 80 + } + }, + { + "ordinal": 9, + "name": "maybe_creator_display_name", + "type_info": { + "type": "VarString", + "flags": "BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 80 + } + }, + { + "ordinal": 10, + "name": "maybe_creator_gravatar_hash", + "type_info": { + "type": "String", + "flags": "BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 11, + "name": "maybe_file_cover_image_public_bucket_hash", + "type_info": { + "type": "VarString", + "flags": "BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 12, + "name": "maybe_file_cover_image_public_bucket_prefix", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 13, + "name": "maybe_file_cover_image_public_bucket_extension", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 14, + "name": "creator_set_visibility: enums::common::visibility::Visibility", + "type_info": { + "type": "String", + "flags": "NOT_NULL | BINARY | ENUM", + "char_set": 224, + "max_size": 28 + } + }, + { + "ordinal": 15, + "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken", + "type_info": { + "type": "VarString", + "flags": "MULTIPLE_KEY | BINARY", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 16, + "name": "maybe_title", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 1020 + } + }, + { + "ordinal": 17, + "name": "created_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP", + "char_set": 63, + "max_size": 19 + } + }, + { + "ordinal": 18, + "name": "updated_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW", + "char_set": 63, + "max_size": 19 + } + } + ], + "parameters": { + "Right": 4 + }, + "nullable": [ + false, + false, + false, + false, + false, + true, + true, + true, + true, + true, + true, + true, + true, + true, + false, + true, + true, + false, + false + ] + }, + "hash": "73540435892b7b4dbc11c6c63712abdb18fd8b3db2bcd56b8518c968b8169de7" +} diff --git a/.sqlx/query-a52cc2d6e86607c430173553230b3794a4c1ada07274a975c04128e47d3b7f83.json b/.sqlx/query-a52cc2d6e86607c430173553230b3794a4c1ada07274a975c04128e47d3b7f83.json new file mode 100644 index 0000000000..bbb4e447f8 --- /dev/null +++ b/.sqlx/query-a52cc2d6e86607c430173553230b3794a4c1ada07274a975c04128e47d3b7f83.json @@ -0,0 +1,223 @@ +{ + "db_name": "MySQL", + "query": "\nSELECT\n m.id as `id: u64`,\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n m.maybe_title,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m FORCE INDEX (fk_maybe_creator_user_token)\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nWHERE\n m.maybe_creator_user_token = ?\n AND m.media_class = ?\n AND m.user_deleted_at IS NULL\n AND m.mod_deleted_at IS NULL\n AND NOT m.is_intermediate_system_file\n AND m.id > ?\nORDER BY m.id ASC\nLIMIT ?\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id: u64", + "type_info": { + "type": "LongLong", + "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT", + "char_set": 63, + "max_size": 20 + } + }, + { + "ordinal": 1, + "name": "token: tokens::tokens::media_files::MediaFileToken", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 2, + "name": "media_class: enums::by_table::media_files::media_file_class::MediaFileClass", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 3, + "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 4, + "name": "public_bucket_directory_hash", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 5, + "name": "maybe_public_bucket_prefix", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 6, + "name": "maybe_public_bucket_extension", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 7, + "name": "maybe_creator_user_token: tokens::tokens::users::UserToken", + "type_info": { + "type": "VarString", + "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 8, + "name": "maybe_creator_username", + "type_info": { + "type": "VarString", + "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 80 + } + }, + { + "ordinal": 9, + "name": "maybe_creator_display_name", + "type_info": { + "type": "VarString", + "flags": "BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 80 + } + }, + { + "ordinal": 10, + "name": "maybe_creator_gravatar_hash", + "type_info": { + "type": "String", + "flags": "BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 11, + "name": "maybe_file_cover_image_public_bucket_hash", + "type_info": { + "type": "VarString", + "flags": "BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 12, + "name": "maybe_file_cover_image_public_bucket_prefix", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 13, + "name": "maybe_file_cover_image_public_bucket_extension", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 14, + "name": "creator_set_visibility: enums::common::visibility::Visibility", + "type_info": { + "type": "String", + "flags": "NOT_NULL | BINARY | ENUM", + "char_set": 224, + "max_size": 28 + } + }, + { + "ordinal": 15, + "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken", + "type_info": { + "type": "VarString", + "flags": "MULTIPLE_KEY | BINARY", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 16, + "name": "maybe_title", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 1020 + } + }, + { + "ordinal": 17, + "name": "created_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP", + "char_set": 63, + "max_size": 19 + } + }, + { + "ordinal": 18, + "name": "updated_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW", + "char_set": 63, + "max_size": 19 + } + } + ], + "parameters": { + "Right": 4 + }, + "nullable": [ + false, + false, + false, + false, + false, + true, + true, + true, + true, + true, + true, + true, + true, + true, + false, + true, + true, + false, + false + ] + }, + "hash": "a52cc2d6e86607c430173553230b3794a4c1ada07274a975c04128e47d3b7f83" +} diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/list_session_common.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/list_session_common.rs new file mode 100644 index 0000000000..0f2be464b5 --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/list_session_common.rs @@ -0,0 +1,64 @@ +//! Shared types for the by-class session media file list endpoints +//! (`/v1/media_files/mesh/list`, `/v1/media_files/splat/list`). + +use chrono::{DateTime, Utc}; +use serde_derive::{Deserialize, Serialize}; +use utoipa::{IntoParams, ToSchema}; + +use enums::by_table::media_files::media_file_class::MediaFileClass; +use enums::by_table::media_files::media_file_type::MediaFileType; +use enums::common::visibility::Visibility; +use tokens::tokens::media_files::MediaFileToken; +use tokens::tokens::prompts::PromptToken; + +use crate::common::responses::media_file_cover_image_details::MediaFileCoverImageDetails; +use crate::common::responses::media_links::MediaLinks; +use crate::common::responses::user_details_light::UserDetailsLight; + +/// Query string parameters for the by-class session media file lists. +/// Pagination only — the media class is fixed by the endpoint. +#[derive(Deserialize, IntoParams)] +pub struct ListSessionMediaFilesByTypeQueryParams { + pub sort_ascending: Option, + pub page_size: Option, + pub cursor: Option, + pub cursor_is_reversed: Option, +} + +#[derive(Serialize, Deserialize, ToSchema)] +pub struct SessionMediaFileInfo { + /// Primary key identifier + pub token: MediaFileToken, + + /// The coarse-grained class of media file. + /// Fixed per endpoint (`mesh` or `splat`). + pub media_class: MediaFileClass, + + /// Type of media will dictate which fields are populated and what + /// the frontend should display (eg. video player vs audio player). + /// This is closer in meaning to a "mime type". + pub media_type: MediaFileType, + + /// Rich CDN links to the media, including thumbnails, previews, and more. + pub media_links: MediaLinks, + + /// Information about the cover image. Many media files do not require a cover image, + /// e.g. image files, video files with thumbnails, audio files, etc. + /// 3D files require them. + pub cover_image: MediaFileCoverImageDetails, + + /// User info + pub maybe_creator_user: Option, + + pub creator_set_visibility: Visibility, + + /// The generation's prompt record, when there is one. Clients resolve it + /// to display the original prompt and model. + pub maybe_prompt_token: Option, + + /// The name or title of the media file (optional) + pub maybe_title: Option, + + pub created_at: DateTime, + pub updated_at: DateTime, +} diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/list_session_mesh_media_files.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/list_session_mesh_media_files.rs new file mode 100644 index 0000000000..6b72d66a8e --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/list_session_mesh_media_files.rs @@ -0,0 +1,14 @@ +use serde_derive::{Deserialize, Serialize}; +use utoipa::ToSchema; + +use crate::common::responses::pagination_cursors::PaginationCursors; +use crate::media_file::list::by_type::list_session_common::SessionMediaFileInfo; + +pub const LIST_SESSION_MESH_MEDIA_FILES_URL_PATH: &str = "/v1/media_files/mesh/list"; + +#[derive(Serialize, Deserialize, ToSchema)] +pub struct ListSessionMeshMediaFilesSuccessResponse { + pub success: bool, + pub results: Vec, + pub pagination: PaginationCursors, +} diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/list_session_splat_media_files.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/list_session_splat_media_files.rs new file mode 100644 index 0000000000..5f3fd0935a --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/list_session_splat_media_files.rs @@ -0,0 +1,14 @@ +use serde_derive::{Deserialize, Serialize}; +use utoipa::ToSchema; + +use crate::common::responses::pagination_cursors::PaginationCursors; +use crate::media_file::list::by_type::list_session_common::SessionMediaFileInfo; + +pub const LIST_SESSION_SPLAT_MEDIA_FILES_URL_PATH: &str = "/v1/media_files/splat/list"; + +#[derive(Serialize, Deserialize, ToSchema)] +pub struct ListSessionSplatMediaFilesSuccessResponse { + pub success: bool, + pub results: Vec, + pub pagination: PaginationCursors, +} diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/mod.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/mod.rs new file mode 100644 index 0000000000..458c52acef --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/by_type/mod.rs @@ -0,0 +1,3 @@ +pub mod list_session_common; +pub mod list_session_mesh_media_files; +pub mod list_session_splat_media_files; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/mod.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/mod.rs new file mode 100644 index 0000000000..d7d55e6638 --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/list/mod.rs @@ -0,0 +1 @@ +pub mod by_type; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/mod.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/mod.rs index 227e1a6b8b..b2a2cd3b70 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/mod.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/media_file/mod.rs @@ -1,4 +1,5 @@ pub mod delete_media_file; +pub mod list; pub mod list_batch_generated_media_files; pub mod list_session_project_media_files; -pub mod project; \ No newline at end of file +pub mod project; diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_session_media_files_by_class.rs b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_session_media_files_by_class.rs new file mode 100644 index 0000000000..45ddbec514 --- /dev/null +++ b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_session_media_files_by_class.rs @@ -0,0 +1,249 @@ +use std::marker::PhantomData; + +use chrono::{DateTime, Utc}; +use sqlx::{Executor, MySql}; + +use enums::by_table::media_files::media_file_class::MediaFileClass; +use enums::by_table::media_files::media_file_type::MediaFileType; +use enums::common::visibility::Visibility; +use tokens::tokens::media_files::MediaFileToken; +use tokens::tokens::prompts::PromptToken; +use tokens::tokens::users::UserToken; + +pub struct SessionMediaFileListPage { + pub records: Vec, + + /// ID of the first record (for building the "previous" cursor). + pub first_id: Option, + + /// ID of the last record (for building the "next" cursor). + pub last_id: Option, +} + +pub struct SessionMediaFileListItem { + pub id: u64, + pub token: MediaFileToken, + + pub media_class: MediaFileClass, + pub media_type: MediaFileType, + + pub public_bucket_directory_hash: String, + pub maybe_public_bucket_prefix: Option, + pub maybe_public_bucket_extension: Option, + + pub maybe_creator_user_token: Option, + pub maybe_creator_username: Option, + pub maybe_creator_display_name: Option, + pub maybe_creator_gravatar_hash: Option, + + pub maybe_file_cover_image_public_bucket_hash: Option, + pub maybe_file_cover_image_public_bucket_prefix: Option, + pub maybe_file_cover_image_public_bucket_extension: Option, + + pub creator_set_visibility: Visibility, + + pub maybe_prompt_token: Option, + pub maybe_title: Option, + + pub created_at: DateTime, + pub updated_at: DateTime, +} + +pub struct ListSessionMediaFilesByClassArgs<'a, 'c, E> +where + E: 'a + Executor<'c, Database = MySql>, +{ + pub user_token: &'a UserToken, + + /// The media class to list (e.g. `mesh` or `splat`). + pub media_class: MediaFileClass, + + pub limit: usize, + + /// Keyset cursor: a `media_files.id` from a previous page. + pub maybe_cursor_id: Option, + pub cursor_is_reversed: bool, + pub sort_ascending: bool, + + pub mysql_executor: E, + pub phantom: PhantomData<&'c E>, +} + +/// List the session user's media files of a single class (e.g. `mesh` or +/// `splat`), newest first by default, with keyset pagination on `id`. +pub async fn list_session_media_files_by_class<'a, 'c: 'a, E>( + args: ListSessionMediaFilesByClassArgs<'a, 'c, E>, +) -> Result +where + E: 'a + Executor<'c, Database = MySql>, +{ + // A reversed cursor walks the opposite direction of the sort, so the effective + // scan direction is the XOR of the two flags (same scheme as `list_media_files`). + let ascending = args.sort_ascending != args.cursor_is_reversed; + + let limit = args.limit as u64; + + let records = if ascending { + // NB: IDs start at 1, so a zero sentinel means "no cursor". + let cursor_id = args.maybe_cursor_id.unwrap_or(0); + select_page_ascending( + args.user_token, + args.media_class, + cursor_id, + limit, + args.mysql_executor, + ).await? + } else { + let cursor_id = args.maybe_cursor_id.unwrap_or(u64::MAX); + select_page_descending( + args.user_token, + args.media_class, + cursor_id, + limit, + args.mysql_executor, + ).await? + }; + + let first_id = records.first().map(|record| record.id); + let last_id = records.last().map(|record| record.id); + + Ok(SessionMediaFileListPage { + records, + first_id, + last_id, + }) +} + +// NB: The two queries below are intentionally duplicated so that sqlx can check +// them at compile time (no QueryBuilder). Keep the SELECT lists and predicates +// in sync; they differ only in the cursor comparison direction and sort order. + +async fn select_page_ascending<'a, 'c: 'a, E>( + user_token: &'a UserToken, + media_class: MediaFileClass, + cursor_id: u64, + limit: u64, + mysql_executor: E, +) -> Result, sqlx::Error> +where + E: 'a + Executor<'c, Database = MySql>, +{ + sqlx::query_as!( + SessionMediaFileListItem, + r#" +SELECT + m.id as `id: u64`, + m.token as `token: tokens::tokens::media_files::MediaFileToken`, + + m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`, + m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`, + + m.public_bucket_directory_hash, + m.maybe_public_bucket_prefix, + m.maybe_public_bucket_extension, + + users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`, + users.username as maybe_creator_username, + users.display_name as maybe_creator_display_name, + users.email_gravatar_hash as maybe_creator_gravatar_hash, + + media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash, + media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix, + media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension, + + m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + + m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`, + m.maybe_title, + + m.created_at, + m.updated_at + +FROM media_files AS m FORCE INDEX (fk_maybe_creator_user_token) +LEFT OUTER JOIN users + ON m.maybe_creator_user_token = users.token +LEFT OUTER JOIN media_files as media_file_cover_image + ON media_file_cover_image.token = m.maybe_cover_image_media_file_token +WHERE + m.maybe_creator_user_token = ? + AND m.media_class = ? + AND m.user_deleted_at IS NULL + AND m.mod_deleted_at IS NULL + AND NOT m.is_intermediate_system_file + AND m.id > ? +ORDER BY m.id ASC +LIMIT ? + "#, + user_token, + media_class.to_str(), + cursor_id, + limit, + ) + .fetch_all(mysql_executor) + .await +} + +async fn select_page_descending<'a, 'c: 'a, E>( + user_token: &'a UserToken, + media_class: MediaFileClass, + cursor_id: u64, + limit: u64, + mysql_executor: E, +) -> Result, sqlx::Error> +where + E: 'a + Executor<'c, Database = MySql>, +{ + sqlx::query_as!( + SessionMediaFileListItem, + r#" +SELECT + m.id as `id: u64`, + m.token as `token: tokens::tokens::media_files::MediaFileToken`, + + m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`, + m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`, + + m.public_bucket_directory_hash, + m.maybe_public_bucket_prefix, + m.maybe_public_bucket_extension, + + users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`, + users.username as maybe_creator_username, + users.display_name as maybe_creator_display_name, + users.email_gravatar_hash as maybe_creator_gravatar_hash, + + media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash, + media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix, + media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension, + + m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`, + + m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`, + m.maybe_title, + + m.created_at, + m.updated_at + +FROM media_files AS m FORCE INDEX (fk_maybe_creator_user_token) +LEFT OUTER JOIN users + ON m.maybe_creator_user_token = users.token +LEFT OUTER JOIN media_files as media_file_cover_image + ON media_file_cover_image.token = m.maybe_cover_image_media_file_token +WHERE + m.maybe_creator_user_token = ? + AND m.media_class = ? + AND m.user_deleted_at IS NULL + AND m.mod_deleted_at IS NULL + AND NOT m.is_intermediate_system_file + AND m.id < ? +ORDER BY m.id DESC +LIMIT ? + "#, + user_token, + media_class.to_str(), + cursor_id, + limit, + ) + .fetch_all(mysql_executor) + .await +} diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/list/mod.rs b/crates/schema/database/mysql_queries/src/queries/media_files/list/mod.rs index 6da2eeb27e..fafbdb3682 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/list/mod.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/list/mod.rs @@ -4,5 +4,6 @@ pub mod list_media_files; pub mod list_media_files_by_batch_token; pub mod list_media_files_for_elastic_search_backfill_using_cursor; pub mod list_media_files_for_user; +pub mod list_session_media_files_by_class; pub mod list_session_project_media_files; pub mod media_file_list_row; diff --git a/crates/service/web/storyteller_web/src/docs/api_doc.rs b/crates/service/web/storyteller_web/src/docs/api_doc.rs index b719630be3..220182405b 100644 --- a/crates/service/web/storyteller_web/src/docs/api_doc.rs +++ b/crates/service/web/storyteller_web/src/docs/api_doc.rs @@ -353,6 +353,9 @@ use artcraft_api_defs::analytics::log_active_user::*; use artcraft_api_defs::credits::get_session_credits::*; use artcraft_api_defs::subscriptions::get_session_subscription::*; use artcraft_api_defs::media_file::list_batch_generated_media_files::*; +use artcraft_api_defs::media_file::list::by_type::list_session_common::*; +use artcraft_api_defs::media_file::list::by_type::list_session_mesh_media_files::*; +use artcraft_api_defs::media_file::list::by_type::list_session_splat_media_files::*; use artcraft_api_defs::media_file::list_session_project_media_files::*; use artcraft_api_defs::media_file::project::upload_updated_mood_board_project::*; use artcraft_api_defs::media_file::project::upload_new_mood_board_project::*; @@ -495,6 +498,8 @@ use crate::http_server::endpoints::media_files::list::list_batch_generated_redux crate::http_server::endpoints::media_files::list::list_media_files_for_user_handler::list_media_files_for_user_handler, crate::http_server::endpoints::media_files::list::list_media_files_handler::list_media_files_handler, crate::http_server::endpoints::media_files::list::list_pinned_media_files_handler::list_pinned_media_files_handler, + crate::http_server::endpoints::media_files::list::by_type::list_session_mesh_media_files_handler::list_session_mesh_media_files_handler, + crate::http_server::endpoints::media_files::list::by_type::list_session_splat_media_files_handler::list_session_splat_media_files_handler, crate::http_server::endpoints::media_files::list::list_session_project_media_files_handler::list_session_project_media_files_handler, crate::http_server::endpoints::media_files::search::search_featured_media_files_handler::search_featured_media_files_handler, crate::http_server::endpoints::media_files::search::search_session_media_files_handler::search_session_media_files_handler, @@ -1124,7 +1129,9 @@ use crate::http_server::endpoints::media_files::list::list_batch_generated_redux ListPinnedWeightsSuccessResponse, ListSessionJobsItem, ListSessionJobsQueryParams, + ListSessionMeshMediaFilesSuccessResponse, ListSessionProjectMediaFilesSuccessResponse, + ListSessionSplatMediaFilesSuccessResponse, ListSessionJobsSuccessResponse, ListSessionRequestDetailsResponse, ListSessionResultDetailsResponse, @@ -1168,6 +1175,7 @@ use crate::http_server::endpoints::media_files::list::list_batch_generated_redux PinnedMediaFile, PinnedModelWeightForList, ProjectMediaFileInfo, + SessionMediaFileInfo, PromptInfo, RatingRow, RedeemBetaKeyRequest, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/common/list_session_common.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/common/list_session_common.rs new file mode 100644 index 0000000000..8c2e068400 --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/common/list_session_common.rs @@ -0,0 +1,139 @@ +//! Shared logic for the by-class session media file list endpoints +//! (`/v1/media_files/mesh/list`, `/v1/media_files/splat/list`). + +use std::marker::PhantomData; +use std::sync::Arc; + +use actix_web::HttpRequest; +use log::{error, warn}; + +use artcraft_api_defs::common::responses::pagination_cursors::PaginationCursors; +use artcraft_api_defs::media_file::list::by_type::list_session_common::{ListSessionMediaFilesByTypeQueryParams, SessionMediaFileInfo}; +use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; +use enums::by_table::media_files::media_file_class::MediaFileClass; +use mysql_queries::queries::media_files::list::list_session_media_files_by_class::{list_session_media_files_by_class, ListSessionMediaFilesByClassArgs}; + +use crate::http_server::common_responses::common_web_error::CommonWebError; +use crate::http_server::common_responses::media::media_file_cover_image_details_builder::MediaFileCoverImageDetailsBuilder; +use crate::http_server::common_responses::media::media_links_builder::MediaLinksBuilder; +use crate::http_server::common_responses::user_details_lite_builder::UserDetailsLightBuilder; +use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; +use crate::http_server::user_lookup::user_session::require_user_session::require_user_session; +use crate::state::server_state::ServerState; + +const DEFAULT_PAGE_SIZE: usize = 100; +const MAX_PAGE_SIZE: usize = 1000; + +/// List the session user's media files of a single class (paginated). +/// The shared core of the mesh and splat list handlers. +pub async fn list_session_media_files_of_class( + http_request: &HttpRequest, + query: &ListSessionMediaFilesByTypeQueryParams, + server_state: &Arc, + media_class: MediaFileClass, +) -> Result<(Vec, PaginationCursors), CommonWebError> { + + let mut mysql_connection = server_state.mysql_pool + .acquire() + .await + .map_err(|err| { + error!("MySql pool error: {:?}", err); + CommonWebError::from_error(err) + })?; + + let user_session = require_user_session( + http_request, + &server_state.session_checker, + &mut *mysql_connection, + ).await?; + + let limit = query.page_size + .unwrap_or(DEFAULT_PAGE_SIZE) + .min(MAX_PAGE_SIZE); + + let sort_ascending = query.sort_ascending.unwrap_or(false); + let cursor_is_reversed = query.cursor_is_reversed.unwrap_or(false); + + let maybe_cursor_id = if let Some(cursor) = query.cursor.as_deref() { + Some(server_state.sort_key_crypto.decrypt_id(cursor)?) + } else { + None + }; + + let results_page = list_session_media_files_by_class(ListSessionMediaFilesByClassArgs { + user_token: user_session.get_user_token(), + media_class, + limit, + maybe_cursor_id, + cursor_is_reversed, + sort_ascending, + mysql_executor: &mut *mysql_connection, + phantom: PhantomData, + }) + .await + .map_err(|err| { + warn!("List session {:?} media files query error: {:?}", media_class, err); + CommonWebError::from_error(err) + })?; + + let maybe_next = if let Some(id) = results_page.last_id { + Some(server_state.sort_key_crypto.encrypt_id(id)?) + } else { + None + }; + + let maybe_previous = if let Some(id) = results_page.first_id { + Some(server_state.sort_key_crypto.encrypt_id(id)?) + } else { + None + }; + + let media_domain = get_media_domain(http_request); + + let results = results_page.records.into_iter() + .map(|record| { + let public_bucket_path = MediaFileBucketPath::from_object_hash( + &record.public_bucket_directory_hash, + record.maybe_public_bucket_prefix.as_deref(), + record.maybe_public_bucket_extension.as_deref(), + ); + SessionMediaFileInfo { + media_links: MediaLinksBuilder::from_media_path_and_env( + media_domain, + server_state.server_environment, + &public_bucket_path, + ), + cover_image: MediaFileCoverImageDetailsBuilder::from_optional_db_fields( + &record.token, + media_domain, + server_state.server_environment, + record.maybe_file_cover_image_public_bucket_hash.as_deref(), + record.maybe_file_cover_image_public_bucket_prefix.as_deref(), + record.maybe_file_cover_image_public_bucket_extension.as_deref(), + ), + maybe_creator_user: UserDetailsLightBuilder::from_optional_db_fields_owned( + record.maybe_creator_user_token, + record.maybe_creator_username, + record.maybe_creator_display_name, + record.maybe_creator_gravatar_hash, + ), + token: record.token, + media_class: record.media_class, + media_type: record.media_type, + creator_set_visibility: record.creator_set_visibility, + maybe_prompt_token: record.maybe_prompt_token, + maybe_title: record.maybe_title, + created_at: record.created_at, + updated_at: record.updated_at, + } + }) + .collect::>(); + + let pagination = PaginationCursors { + maybe_next, + maybe_previous, + cursor_is_reversed, + }; + + Ok((results, pagination)) +} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/common/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/common/mod.rs new file mode 100644 index 0000000000..d64a25a7ab --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/common/mod.rs @@ -0,0 +1 @@ +pub mod list_session_common; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/list_session_mesh_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/list_session_mesh_media_files_handler.rs new file mode 100644 index 0000000000..a5c4da6cf3 --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/list_session_mesh_media_files_handler.rs @@ -0,0 +1,44 @@ +use std::sync::Arc; + +use actix_web::web::{Json, Query}; +use actix_web::{web, HttpRequest}; + +use artcraft_api_defs::media_file::list::by_type::list_session_common::ListSessionMediaFilesByTypeQueryParams; +use artcraft_api_defs::media_file::list::by_type::list_session_mesh_media_files::ListSessionMeshMediaFilesSuccessResponse; +use enums::by_table::media_files::media_file_class::MediaFileClass; + +use crate::http_server::common_responses::common_web_error::CommonWebError; +use crate::http_server::endpoints::media_files::list::by_type::common::list_session_common::list_session_media_files_of_class; +use crate::state::server_state::ServerState; + +/// List the session user's mesh files (`media_class = 'mesh'`), paginated. +#[utoipa::path( + get, + tag = "Media Files", + path = "/v1/media_files/mesh/list", + params(ListSessionMediaFilesByTypeQueryParams), + responses( + (status = 200, description = "List the session user's mesh files", body = ListSessionMeshMediaFilesSuccessResponse), + (status = 401, description = "Not authorized"), + (status = 500, description = "Server error"), + ), +)] +pub async fn list_session_mesh_media_files_handler( + http_request: HttpRequest, + query: Query, + server_state: web::Data>, +) -> Result, CommonWebError> { + + let (results, pagination) = list_session_media_files_of_class( + &http_request, + &query, + &server_state, + MediaFileClass::Mesh, + ).await?; + + Ok(Json(ListSessionMeshMediaFilesSuccessResponse { + success: true, + results, + pagination, + })) +} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/list_session_splat_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/list_session_splat_media_files_handler.rs new file mode 100644 index 0000000000..f6b0a01d28 --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/list_session_splat_media_files_handler.rs @@ -0,0 +1,44 @@ +use std::sync::Arc; + +use actix_web::web::{Json, Query}; +use actix_web::{web, HttpRequest}; + +use artcraft_api_defs::media_file::list::by_type::list_session_common::ListSessionMediaFilesByTypeQueryParams; +use artcraft_api_defs::media_file::list::by_type::list_session_splat_media_files::ListSessionSplatMediaFilesSuccessResponse; +use enums::by_table::media_files::media_file_class::MediaFileClass; + +use crate::http_server::common_responses::common_web_error::CommonWebError; +use crate::http_server::endpoints::media_files::list::by_type::common::list_session_common::list_session_media_files_of_class; +use crate::state::server_state::ServerState; + +/// List the session user's gaussian splat files (`media_class = 'splat'`), paginated. +#[utoipa::path( + get, + tag = "Media Files", + path = "/v1/media_files/splat/list", + params(ListSessionMediaFilesByTypeQueryParams), + responses( + (status = 200, description = "List the session user's splat files", body = ListSessionSplatMediaFilesSuccessResponse), + (status = 401, description = "Not authorized"), + (status = 500, description = "Server error"), + ), +)] +pub async fn list_session_splat_media_files_handler( + http_request: HttpRequest, + query: Query, + server_state: web::Data>, +) -> Result, CommonWebError> { + + let (results, pagination) = list_session_media_files_of_class( + &http_request, + &query, + &server_state, + MediaFileClass::Splat, + ).await?; + + Ok(Json(ListSessionSplatMediaFilesSuccessResponse { + success: true, + results, + pagination, + })) +} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/mod.rs new file mode 100644 index 0000000000..7c893260aa --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/by_type/mod.rs @@ -0,0 +1,3 @@ +pub mod common; +pub mod list_session_mesh_media_files_handler; +pub mod list_session_splat_media_files_handler; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/mod.rs index 4dd97b8693..5ecc53251a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/mod.rs @@ -1,3 +1,4 @@ +pub mod by_type; pub mod list_batch_generated_redux_media_files_handler; pub mod list_featured_media_files_handler; pub mod list_media_files_by_batch_token_handler; diff --git a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/media_files_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/media_files_routes.rs index ac1288acd4..9cb97be4f9 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/media_files_routes.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/media_files_routes.rs @@ -18,6 +18,8 @@ use crate::http_server::endpoints::media_files::list::list_media_files_by_batch_ use crate::http_server::endpoints::media_files::list::list_media_files_for_user_handler::list_media_files_for_user_handler; use crate::http_server::endpoints::media_files::list::list_media_files_handler::list_media_files_handler; use crate::http_server::endpoints::media_files::list::list_pinned_media_files_handler::list_pinned_media_files_handler; +use crate::http_server::endpoints::media_files::list::by_type::list_session_mesh_media_files_handler::list_session_mesh_media_files_handler; +use crate::http_server::endpoints::media_files::list::by_type::list_session_splat_media_files_handler::list_session_splat_media_files_handler; use crate::http_server::endpoints::media_files::list::list_session_project_media_files_handler::list_session_project_media_files_handler; use crate::http_server::endpoints::media_files::search::search_featured_media_files_handler::search_featured_media_files_handler; use crate::http_server::endpoints::media_files::search::search_session_media_files_handler::search_session_media_files_handler; @@ -108,10 +110,18 @@ pub fn add_media_file_routes (app: App) -> App .route(web::get().to(list_media_files_for_user_handler)) .route(web::head().to(|| HttpResponse::Ok())) ) + .service(web::resource("/mesh/list") + .route(web::get().to(list_session_mesh_media_files_handler)) + .route(web::head().to(|| HttpResponse::Ok())) + ) .service(web::resource("/project/list") .route(web::get().to(list_session_project_media_files_handler)) .route(web::head().to(|| HttpResponse::Ok())) ) + .service(web::resource("/splat/list") + .route(web::get().to(list_session_splat_media_files_handler)) + .route(web::head().to(|| HttpResponse::Ok())) + ) .service(web::resource("/search_featured") .route(web::get().to(search_featured_media_files_handler)) .route(web::head().to(|| HttpResponse::Ok())) diff --git a/frontend/apps/artcraft-webapp/src/components/generation-gallery/GenerationGalleryGrid.tsx b/frontend/apps/artcraft-webapp/src/components/generation-gallery/GenerationGalleryGrid.tsx index 73647cbb05..419f8f4aef 100644 --- a/frontend/apps/artcraft-webapp/src/components/generation-gallery/GenerationGalleryGrid.tsx +++ b/frontend/apps/artcraft-webapp/src/components/generation-gallery/GenerationGalleryGrid.tsx @@ -11,6 +11,7 @@ import { Tooltip } from "@storyteller/ui-tooltip"; import { GenerationGridView, type GalleryItem, + is3DMediaClass, type RecreateSlotContext, } from "@storyteller/ui-generation-list"; import { useRecreateFromPromptToken } from "../../lib/recreate"; @@ -69,10 +70,10 @@ function CardRecreateButton({ // recreate flow, so map to a valid class for the hook and render nothing. const { isRecreating, handleRecreate } = useRecreateFromPromptToken( promptToken, - mediaClass === "dimensional" ? "image" : mediaClass, + is3DMediaClass(mediaClass) ? "image" : mediaClass, ); - if (mediaClass === "dimensional") return null; + if (is3DMediaClass(mediaClass)) return null; if (kind === "failed") { return ( diff --git a/frontend/apps/artcraft-webapp/src/components/generation-gallery/GenerationGalleryList.tsx b/frontend/apps/artcraft-webapp/src/components/generation-gallery/GenerationGalleryList.tsx index 148b3ff5b5..a633d35231 100644 --- a/frontend/apps/artcraft-webapp/src/components/generation-gallery/GenerationGalleryList.tsx +++ b/frontend/apps/artcraft-webapp/src/components/generation-gallery/GenerationGalleryList.tsx @@ -11,6 +11,7 @@ import { Tooltip } from "@storyteller/ui-tooltip"; import { GenerationListView, type GalleryItem, + is3DMediaClass, type RecreateSlotContext, } from "@storyteller/ui-generation-list"; import { toast } from "../toast/toast"; @@ -85,10 +86,10 @@ function RowRecreateButton({ // recreate flow, so map to a valid class for the hook and render nothing. const { isRecreating, handleRecreate } = useRecreateFromPromptToken( promptToken, - mediaClass === "dimensional" ? "image" : mediaClass, + is3DMediaClass(mediaClass) ? "image" : mediaClass, ); - if (mediaClass === "dimensional") return null; + if (is3DMediaClass(mediaClass)) return null; return (