From 4485cf34d47dd48fd926c87bc4be7b3e51197f72 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 8 Jun 2021 12:12:42 -0400 Subject: [PATCH] add attempt_count to all job status endpoints --- .../endpoints/tts/get_tts_inference_job_status.rs | 6 ++++++ .../endpoints/tts/get_tts_upload_model_job_status.rs | 4 ++++ src/http_server/endpoints/users/edit_profile.rs | 1 - .../endpoints/w2l/get_w2l_inference_job_status.rs | 4 ++++ .../endpoints/w2l/get_w2l_upload_template_job_status.rs | 4 ++++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/http_server/endpoints/tts/get_tts_inference_job_status.rs b/src/http_server/endpoints/tts/get_tts_inference_job_status.rs index 8e03547eed..1797a57d6e 100644 --- a/src/http_server/endpoints/tts/get_tts_inference_job_status.rs +++ b/src/http_server/endpoints/tts/get_tts_inference_job_status.rs @@ -37,6 +37,8 @@ pub struct TtsInferenceJobStatusForResponse { pub job_token: String, pub status: String, + pub attempt_count: u8, + pub maybe_result_token: Option, pub maybe_public_bucket_wav_audio_path: Option, @@ -70,6 +72,8 @@ pub struct TtsInferenceJobStatusRecord { pub job_token: String, pub status: String, + pub attempt_count: i32, + pub maybe_result_token: Option, pub maybe_public_bucket_wav_audio_path: Option, @@ -124,6 +128,7 @@ SELECT jobs.token as job_token, jobs.status, + jobs.attempt_count, jobs.on_success_result_token as maybe_result_token, results.public_bucket_wav_audio_path as maybe_public_bucket_wav_audio_path, @@ -165,6 +170,7 @@ WHERE jobs.token = ? let model_for_response = TtsInferenceJobStatusForResponse { job_token: record.job_token.clone(), status: record.status.clone(), + attempt_count: record.attempt_count as u8, maybe_result_token: record.maybe_result_token.clone(), maybe_public_bucket_wav_audio_path: record.maybe_public_bucket_wav_audio_path.clone(), model_token: record.model_token.clone(), diff --git a/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs b/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs index 24458b5098..3d62c931fb 100644 --- a/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs +++ b/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs @@ -37,6 +37,7 @@ pub struct TtsUploadModelJobStatusForResponse { pub job_token: String, pub status: String, + pub attempt_count: u8, pub maybe_model_token: Option, pub created_at: DateTime, @@ -65,6 +66,7 @@ pub struct TtsUploadModelJobStatusRecord { pub job_token: String, pub status: String, + pub attempt_count: i32, pub maybe_model_token: Option, pub created_at: DateTime, @@ -113,6 +115,7 @@ SELECT jobs.token as job_token, jobs.status, + jobs.attempt_count, jobs.on_success_result_token as maybe_model_token, jobs.created_at, @@ -145,6 +148,7 @@ WHERE jobs.token = ? let model_for_response = TtsUploadModelJobStatusForResponse { job_token: record.job_token.clone(), status: record.status.clone(), + attempt_count: record.attempt_count as u8, maybe_model_token: record.maybe_model_token.clone(), created_at: record.created_at.clone(), updated_at: record.updated_at.clone(), diff --git a/src/http_server/endpoints/users/edit_profile.rs b/src/http_server/endpoints/users/edit_profile.rs index 5a1d3b24c0..220727c0cd 100644 --- a/src/http_server/endpoints/users/edit_profile.rs +++ b/src/http_server/endpoints/users/edit_profile.rs @@ -241,7 +241,6 @@ pub async fn edit_profile_handler( } } - if let Some(markdown) = request.profile_markdown.as_deref() { if contains_slurs(markdown) { return Err(EditProfileError::BadInput("profile contains slurs".to_string())); diff --git a/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs b/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs index 621e6240a4..01a1a41f65 100644 --- a/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs +++ b/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs @@ -37,6 +37,7 @@ pub struct W2lInferenceJobStatusForResponse { pub job_token: String, pub status: String, + pub attempt_count: u8, pub maybe_result_token: Option, pub maybe_public_bucket_video_path: Option, @@ -70,6 +71,7 @@ pub struct W2lInferenceJobStatusRecord { pub job_token: String, pub status: String, + pub attempt_count: i32, pub maybe_result_token: Option, pub maybe_public_bucket_video_path: Option, @@ -124,6 +126,7 @@ SELECT jobs.token as job_token, jobs.status, + jobs.attempt_count, jobs.on_success_result_token as maybe_result_token, results.public_bucket_video_path as maybe_public_bucket_video_path, @@ -165,6 +168,7 @@ WHERE jobs.token = ? let template_for_response = W2lInferenceJobStatusForResponse { job_token: record.job_token.clone(), status: record.status.clone(), + attempt_count: record.attempt_count as u8, maybe_result_token: record.maybe_result_token.clone(), maybe_public_bucket_video_path: record.maybe_public_bucket_video_path.clone(), maybe_w2l_template_token: record.maybe_w2l_template_token.clone(), diff --git a/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs b/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs index 6a368428e3..2a498b9912 100644 --- a/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs +++ b/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs @@ -37,6 +37,7 @@ pub struct W2lUploadTemplateJobStatusForResponse { pub job_token: String, pub status: String, + pub attempt_count: u8, pub maybe_template_token: Option, pub created_at: DateTime, @@ -65,6 +66,7 @@ pub struct W2lUploadTemplateJobStatusRecord { pub job_token: String, pub status: String, + pub attempt_count: i32, pub maybe_template_token: Option, pub created_at: DateTime, @@ -113,6 +115,7 @@ SELECT jobs.token as job_token, jobs.status, + jobs.attempt_count, jobs.on_success_result_token as maybe_template_token, jobs.created_at, @@ -145,6 +148,7 @@ WHERE jobs.token = ? let template_for_response = W2lUploadTemplateJobStatusForResponse { job_token: record.job_token.clone(), status: record.status.clone(), + attempt_count: record.attempt_count as u8, maybe_template_token: record.maybe_template_token.clone(), created_at: record.created_at.clone(), updated_at: record.updated_at.clone(),