diff --git a/migrations/2021-05-15-212913_inference_jobs/up.sql b/migrations/2021-05-15-212913_inference_jobs/up.sql index 6e5abdea93..dc1afac1ad 100644 --- a/migrations/2021-05-15-212913_inference_jobs/up.sql +++ b/migrations/2021-05-15-212913_inference_jobs/up.sql @@ -90,10 +90,10 @@ CREATE TABLE w2l_inference_jobs ( maybe_tts_inference_result_token VARCHAR(32) DEFAULT NULL, -- If we're using custom uploaded audio, this will be present. - maybe_audio_bucket_location CHAR(16) DEFAULT NULL, + maybe_public_audio_bucket_location VARCHAR(255) DEFAULT NULL, -- If we're using a custom uploaded image, this will be present. - maybe_image_bucket_location CHAR(16) DEFAULT NULL, + maybe_public_image_bucket_location VARCHAR(255) DEFAULT NULL, -- ========== CREATOR DETAILS ========== diff --git a/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs b/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs index 58fbf961be..6d11f757dd 100644 --- a/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs +++ b/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs @@ -125,8 +125,8 @@ INSERT INTO w2l_inference_jobs SET maybe_w2l_template_token = ?, maybe_tts_inference_result_token = ?, - maybe_audio_bucket_location = NULL, - maybe_image_bucket_location = NULL, + maybe_public_audio_bucket_location = NULL, + maybe_public_image_bucket_location = NULL, maybe_creator_user_token = ?, creator_ip_address = ?, creator_set_visibility = ?, diff --git a/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs index e32882c451..2f688ac1d6 100644 --- a/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs +++ b/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs @@ -241,8 +241,6 @@ pub async fn enqueue_infer_w2l_with_uploads( InferW2lWithUploadError::ServerError })?; - let audio_upload_bucket_path = "todo".to_string(); // TODO TODO - // TODO: Upload audio to bucket! // ==================== SAVE JOB RECORD ==================== // @@ -264,7 +262,7 @@ SET uuid_idempotency_token = ?, maybe_w2l_template_token = ?, - maybe_audio_bucket_location = ?, + maybe_public_audio_bucket_location = ?, maybe_creator_user_token = ?, creator_ip_address = ?, @@ -275,7 +273,7 @@ SET job_token.to_string(), uuid_idempotency_token.to_string(), maybe_template_token.clone(), - Some(audio_upload_bucket_path.clone()), // TODO THIS ISN'T WIDE ENOUGH + Some(audio_upload_bucket_path.clone()), maybe_user_token.clone(), ip_address.to_string() )