add maybe_title to all media file get/list/batch endpoints

This commit is contained in:
Brandon Thomas committed 2024-03-26 23:03:53 -04:00
1 parent 35477fe650
commit f0bfa7bb18
12 files changed
+61

No files matched your search

@@ -38,6 +38,7 @@ pub struct MediaFile {
pub maybe_batch_token: Option<BatchGenerationToken>,
pub maybe_title: Option<String>,
pub maybe_text_transcript: Option<String>,
pub maybe_origin_filename: Option<String>,
@@ -103,6 +104,7 @@ pub struct MediaFileRaw {
pub maybe_batch_token: Option<BatchGenerationToken>,
pub maybe_title: Option<String>,
pub maybe_text_transcript: Option<String>,
pub maybe_origin_filename: Option<String>,
@@ -193,6 +195,7 @@ pub async fn batch_get_media_files(
media_class: record.media_class,
maybe_media_subtype: record.maybe_media_subtype,
maybe_batch_token: record.maybe_batch_token,
maybe_title: record.maybe_title,
maybe_text_transcript: record.maybe_text_transcript,
maybe_origin_filename: record.maybe_origin_filename,
maybe_creator_user_token: record.maybe_creator_user_token,
@@ -240,6 +243,7 @@ SELECT
m.maybe_batch_token,
m.maybe_title,
m.maybe_text_transcript,
m.maybe_origin_filename,
@@ -310,6 +314,7 @@ impl FromRow<'_, MySqlRow> for MediaFileRaw {
maybe_batch_token: BatchGenerationToken::try_from_mysql_row_nullable(row, "maybe_batch_token")?,
maybe_title: row.try_get("maybe_title")?,
maybe_text_transcript: row.try_get("maybe_text_transcript")?,
maybe_origin_filename: row.try_get("maybe_origin_filename")?,
maybe_creator_user_token: UserToken::try_from_mysql_row_nullable(row, "maybe_creator_user_token")?,
@@ -35,6 +35,7 @@ pub struct MediaFile {
pub maybe_batch_token: Option<BatchGenerationToken>,
pub maybe_title: Option<String>,
pub maybe_text_transcript: Option<String>,
pub maybe_origin_filename: Option<String>,
@@ -100,6 +101,7 @@ pub struct MediaFileRaw {
pub maybe_batch_token: Option<BatchGenerationToken>,
pub maybe_title: Option<String>,
pub maybe_text_transcript: Option<String>,
pub maybe_origin_filename: Option<String>,
@@ -170,6 +172,7 @@ pub async fn get_media_file(
media_class: record.media_class,
maybe_media_subtype: record.maybe_media_subtype,
maybe_batch_token: record.maybe_batch_token,
maybe_title: record.maybe_title,
maybe_text_transcript: record.maybe_text_transcript,
maybe_origin_filename: record.maybe_origin_filename,
maybe_creator_user_token: record.maybe_creator_user_token,
@@ -221,6 +224,7 @@ SELECT
m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,
m.maybe_title,
m.maybe_text_transcript,
m.maybe_origin_filename,
@@ -296,6 +300,7 @@ SELECT
m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,
m.maybe_title,
m.maybe_text_transcript,
m.maybe_origin_filename,
@@ -50,6 +50,7 @@ pub struct MediaFileListItem {
pub maybe_creator_display_name: Option<String>,
pub maybe_creator_gravatar_hash: Option<String>,
pub maybe_title: Option<String>,
pub maybe_text_transcript: Option<String>,
pub creator_set_visibility: Visibility,
@@ -117,6 +118,7 @@ pub async fn list_media_files(args: ListMediaFilesArgs<'_>) -> AnyhowResult<Medi
maybe_creator_username: record.maybe_creator_username,
maybe_creator_display_name: record.maybe_creator_display_name,
maybe_creator_gravatar_hash: record.maybe_creator_gravatar_hash,
maybe_title: record.maybe_title,
maybe_text_transcript: record.maybe_text_transcript,
creator_set_visibility: record.creator_set_visibility,
comment_count: record.comment_count as u64,
@@ -182,6 +184,7 @@ SELECT
m.creator_set_visibility,
m.maybe_title,
m.maybe_text_transcript,
m.created_at,
@@ -321,6 +324,7 @@ struct MediaFileListItemInternal {
maybe_ratings_negative_count: Option<u32>,
maybe_bookmark_count: Option<u32>,
maybe_title: Option<String>,
maybe_text_transcript: Option<String>,
created_at: DateTime<Utc>,
@@ -362,6 +366,7 @@ impl FromRow<'_, MySqlRow> for MediaFileListItemInternal {
maybe_creator_display_name: row.try_get("maybe_creator_display_name")?,
maybe_creator_gravatar_hash: row.try_get("maybe_creator_gravatar_hash")?,
creator_set_visibility: Visibility::try_from_mysql_row(row, "creator_set_visibility")?,
maybe_title: row.try_get("maybe_title")?,
maybe_text_transcript: row.try_get("maybe_text_transcript")?,
created_at: row.try_get("created_at")?,
updated_at: row.try_get("updated_at")?,
@@ -41,6 +41,8 @@ pub struct MediaFileListItem {
pub creator_set_visibility: Visibility,
pub maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
pub maybe_text_transcript: Option<String>,
@@ -108,6 +110,7 @@ pub async fn list_media_files_by_batch_token(args: ListMediaFileByBatchArgs<'_>)
maybe_public_bucket_prefix: record.maybe_public_bucket_prefix,
maybe_public_bucket_extension: record.maybe_public_bucket_extension,
creator_set_visibility: record.creator_set_visibility,
maybe_title: record.maybe_title,
maybe_text_transcript: record.maybe_text_transcript,
maybe_ratings_positive_count: record.maybe_ratings_positive_count,
maybe_ratings_negative_count: record.maybe_ratings_negative_count,
@@ -148,6 +151,7 @@ fn select_result_fields() -> String {
m.creator_set_visibility,
m.maybe_title,
m.maybe_text_transcript,
entity_stats.ratings_positive_count as maybe_ratings_positive_count,
@@ -245,6 +249,8 @@ struct MediaFileListItemInternal {
creator_set_visibility: Visibility,
maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
maybe_text_transcript: Option<String>,
@@ -283,6 +289,7 @@ impl FromRow<'_, MySqlRow> for MediaFileListItemInternal {
maybe_public_bucket_prefix: row.try_get("maybe_public_bucket_prefix")?,
maybe_public_bucket_extension: row.try_get("maybe_public_bucket_extension")?,
creator_set_visibility: Visibility::try_from_mysql_row(row, "creator_set_visibility")?,
maybe_title: row.try_get("maybe_title")?,
maybe_text_transcript: row.try_get("maybe_text_transcript")?,
maybe_ratings_positive_count: row.try_get("maybe_ratings_positive_count")?,
maybe_ratings_negative_count: row.try_get("maybe_ratings_negative_count")?,
@@ -39,6 +39,8 @@ pub struct MediaFilesByTokensRecord {
pub maybe_ratings_negative_count: Option<u32>,
pub maybe_bookmark_count: Option<u32>,
pub maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
pub maybe_text_transcript: Option<String>,
@@ -90,6 +92,7 @@ async fn get_raw_media_files_by_tokens(
m.maybe_public_bucket_prefix,
m.maybe_public_bucket_extension,
m.maybe_title,
m.maybe_text_transcript,
entity_stats.ratings_positive_count as maybe_ratings_positive_count,
@@ -136,6 +139,7 @@ async fn get_raw_media_files_by_tokens(
m.maybe_public_bucket_prefix,
m.maybe_public_bucket_extension,
m.maybe_title,
m.maybe_text_transcript,
entity_stats.ratings_positive_count as maybe_ratings_positive_count,
@@ -211,6 +215,7 @@ fn map_to_media_files(dataset:Vec<RawMediaFileJoinUser>) -> Vec<MediaFilesByToke
maybe_public_bucket_prefix: media_file.maybe_public_bucket_prefix,
maybe_public_bucket_extension: media_file.maybe_public_bucket_extension,
maybe_title: media_file.maybe_title,
maybe_text_transcript: media_file.maybe_text_transcript,
created_at: media_file.created_at,
@@ -248,6 +253,7 @@ fn map_to_media_files(dataset:Vec<RawMediaFileJoinUser>) -> Vec<MediaFilesByToke
pub maybe_ratings_negative_count: Option<u32>,
pub maybe_bookmark_count: Option<u32>,
pub maybe_title: Option<String>,
pub maybe_text_transcript: Option<String>,
pub created_at: DateTime<Utc>,
@@ -287,6 +293,7 @@ impl FromRow<'_, MySqlRow> for RawMediaFileJoinUser {
maybe_ratings_positive_count: row.try_get("maybe_ratings_positive_count")?,
maybe_ratings_negative_count: row.try_get("maybe_ratings_negative_count")?,
maybe_bookmark_count: row.try_get("maybe_bookmark_count")?,
maybe_title: row.try_get("maybe_title")?,
maybe_text_transcript: row.try_get("maybe_text_transcript")?,
created_at: row.try_get("created_at")?,
updated_at: row.try_get("updated_at")?,
@@ -45,6 +45,8 @@ pub struct MediaFileListItem {
pub creator_set_visibility: Visibility,
pub maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
pub maybe_text_transcript: Option<String>,
@@ -122,6 +124,7 @@ pub async fn list_media_files_for_user(args: ListMediaFileForUserArgs<'_>) -> An
maybe_public_bucket_prefix: record.maybe_public_bucket_prefix,
maybe_public_bucket_extension: record.maybe_public_bucket_extension,
creator_set_visibility: record.creator_set_visibility,
maybe_title: record.maybe_title,
maybe_text_transcript: record.maybe_text_transcript,
maybe_ratings_positive_count: record.maybe_ratings_positive_count,
maybe_ratings_negative_count: record.maybe_ratings_negative_count,
@@ -163,6 +166,7 @@ fn select_result_fields() -> String {
m.creator_set_visibility,
m.maybe_title,
m.maybe_text_transcript,
entity_stats.ratings_positive_count as maybe_ratings_positive_count,
@@ -305,6 +309,8 @@ struct MediaFileListItemInternal {
creator_set_visibility: Visibility,
maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
maybe_text_transcript: Option<String>,
@@ -344,6 +350,7 @@ impl FromRow<'_, MySqlRow> for MediaFileListItemInternal {
maybe_public_bucket_prefix: row.try_get("maybe_public_bucket_prefix")?,
maybe_public_bucket_extension: row.try_get("maybe_public_bucket_extension")?,
creator_set_visibility: Visibility::try_from_mysql_row(row, "creator_set_visibility")?,
maybe_title: row.try_get("maybe_title")?,
maybe_text_transcript: row.try_get("maybe_text_transcript")?,
maybe_ratings_positive_count: row.try_get("maybe_ratings_positive_count")?,
maybe_ratings_negative_count: row.try_get("maybe_ratings_negative_count")?,
@@ -93,6 +93,9 @@ pub struct BatchMediaFileInfo {
pub creator_set_visibility: Visibility,
/// The name or title of the media file (optional)
pub maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
pub maybe_text_transcript: Option<String>,
@@ -274,6 +277,7 @@ pub async fn batch_get_media_files_handler(
maybe_engine_extension,
maybe_batch_token: result.maybe_batch_token,
public_bucket_path,
maybe_title: result.maybe_title,
maybe_text_transcript: result.maybe_text_transcript,
maybe_model_weight_info: match result.maybe_model_weights_token {
None => None,
@@ -79,6 +79,9 @@ pub struct MediaFileInfo {
pub creator_set_visibility: Visibility,
/// The name or title of the media file (optional)
pub maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
pub maybe_text_transcript: Option<String>,
@@ -290,6 +293,7 @@ async fn modern_media_file_lookup(
maybe_engine_extension,
maybe_batch_token: result.maybe_batch_token,
public_bucket_path,
maybe_title: result.maybe_title,
maybe_text_transcript: result.maybe_text_transcript,
maybe_model_weight_info: match result.maybe_model_weights_token {
None => None,
@@ -397,6 +401,7 @@ async fn emulate_media_file_with_legacy_tts_result_lookup(
),
maybe_prompt_token: None,
creator_set_visibility: result.creator_set_visibility,
maybe_title: None,
maybe_text_transcript: Some(result.raw_inference_text),
maybe_original_filename: None,
is_emulated_media_file: true,
@@ -55,6 +55,9 @@ pub struct MediaFile {
pub maybe_creator: Option<UserDetailsLight>,
/// The name or title of the media file (optional)
pub maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
pub maybe_text_transcript: Option<String>,
@@ -172,6 +175,7 @@ pub async fn list_featured_media_files_handler(
m.maybe_creator_display_name,
m.maybe_creator_email_gravatar_hash
),
maybe_title: m.maybe_title,
maybe_text_transcript: m.maybe_text_transcript,
stats: SimpleEntityStats {
positive_rating_count: m.maybe_ratings_positive_count.unwrap_or(0),
@@ -74,6 +74,9 @@ pub struct MediaFileListItem {
pub creator_set_visibility: Visibility,
/// The name or title of the media file (optional)
pub maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
pub maybe_text_transcript: Option<String>,
@@ -246,6 +249,7 @@ pub async fn list_media_files_handler(
bookmark_count: record.maybe_bookmark_count.unwrap_or(0),
},
creator_set_visibility: record.creator_set_visibility,
maybe_title: record.maybe_title,
maybe_text_transcript: record.maybe_text_transcript,
created_at: record.created_at,
updated_at: record.updated_at,
@@ -73,6 +73,9 @@ pub struct MediaFilesByBatchListItem {
pub creator_set_visibility: Visibility,
/// The name or title of the media file (optional)
pub maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
pub maybe_text_transcript: Option<String>,
@@ -211,6 +214,7 @@ pub async fn list_media_files_by_batch_token_handler(
.get_full_object_path_str()
.to_string(),
creator_set_visibility: record.creator_set_visibility,
maybe_title: record.maybe_title,
maybe_text_transcript: record.maybe_text_transcript,
stats: SimpleEntityStats {
positive_rating_count: record.maybe_ratings_positive_count.unwrap_or(0),
@@ -83,6 +83,9 @@ pub struct MediaFileForUserListItem {
pub creator_set_visibility: Visibility,
/// The name or title of the media file (optional)
pub maybe_title: Option<String>,
/// Text transcripts for TTS, etc.
pub maybe_text_transcript: Option<String>,
@@ -246,6 +249,7 @@ pub async fn list_media_files_for_user_handler(
.get_full_object_path_str()
.to_string(),
creator_set_visibility: record.creator_set_visibility,
maybe_title: record.maybe_title,
maybe_text_transcript: record.maybe_text_transcript,
stats: SimpleEntityStats {
positive_rating_count: record.maybe_ratings_positive_count.unwrap_or(0),