From cbde1ab858db792665ceeb26436021118dd0bc68 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Sat, 28 Aug 2021 02:38:48 -0400
Subject: [PATCH] report maybe_extra_status for tts + model upload

---
 vocodes/src/jobs/TtsModelUploadJobs.ts                       | 5 +++++
 vocodes/src/jobs/W2lTemplateUploadJobs.ts                    | 5 +++++
 .../v2/view/_common/SessionTtsModelUploadResultsListFc.tsx   | 4 ++--
 .../view/_common/SessionW2lTemplateUploadResultsListFc.tsx   | 4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/vocodes/src/jobs/TtsModelUploadJobs.ts b/vocodes/src/jobs/TtsModelUploadJobs.ts
index 8a4b6fb684..708223344d 100644
--- a/vocodes/src/jobs/TtsModelUploadJobs.ts
+++ b/vocodes/src/jobs/TtsModelUploadJobs.ts
@@ -5,15 +5,18 @@ export class TtsModelUploadJob {
   jobToken: string;
   maybeModelToken: string | undefined | null;
   jobState: JobState;
+  maybeExtraStatusDescription: string | null;
   attemptCount: number;
 
   constructor(
     jobToken: string, 
     status: string = 'unknown',
+    maybeExtraStatusDescription: string | null = null,
     attemptCount: number = 0,
     maybeModelToken: string | undefined | null = undefined
   ) {
     this.jobState = jobStateFromString(status);
+    this.maybeExtraStatusDescription = maybeExtraStatusDescription;
     this.attemptCount = attemptCount;
     this.jobToken = jobToken;
     if (!!maybeModelToken) {
@@ -25,6 +28,7 @@ export class TtsModelUploadJob {
     return new TtsModelUploadJob(
       response.job_token,
       response.status,
+      response.maybe_extra_status_description || null,
       response.attempt_count || 0,
       response.maybe_model_token,
     );
@@ -39,6 +43,7 @@ export interface TtsModelUploadJobStateResponsePayload {
 export interface TtsInferenceJobState {
   job_token: string,
   status: string,
+  maybe_extra_status_description: string | null,
   attempt_count: number | undefined,
   maybe_model_token: string | undefined | null,
   created_at: string,
diff --git a/vocodes/src/jobs/W2lTemplateUploadJobs.ts b/vocodes/src/jobs/W2lTemplateUploadJobs.ts
index e9acba7fea..a3fd366581 100644
--- a/vocodes/src/jobs/W2lTemplateUploadJobs.ts
+++ b/vocodes/src/jobs/W2lTemplateUploadJobs.ts
@@ -4,16 +4,19 @@ import { JobState, jobStateFromString } from "./JobStates";
 export class W2lTemplateUploadJob {
   jobToken: string;
   jobState: JobState;
+  maybeExtraStatusDescription: string | null;
   attemptCount: number;
   maybeW2lTemplateToken: string | undefined | null;
 
   constructor(
     jobToken: string, 
     status: string = 'unknown',
+    maybeExtraStatusDescription: string | null = null,
     attemptCount: number = 0,
     maybeW2lTemplateToken: string | undefined | null = null
   ) {
     this.jobState = jobStateFromString(status);
+    this.maybeExtraStatusDescription = maybeExtraStatusDescription;
     this.attemptCount = attemptCount;
     this.jobToken = jobToken;
     if (!!maybeW2lTemplateToken) {
@@ -25,6 +28,7 @@ export class W2lTemplateUploadJob {
     return new W2lTemplateUploadJob(
       response.job_token,
       response.status,
+      response.maybe_extra_status_description || null,
       response.attempt_count || 0,
       response.maybe_template_token,
     );
@@ -40,6 +44,7 @@ export interface W2lTemplateUploadJobState {
   job_token: string,
   maybe_template_token: string | null,
   status: string,
+  maybe_extra_status_description: string | null,
   attempt_count: number | null,
   created_at: string,
   updated_at: string,
diff --git a/vocodes/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx b/vocodes/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx
index 92ad8a5a3e..b7fa94bbac 100644
--- a/vocodes/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx
+++ b/vocodes/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx
@@ -19,10 +19,10 @@ function SessionTtsModelUploadResultListFc(props: Props) {
       switch (job.jobState) {
         case JobState.PENDING:
         case JobState.UNKNOWN:
-          stateDescription = "Pending..."
+          stateDescription = job.maybeExtraStatusDescription == null ? "Pending..." : job.maybeExtraStatusDescription;
           break;
         case JobState.STARTED:
-          stateDescription = "Started...";
+          stateDescription = job.maybeExtraStatusDescription == null ? "Started..." : job.maybeExtraStatusDescription;
           break;
         case JobState.ATTEMPT_FAILED:
           stateDescription = `Failed ${job.attemptCount} attempt(s). Will retry...`;
diff --git a/vocodes/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx b/vocodes/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx
index 2372e9b87a..7947d92d0c 100644
--- a/vocodes/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx
+++ b/vocodes/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx
@@ -19,10 +19,10 @@ function SessionW2lTemplateUploadResultListFc(props: Props) {
       switch (job.jobState) {
         case JobState.PENDING:
         case JobState.UNKNOWN:
-          stateDescription = "Pending..."
+          stateDescription = job.maybeExtraStatusDescription == null ? "Pending..." : job.maybeExtraStatusDescription;
           break;
         case JobState.STARTED:
-          stateDescription = "Started...";
+          stateDescription = job.maybeExtraStatusDescription == null ? "Started..." : job.maybeExtraStatusDescription;
           break;
         case JobState.ATTEMPT_FAILED:
           stateDescription = `Failed ${job.attemptCount} attempt(s). Will retry...`;