diff --git a/crates/api_clients/world_labs_client/src/api/requests/_metadata/request_flow_4/r4_google_upload.txt b/crates/api_clients/world_labs_client/src/api/requests/_metadata/request_flow_4/r4_google_upload.txt index 5b6cded25e..f3df0048ac 100644 --- a/crates/api_clients/world_labs_client/src/api/requests/_metadata/request_flow_4/r4_google_upload.txt +++ b/crates/api_clients/world_labs_client/src/api/requests/_metadata/request_flow_4/r4_google_upload.txt @@ -1,5 +1,26 @@ https://storage.googleapis.com/wlt-training-gsc-marble-assets-prod/temp/objects/ee33d03e-b153-4d56-a7cb-a08bf86bd20e/asset.jpg?X-Goog-Algorithm=GOOG4-RSA-SHA256&X-Goog-Credential=wlt-training-gsc-sa%40wlt-training-gsc.iam.gserviceaccount.com%2F20251211%2Fauto%2Fstorage%2Fgoog4_request&X-Goog-Date=20251211T061016Z&X-Goog-Expires=3600&X-Goog-SignedHeaders=content-type%3Bhost%3Bx-goog-content-length-range&X-Goog-Signature=8c494d7afd19eea9820fc1d629d8b10cc76410c34f98c440665a0e2a7bf6980e6fadaa4a271c335de485780ee645dfb8b2f956cd8cc17fb1878581f5b39331208197579f9976bc6d21e75df1828c3bd5aba5bf21b91100f3c583b76ab2f0ce5fba32c671eaac860cfd43d4ecc31f509a83b1c30a8336d81fd1c9cd9fc9283ed4e8978c7a6418dc3ac3da51384041a5e3b7255b7bd67bdbbad5f65e87ef883d0dac9018caded615be46914b0d298fdc651bf1a77bef1d44d23ab416446c9dab42d9d82dc78ceab67379ad143dd99173fdfbbd7997a5b47673fc960cf511b76a6d1f941274a8bce456a16809c4f2752517f468611f67bf9eb1fab35e0d3280bdaa +Previous endpoint "upload_url": + +https://storage.googleapis.com/wlt-training-gsc-marble-assets-prod/temp/objects/ee33d03e-b153-4d56-a7cb-a08bf86bd20e/asset.jpg + ?X-Goog-Algorithm=GOOG4-RSA-SHA256 + &X-Goog-Credential=wlt-training-gsc-sa%40wlt-training-gsc.iam.gserviceaccount.com%2F20251211%2Fauto%2Fstorage%2Fgoog4_request + &X-Goog-Date=20251211T061016Z + &X-Goog-Expires=3600 + &X-Goog-SignedHeaders=content-type%3Bhost%3Bx-goog-content-length-range + &X-Goog-Signature=8c494d7afd19eea9820fc1d629d8b10cc76410c34f98c440665a0e2a7bf6980e6fadaa4a271c335de485780ee645dfb8b2f956cd8cc17fb1878581f5b39331208197579f9976bc6d21e75df1828c3bd5aba5bf21b91100f3c583b76ab2f0ce5fba32c671eaac860cfd43d4ecc31f509a83b1c30a8336d81fd1c9cd9fc9283ed4e8978c7a6418dc3ac3da51384041a5e3b7255b7bd67bdbbad5f65e87ef883d0dac9018caded615be46914b0d298fdc651bf1a77bef1d44d23ab416446c9dab42d9d82dc78ceab67379ad143dd99173fdfbbd7997a5b47673fc960cf511b76a6d1f941274a8bce456a16809c4f2752517f468611f67bf9eb1fab35e0d3280bdaa + +Actual request URL: + +https://storage.googleapis.com/wlt-training-gsc-marble-assets-prod/temp/objects/ee33d03e-b153-4d56-a7cb-a08bf86bd20e/asset.jpg + ?X-Goog-Algorithm=GOOG4-RSA-SHA256 + &X-Goog-Credential=wlt-training-gsc-sa%40wlt-training-gsc.iam.gserviceaccount.com%2F20251211%2Fauto%2Fstorage%2Fgoog4_request + &X-Goog-Date=20251211T061016Z + &X-Goog-Expires=3600 + &X-Goog-SignedHeaders=content-type%3Bhost%3Bx-goog-content-length-range + &X-Goog-Signature=8c494d7afd19eea9820fc1d629d8b10cc76410c34f98c440665a0e2a7bf6980e6fadaa4a271c335de485780ee645dfb8b2f956cd8cc17fb1878581f5b39331208197579f9976bc6d21e75df1828c3bd5aba5bf21b91100f3c583b76ab2f0ce5fba32c671eaac860cfd43d4ecc31f509a83b1c30a8336d81fd1c9cd9fc9283ed4e8978c7a6418dc3ac3da51384041a5e3b7255b7bd67bdbbad5f65e87ef883d0dac9018caded615be46914b0d298fdc651bf1a77bef1d44d23ab416446c9dab42d9d82dc78ceab67379ad143dd99173fdfbbd7997a5b47673fc960cf511b76a6d1f941274a8bce456a16809c4f2752517f468611f67bf9eb1fab35e0d3280bdaa + + fetch("https://storage.googleapis.com/wlt-training-gsc-marble-assets-prod/temp/objects/ee33d03e-b153-4d56-a7cb-a08bf86bd20e/asset.jpg?X-Goog-Algorithm=GOOG4-RSA-SHA256&X-Goog-Credential=wlt-training-gsc-sa%40wlt-training-gsc.iam.gserviceaccount.com%2F20251211%2Fauto%2Fstorage%2Fgoog4_request&X-Goog-Date=20251211T061016Z&X-Goog-Expires=3600&X-Goog-SignedHeaders=content-type%3Bhost%3Bx-goog-content-length-range&X-Goog-Signature=8c494d7afd19eea9820fc1d629d8b10cc76410c34f98c440665a0e2a7bf6980e6fadaa4a271c335de485780ee645dfb8b2f956cd8cc17fb1878581f5b39331208197579f9976bc6d21e75df1828c3bd5aba5bf21b91100f3c583b76ab2f0ce5fba32c671eaac860cfd43d4ecc31f509a83b1c30a8336d81fd1c9cd9fc9283ed4e8978c7a6418dc3ac3da51384041a5e3b7255b7bd67bdbbad5f65e87ef883d0dac9018caded615be46914b0d298fdc651bf1a77bef1d44d23ab416446c9dab42d9d82dc78ceab67379ad143dd99173fdfbbd7997a5b47673fc960cf511b76a6d1f941274a8bce456a16809c4f2752517f468611f67bf9eb1fab35e0d3280bdaa", { "headers": { "accept": "*/*", diff --git a/crates/api_clients/world_labs_client/src/api/requests/objects/finalize_object_image_upload.rs b/crates/api_clients/world_labs_client/src/api/requests/objects/finalize_object_image_upload.rs index 32d9d5ca39..a4508656bd 100644 --- a/crates/api_clients/world_labs_client/src/api/requests/objects/finalize_object_image_upload.rs +++ b/crates/api_clients/world_labs_client/src/api/requests/objects/finalize_object_image_upload.rs @@ -27,14 +27,14 @@ use wreq_util::Emulation; const BASE_URL : &str = "https://marble2-kgw-prod-iac1.wlt-ai.art/api/v1/objects"; -fn get_url(object_id: &ObjectId) -> String { - format!("{}/{}:complete", BASE_URL, object_id.0) +fn get_url(upload_id: &UploadId) -> String { + format!("{}/{}:complete", BASE_URL, upload_id.0) } pub struct FinalizeObjectImageUploadArgs<'a> { pub cookies: &'a WorldLabsCookies, pub bearer_token: &'a WorldLabsBearerToken, - pub object_id: &'a ObjectId, + pub upload_id: &'a UploadId, pub request_timeout: Option, } @@ -51,7 +51,7 @@ pub async fn finalize_object_image_upload(args: FinalizeObjectImageUploadArgs<'_ .build() .map_err(|err| WorldLabsClientError::WreqClientError(err))?; - let url = get_url(args.object_id); + let url = get_url(args.upload_id); debug!("Requesting URL: {}", url); @@ -125,13 +125,13 @@ struct RawResponse { #[cfg(test)] mod tests { - use crate::api::api_types::object_id::ObjectId; + use crate::api::api_types::upload_id::UploadId; use crate::api::requests::objects::finalize_object_image_upload::get_url; #[test] fn test_get_url() { - let object_id = ObjectId("foo-bar-baz-bin".to_string()); + let upload_id = UploadId("foo-bar-baz-bin".to_string()); let expected = "https://marble2-kgw-prod-iac1.wlt-ai.art/api/v1/objects/foo-bar-baz-bin:complete"; - assert_eq!(get_url(&object_id), expected); + assert_eq!(get_url(&upload_id), expected); } } diff --git a/crates/api_clients/world_labs_client/src/recipes/upload_image_and_create_world_with_retry.rs b/crates/api_clients/world_labs_client/src/recipes/upload_image_and_create_world_with_retry.rs index 5e2758ba07..d3571683fe 100644 --- a/crates/api_clients/world_labs_client/src/recipes/upload_image_and_create_world_with_retry.rs +++ b/crates/api_clients/world_labs_client/src/recipes/upload_image_and_create_world_with_retry.rs @@ -89,7 +89,7 @@ pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreate let response = finalize_object_image_upload(FinalizeObjectImageUploadArgs { cookies: &args.cookies, bearer_token: &args.bearer_token, - object_id: &object_id, + upload_id: &upload_id, request_timeout: args.individual_request_timeout, }).await?;