From edf204711bef2fadc7177f3ed4c8ef275e5eca60 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 27 Aug 2024 19:25:26 -0400 Subject: [PATCH] set is_user_upload flag in more places --- ...bf7308a71c258f1bf4abb8f5ca3ae320db34c137955.json} | 4 ++-- ...c6e8b247812944c61941964bb53815d31dc30d506be8.json | 12 ++++++++++++ ...894e2f40311e5613919f49f3ac91f81f5fc2bef1bea8.json | 12 ++++++++++++ ...7e1b88d5ca5da7b2fe152466ff3ae526855ba5791e60.json | 12 ------------ ...b7e7f7ec72b1acf83a1a90476506f70d32c567230990.json | 12 ------------ .../generic_insert/insert_media_file_generic.rs | 4 +++- .../insert_media_file_generic_from_job.rs | 1 + .../insert_media_file_from_studio_scene_render.rs | 4 ++++ .../upsert/upsert_media_file_from_file_upload.rs | 2 +- .../upload_studio_shot_media_file_handler.rs | 1 - 10 files changed, 35 insertions(+), 29 deletions(-) rename .sqlx/{query-87f078eae38376e8d3bab9001908a5ac3a406ed79d8434ea452c194b56df80fe.json => query-28cac5883464613d29bedbf7308a71c258f1bf4abb8f5ca3ae320db34c137955.json} (82%) create mode 100644 .sqlx/query-55706e6ac35be221b9d9c6e8b247812944c61941964bb53815d31dc30d506be8.json create mode 100644 .sqlx/query-c58f414b5e4d0f0420d1894e2f40311e5613919f49f3ac91f81f5fc2bef1bea8.json delete mode 100644 .sqlx/query-e670551074f3beeccb217e1b88d5ca5da7b2fe152466ff3ae526855ba5791e60.json delete mode 100644 .sqlx/query-f99e6348241a526718acb7e7f7ec72b1acf83a1a90476506f70d32c567230990.json diff --git a/.sqlx/query-87f078eae38376e8d3bab9001908a5ac3a406ed79d8434ea452c194b56df80fe.json b/.sqlx/query-28cac5883464613d29bedbf7308a71c258f1bf4abb8f5ca3ae320db34c137955.json similarity index 82% rename from .sqlx/query-87f078eae38376e8d3bab9001908a5ac3a406ed79d8434ea452c194b56df80fe.json rename to .sqlx/query-28cac5883464613d29bedbf7308a71c258f1bf4abb8f5ca3ae320db34c137955.json index fce52b07d3..a9d5fcc99f 100644 --- a/.sqlx/query-87f078eae38376e8d3bab9001908a5ac3a406ed79d8434ea452c194b56df80fe.json +++ b/.sqlx/query-28cac5883464613d29bedbf7308a71c258f1bf4abb8f5ca3ae320db34c137955.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nINSERT INTO media_files\nSET\n token = ?,\n\n media_class = ?,\n media_type = ?,\n\n origin_category = ?,\n origin_product_category = ?,\n\n maybe_engine_category = ?,\n maybe_animation_type = ?,\n\n maybe_mime_type = ?,\n file_size_bytes = ?,\n\n checksum_sha2 = ?,\n\n maybe_title = ?,\n maybe_duration_millis = ?,\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 creator_ip_address = ?,\n\n creator_set_visibility = ?,\n\n maybe_scene_source_media_file_token = ?,\n is_intermediate_system_file = ?,\n\n maybe_creator_file_synthetic_id = ?,\n maybe_creator_category_synthetic_id = ?,\n\n maybe_origin_model_type = NULL,\n maybe_origin_model_token = NULL\n ", + "query": "\nINSERT INTO media_files\nSET\n token = ?,\n\n media_class = ?,\n media_type = ?,\n\n origin_category = ?,\n origin_product_category = ?,\n\n maybe_engine_category = ?,\n maybe_animation_type = ?,\n\n maybe_mime_type = ?,\n file_size_bytes = ?,\n\n checksum_sha2 = ?,\n\n maybe_title = ?,\n maybe_duration_millis = ?,\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 creator_ip_address = ?,\n\n creator_set_visibility = ?,\n\n maybe_scene_source_media_file_token = ?,\n is_intermediate_system_file = ?,\n\n maybe_creator_file_synthetic_id = ?,\n maybe_creator_category_synthetic_id = ?,\n\n is_user_upload = TRUE,\n\n maybe_origin_model_type = NULL,\n maybe_origin_model_token = NULL\n ", "describe": { "columns": [], "parameters": { @@ -8,5 +8,5 @@ }, "nullable": [] }, - "hash": "87f078eae38376e8d3bab9001908a5ac3a406ed79d8434ea452c194b56df80fe" + "hash": "28cac5883464613d29bedbf7308a71c258f1bf4abb8f5ca3ae320db34c137955" } diff --git a/.sqlx/query-55706e6ac35be221b9d9c6e8b247812944c61941964bb53815d31dc30d506be8.json b/.sqlx/query-55706e6ac35be221b9d9c6e8b247812944c61941964bb53815d31dc30d506be8.json new file mode 100644 index 0000000000..60445c9036 --- /dev/null +++ b/.sqlx/query-55706e6ac35be221b9d9c6e8b247812944c61941964bb53815d31dc30d506be8.json @@ -0,0 +1,12 @@ +{ + "db_name": "MySQL", + "query": "\nINSERT INTO media_files\nSET\n token = ?,\n\n media_class = ?,\n media_type = ?,\n\n origin_category = ?,\n origin_product_category = ?,\n\n maybe_engine_category = ?,\n maybe_animation_type = ?,\n\n maybe_media_subtype = ?,\n maybe_mime_type = ?,\n file_size_bytes = ?,\n\n checksum_sha2 = ?,\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 creator_ip_address = ?,\n\n creator_set_visibility = ?,\n\n maybe_creator_file_synthetic_id = ?,\n maybe_creator_category_synthetic_id = ?,\n\n is_user_upload = TRUE,\n\n maybe_origin_model_type = NULL,\n maybe_origin_model_token = NULL\n\nON DUPLICATE KEY UPDATE\n\n media_class = ?,\n media_type = ?,\n\n origin_category = ?,\n origin_product_category = ?,\n\n maybe_engine_category = ?,\n maybe_animation_type = ?,\n\n maybe_media_subtype = ?,\n maybe_mime_type = ?,\n file_size_bytes = ?,\n\n checksum_sha2 = ?,\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 creator_ip_address = ?,\n\n creator_set_visibility = ?,\n\n maybe_creator_file_synthetic_id = ?,\n maybe_creator_category_synthetic_id = ?,\n\n is_user_upload = TRUE,\n\n maybe_origin_model_type = NULL,\n maybe_origin_model_token = NULL\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 39 + }, + "nullable": [] + }, + "hash": "55706e6ac35be221b9d9c6e8b247812944c61941964bb53815d31dc30d506be8" +} diff --git a/.sqlx/query-c58f414b5e4d0f0420d1894e2f40311e5613919f49f3ac91f81f5fc2bef1bea8.json b/.sqlx/query-c58f414b5e4d0f0420d1894e2f40311e5613919f49f3ac91f81f5fc2bef1bea8.json new file mode 100644 index 0000000000..7d61829eb8 --- /dev/null +++ b/.sqlx/query-c58f414b5e4d0f0420d1894e2f40311e5613919f49f3ac91f81f5fc2bef1bea8.json @@ -0,0 +1,12 @@ +{ + "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 is_batch_generated = ?,\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_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_mod_user_token = ?, \n is_generated_on_prem = ?, \n generated_by_worker = ?, \n generated_by_cluster = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 38 + }, + "nullable": [] + }, + "hash": "c58f414b5e4d0f0420d1894e2f40311e5613919f49f3ac91f81f5fc2bef1bea8" +} diff --git a/.sqlx/query-e670551074f3beeccb217e1b88d5ca5da7b2fe152466ff3ae526855ba5791e60.json b/.sqlx/query-e670551074f3beeccb217e1b88d5ca5da7b2fe152466ff3ae526855ba5791e60.json deleted file mode 100644 index 9d613f9900..0000000000 --- a/.sqlx/query-e670551074f3beeccb217e1b88d5ca5da7b2fe152466ff3ae526855ba5791e60.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "db_name": "MySQL", - "query": "\nINSERT INTO media_files\nSET\n token = ?,\n\n media_class = ?,\n media_type = ?,\n\n origin_category = ?,\n origin_product_category = ?,\n\n maybe_engine_category = ?,\n maybe_animation_type = ?,\n\n maybe_media_subtype = ?,\n maybe_mime_type = ?,\n file_size_bytes = ?,\n\n checksum_sha2 = ?,\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 creator_ip_address = ?,\n\n creator_set_visibility = ?,\n\n maybe_creator_file_synthetic_id = ?,\n maybe_creator_category_synthetic_id = ?,\n\n maybe_origin_model_type = NULL,\n maybe_origin_model_token = NULL\n\nON DUPLICATE KEY UPDATE\n\n media_class = ?,\n media_type = ?,\n\n origin_category = ?,\n origin_product_category = ?,\n\n maybe_engine_category = ?,\n maybe_animation_type = ?,\n\n maybe_media_subtype = ?,\n maybe_mime_type = ?,\n file_size_bytes = ?,\n\n checksum_sha2 = ?,\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 creator_ip_address = ?,\n\n creator_set_visibility = ?,\n\n maybe_creator_file_synthetic_id = ?,\n maybe_creator_category_synthetic_id = ?,\n\n maybe_origin_model_type = NULL,\n maybe_origin_model_token = NULL\n ", - "describe": { - "columns": [], - "parameters": { - "Right": 39 - }, - "nullable": [] - }, - "hash": "e670551074f3beeccb217e1b88d5ca5da7b2fe152466ff3ae526855ba5791e60" -} diff --git a/.sqlx/query-f99e6348241a526718acb7e7f7ec72b1acf83a1a90476506f70d32c567230990.json b/.sqlx/query-f99e6348241a526718acb7e7f7ec72b1acf83a1a90476506f70d32c567230990.json deleted file mode 100644 index 3c706cc6de..0000000000 --- a/.sqlx/query-f99e6348241a526718acb7e7f7ec72b1acf83a1a90476506f70d32c567230990.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_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 is_batch_generated = ?,\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_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_mod_user_token = ?, \n is_generated_on_prem = ?, \n generated_by_worker = ?, \n generated_by_cluster = ?\n ", - "describe": { - "columns": [], - "parameters": { - "Right": 37 - }, - "nullable": [] - }, - "hash": "f99e6348241a526718acb7e7f7ec72b1acf83a1a90476506f70d32c567230990" -} diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic.rs b/crates/lib/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic.rs index dabe3d0d82..deedbad43f 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic.rs @@ -32,8 +32,8 @@ pub struct InsertArgs<'a> { // Important database indices pub media_class: MediaFileClass, pub media_type: MediaFileType, + pub is_user_upload: bool, pub is_intermediate_system_file: bool, - // TODO: is_user_upload // Product and other origination information pub origin_category: MediaFileOriginCategory, @@ -131,6 +131,7 @@ pub async fn insert_media_file_generic( media_class = ?, media_type = ?, + is_user_upload = ?, is_intermediate_system_file = ?, origin_category = ?, @@ -182,6 +183,7 @@ pub async fn insert_media_file_generic( args.media_class.to_str(), args.media_type.to_str(), + args.is_user_upload, args.is_intermediate_system_file, args.origin_category.to_str(), diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic_from_job.rs b/crates/lib/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic_from_job.rs index 15b597019a..cae2cdf10b 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic_from_job.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/generic_insert/insert_media_file_generic_from_job.rs @@ -96,6 +96,7 @@ pub async fn insert_media_file_generic_from_job( generated_by_worker: args.generated_by_worker, is_generated_on_prem: args.is_generated_on_prem, is_intermediate_system_file: args.is_intermediate_system_file, + is_user_upload: false, // NB: Jobs typically won't be user uploads. Maybe this becomes a param in the future(?) maybe_audio_encoding: args.maybe_audio_encoding, maybe_batch_token: args.maybe_batch_token, maybe_creator_anonymous_visitor_token: args.job.maybe_creator_anonymous_visitor_token_typed.as_ref(), diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs index 8ef16f4cb3..e7a0f764ac 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_studio_scene_render.rs @@ -88,6 +88,10 @@ pub async fn insert_media_file_from_studio_scene_render( origin_category: MediaFileOriginCategory::StorytellerStudio, origin_product_category: MediaFileOriginProductCategory::StorytellerStudio, maybe_origin_model_type: None, + + // NB: All client uploads should be marked as such, even if it makes the frontend product + // weird (i.e. users won't think of these as uploads) + is_user_upload: true, is_intermediate_system_file: true, // Static bits (counters) diff --git a/crates/lib/mysql_queries/src/queries/media_files/upsert/upsert_media_file_from_file_upload.rs b/crates/lib/mysql_queries/src/queries/media_files/upsert/upsert_media_file_from_file_upload.rs index b5c8d2cb3a..12d74bbecc 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/upsert/upsert_media_file_from_file_upload.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/upsert/upsert_media_file_from_file_upload.rs @@ -168,7 +168,7 @@ ON DUPLICATE KEY UPDATE maybe_creator_file_synthetic_id = ?, maybe_creator_category_synthetic_id = ?, - + is_user_upload = TRUE, maybe_origin_model_type = NULL, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs index ca21911223..ad39ad54c1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs @@ -296,7 +296,6 @@ pub async fn upload_studio_shot_media_file_handler( file_size_bytes, maybe_audio_encoding: None, // TODO maybe_video_encoding: None, // TODO - //is_intermediate_system_file: false, // TODO // TODO: Frame rate. maybe_scene_source_media_file_token: form.maybe_scene_source_media_file_token .as_ref()