diff --git a/packages/components/src/api/ApiConfig.ts b/packages/components/src/api/ApiConfig.ts index ada9b5f4e8..fe864a796f 100644 --- a/packages/components/src/api/ApiConfig.ts +++ b/packages/components/src/api/ApiConfig.ts @@ -422,12 +422,24 @@ class ApiConfig { return `${this.getScheme()}://${this.getNewApiHost()}/voice_clone_requests/check`; } - enqueueRetrievalJob(): string { - return `${this.getScheme()}://${this.getNewApiHost()}/retrieval/enqueue`; + // =============== Generic Model Downloads =============== + + enqueueRemoteDownloadJob(): string { + return `${this.getScheme()}://${this.getNewApiHost()}/v1/remote_downloads/enqueue`; } - getRetrievalJobStatus(jobToken: string): string { - return `${this.getScheme()}://${this.getNewApiHost()}/retrieval/job_status/${jobToken}`; + getRemoteDownloadJobStatus(jobToken: string): string { + return `${this.getScheme()}://${this.getNewApiHost()}/v1/remote_downloads/job_status/${jobToken}`; + } + + // =============== Generic Model Inference =============== + + getModelInferenceJobStatus(jobToken: string): string { + return `${this.getScheme()}://${this.getNewApiHost()}/v1/model_inference/job_status/${jobToken}`; + } + + getPendingModelInferenceJobCount(): string { + return `${this.getScheme()}://${this.getNewApiHost()}/v1/model_inference/queue_length`; } // =============== User Ratings =============== diff --git a/packages/components/src/api/model_inference/GetModelInferenceJobStatus.ts b/packages/components/src/api/model_inference/GetModelInferenceJobStatus.ts new file mode 100644 index 0000000000..2da780cdef --- /dev/null +++ b/packages/components/src/api/model_inference/GetModelInferenceJobStatus.ts @@ -0,0 +1,79 @@ +import { ApiConfig } from "../ApiConfig"; + +export interface GetModelInferenceJobStatusSuccessResponse { + success: boolean, + state: ModelInferenceJobStatus, +} + +export interface ModelInferenceJobStatus { + // Job primary key + job_token: string, + + request: RequestDetails, + status: StatusDetails, + maybe_result?: ResultDetails, + + created_at: Date, + updated_at: Date, +} + +export interface RequestDetails { + inference_category: string, + + maybe_model_type?: string, + maybe_model_token?: string, + maybe_model_title?: string, + + maybe_raw_inference_text?: string, +} + +export interface StatusDetails { + status: string, + maybe_extra_status_description?: string, + attempt_count: number, +} + +export interface ResultDetails { + entity_type: string, + entity_token: string, + + maybe_public_bucket_media_path?: string, +} + +export interface GetModelInferenceJobStatusErrorResponse { + success: boolean, +} + +export type GetModelInferenceJobStatusResponse = GetModelInferenceJobStatusSuccessResponse | GetModelInferenceJobStatusErrorResponse; + +export function GetModelInferenceJobStatusIsOk(response: GetModelInferenceJobStatusResponse): response is GetModelInferenceJobStatusSuccessResponse { + return response?.success === true; +} + +export function GetModelInferenceJobStatusIsError(response: GetModelInferenceJobStatusResponse): response is GetModelInferenceJobStatusErrorResponse { + return response?.success === false; +} + +export async function GetModelInferenceJobStatus(jobToken: string) : Promise +{ + const endpoint = new ApiConfig().getModelInferenceJobStatus(jobToken); + + return fetch(endpoint, { + method: 'GET', + credentials: 'include', + headers: { + 'Accept': 'application/json', + }, + }) + .then(res => res.json()) + .then(res => { + if (res && 'success' in res) { + return res; + } else { + return { success : false }; + } + }) + .catch(e => { + return { success : false }; + }); +} diff --git a/packages/components/src/api/retrieval/EnqueueRetrieval.ts b/packages/components/src/api/remote_downloads/EnqueueRemoteDownload.ts similarity index 50% rename from packages/components/src/api/retrieval/EnqueueRetrieval.ts rename to packages/components/src/api/remote_downloads/EnqueueRemoteDownload.ts index c067cb3cee..6b680e48d6 100644 --- a/packages/components/src/api/retrieval/EnqueueRetrieval.ts +++ b/packages/components/src/api/remote_downloads/EnqueueRemoteDownload.ts @@ -1,34 +1,34 @@ import { ApiConfig } from "../ApiConfig"; -export interface EnqueueRetrievalRequest { +export interface EnqueueRemoteDownloadRequest { idempotency_token: string, title: string, download_url: string, generic_download_type: string, } -export interface EnqueueRetrievalSuccessResponse { +export interface EnqueueRemoteDownloadSuccessResponse { success: boolean, job_token: string, } -export interface EnqueueRetrievalErrorResponse { +export interface EnqueueRemoteDownloadErrorResponse { success: boolean, } -type EnqueueRetrievalResponse = EnqueueRetrievalSuccessResponse | EnqueueRetrievalErrorResponse; +type EnqueueRemoteDownloadResponse = EnqueueRemoteDownloadSuccessResponse | EnqueueRemoteDownloadErrorResponse; -export function EnqueueRetrievalIsOk(response: EnqueueRetrievalResponse): response is EnqueueRetrievalSuccessResponse { +export function EnqueueRemoteDownloadIsOk(response: EnqueueRemoteDownloadResponse): response is EnqueueRemoteDownloadSuccessResponse { return response?.success === true; } -export function EnqueueRetrievalIsError(response: EnqueueRetrievalResponse): response is EnqueueRetrievalErrorResponse { +export function EnqueueRemoteDownloadIsError(response: EnqueueRemoteDownloadResponse): response is EnqueueRemoteDownloadErrorResponse { return response?.success === false; } -export async function EnqueueRetrieval(request: EnqueueRetrievalRequest) : Promise +export async function EnqueueRemoteDownload(request: EnqueueRemoteDownloadRequest) : Promise { - const endpoint = new ApiConfig().enqueueRetrievalJob(); + const endpoint = new ApiConfig().enqueueRemoteDownloadJob(); return fetch(endpoint, { method: 'POST', diff --git a/packages/components/src/api/retrieval/GetRetrievalJobStatus.ts b/packages/components/src/api/remote_downloads/GetRemoteDownloadJobStatus.ts similarity index 53% rename from packages/components/src/api/retrieval/GetRetrievalJobStatus.ts rename to packages/components/src/api/remote_downloads/GetRemoteDownloadJobStatus.ts index 07b244b06e..67d0fd3f06 100644 --- a/packages/components/src/api/retrieval/GetRetrievalJobStatus.ts +++ b/packages/components/src/api/remote_downloads/GetRemoteDownloadJobStatus.ts @@ -1,11 +1,11 @@ import { ApiConfig } from "../ApiConfig"; -export interface GetRetrievalJobStatusSuccessResponse { +export interface GetRemoteDownloadJobStatusSuccessResponse { success: boolean, - state: RetrievalJobStatus, + state: RemoteDownloadJobStatus, } -export interface RetrievalJobStatus { +export interface RemoteDownloadJobStatus { // Job primary key job_token: string, @@ -24,23 +24,23 @@ export interface RetrievalJobStatus { updated_at: Date, } -export interface GetRetrievalJobStatusErrorResponse { +export interface GetRemoteDownloadJobStatusErrorResponse { success: boolean, } -type GetRetrievalJobStatusResponse = GetRetrievalJobStatusSuccessResponse | GetRetrievalJobStatusErrorResponse; +type GetRemoteDownloadJobStatusResponse = GetRemoteDownloadJobStatusSuccessResponse | GetRemoteDownloadJobStatusErrorResponse; -export function GetRetrievalJobStatusIsOk(response: GetRetrievalJobStatusResponse): response is GetRetrievalJobStatusSuccessResponse { +export function GetRemoteDownloadJobStatusIsOk(response: GetRemoteDownloadJobStatusResponse): response is GetRemoteDownloadJobStatusSuccessResponse { return response?.success === true; } -export function GetRetrievalJobStatusIsError(response: GetRetrievalJobStatusResponse): response is GetRetrievalJobStatusErrorResponse { +export function GetRemoteDownloadJobStatusIsError(response: GetRemoteDownloadJobStatusResponse): response is GetRemoteDownloadJobStatusErrorResponse { return response?.success === false; } -export async function GetRetrievalJobStatus(jobToken: string) : Promise +export async function GetRemoteDownloadJobStatus(jobToken: string) : Promise { - const endpoint = new ApiConfig().getRetrievalJobStatus(jobToken); + const endpoint = new ApiConfig().getRemoteDownloadJobStatus(jobToken); return fetch(endpoint, { method: 'GET', diff --git a/packages/components/src/api/tts/GenerateTtsAudio.ts b/packages/components/src/api/tts/GenerateTtsAudio.ts index 4245edc1d9..ba6d931ba3 100644 --- a/packages/components/src/api/tts/GenerateTtsAudio.ts +++ b/packages/components/src/api/tts/GenerateTtsAudio.ts @@ -10,7 +10,10 @@ export interface GenerateTtsAudioRequest { } export interface GenerateTtsAudioSuccess { + success: boolean, inference_job_token: string, + // Which queue to poll + inference_job_token_type?: string, } export interface GenerateTtsAudioError { @@ -63,6 +66,7 @@ export async function GenerateTtsAudio(request: GenerateTtsAudioRequest) : Promi } else { return { inference_job_token: fullResponse.body.inference_job_token, + inference_job_token_type: fullResponse.body.inference_job_token_type, }; } }) @@ -95,6 +99,7 @@ function maybeMapError(statuslike: StatusLike) : GenerateTtsAudioErrorType | und interface EndpointSuccessResponse { success: boolean, inference_job_token: string, + inference_job_token_type?: string, } interface EndpointErrorResponse { diff --git a/packages/components/src/jobs/InferenceJob.ts b/packages/components/src/jobs/InferenceJob.ts new file mode 100644 index 0000000000..4c71d81149 --- /dev/null +++ b/packages/components/src/jobs/InferenceJob.ts @@ -0,0 +1,85 @@ +import { ModelInferenceJobStatus } from "../api/model_inference/GetModelInferenceJobStatus"; +import { JobState, jobStateFromString } from "./JobStates"; + +// NB: Many of these fields are optional despite the response payload containing them +// This is because we create temporary placeholder objects with just the token. +export class InferenceJob { + // PK + jobToken: string; + + // Status + jobState: JobState; + maybeExtraStatusDescription: string | null; + attemptCount: number; + + // Request + maybeModelType?: string; + maybeModelToken?: string; + maybeModelTitle?: string; + maybeRawInferenceText?: string; + + // Result + maybeResultType: string | undefined | null; + maybeResultToken: string | undefined | null; + maybeResultPublicBucketMediaPath: string | undefined | null; + + constructor( + // PK + jobToken: string, + // Status + status: string = 'unknown', + maybeExtraStatusDescription: string | null = null, + attemptCount: number = 0, + // Request + maybeModelType: string | undefined = undefined, + maybeModelToken: string | undefined = undefined, + maybeModelTitle: string | undefined = undefined, + maybeRawInferenceText: string | undefined = undefined, + // Result + maybeResultEntityType: string | undefined | null = null, + maybeResultEntityToken: string | undefined | null = null, + maybeResultPublicBucketMediaPath: string | undefined | null = null, + ) { + this.jobToken = jobToken; + this.jobState = jobStateFromString(status); + this.maybeExtraStatusDescription = maybeExtraStatusDescription; + this.attemptCount = attemptCount; + + if (!!maybeModelType) { + this.maybeModelTitle = maybeModelType; + } + if (!!maybeModelToken) { + this.maybeModelToken = maybeModelToken; + } + if (!!maybeModelTitle) { + this.maybeModelTitle = maybeModelTitle; + } + + this.maybeRawInferenceText = maybeRawInferenceText; + + if (!!maybeResultEntityType) { + this.maybeResultType = maybeResultEntityType; + } + if (!!maybeResultEntityToken) { + this.maybeResultToken = maybeResultEntityToken; + } + + this.maybeResultPublicBucketMediaPath = maybeResultPublicBucketMediaPath; + } + + static fromResponse(response: ModelInferenceJobStatus) : InferenceJob { + return new InferenceJob( + response.job_token, + response.status.status, + response.status.maybe_extra_status_description || null, + response.status.attempt_count || 0, + response.request.maybe_model_type, + response.request.maybe_model_token, + response.request.maybe_model_title, + response.request.maybe_raw_inference_text, + response.maybe_result?.entity_type, + response.maybe_result?.entity_token, + response.maybe_result?.maybe_public_bucket_media_path, + ); + } +} diff --git a/packages/components/src/jobs/VocoderUploadJobs.ts b/packages/components/src/jobs/VocoderUploadJobs.ts index 4cc3d85a07..3c6ca21c42 100644 --- a/packages/components/src/jobs/VocoderUploadJobs.ts +++ b/packages/components/src/jobs/VocoderUploadJobs.ts @@ -1,4 +1,4 @@ -import { RetrievalJobStatus } from "../api/retrieval/GetRetrievalJobStatus"; +import { RemoteDownloadJobStatus } from "../api/remote_downloads/GetRemoteDownloadJobStatus"; import { JobState, jobStateFromString } from "./JobStates"; @@ -30,7 +30,7 @@ export class VocoderUploadJob { } } - static fromResponse(response: RetrievalJobStatus) : VocoderUploadJob { + static fromResponse(response: RemoteDownloadJobStatus) : VocoderUploadJob { return new VocoderUploadJob( response.job_token, response.status, diff --git a/packages/fakeyou.com/src/App.tsx b/packages/fakeyou.com/src/App.tsx index e0f9b1c7c1..b454e3b254 100644 --- a/packages/fakeyou.com/src/App.tsx +++ b/packages/fakeyou.com/src/App.tsx @@ -35,15 +35,17 @@ import i18n from "i18next"; import { initReactI18next } from "react-i18next"; import { VocoderUploadJob } from "@storyteller/components/src/jobs/VocoderUploadJobs"; import { - GetRetrievalJobStatus, - GetRetrievalJobStatusIsOk, -} from "@storyteller/components/src/api/retrieval/GetRetrievalJobStatus"; + GetRemoteDownloadJobStatus, + GetRemoteDownloadJobStatusIsOk, +} from "@storyteller/components/src/api/remote_downloads/GetRemoteDownloadJobStatus"; import { GetComputedTtsCategoryAssignmentsSuccessResponse } from "@storyteller/components/src/api/category/GetComputedTtsCategoryAssignments"; import { AvailableLanguageKey, AVAILABLE_LANGUAGE_MAP, ENGLISH_LANGUAGE, } from "./_i18n/AvailableLanguageMap"; +import { InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; +import { GetModelInferenceJobStatus, GetModelInferenceJobStatusIsOk } from "@storyteller/components/src/api/model_inference/GetModelInferenceJobStatus"; i18n .use(initReactI18next) // passes i18n down to react-i18next @@ -126,6 +128,7 @@ interface State { isShowingBootstrapLanguageNotice: boolean; // Jobs enqueued during this browser session. + inferenceJobs: Array; ttsInferenceJobs: Array; w2lInferenceJobs: Array; ttsModelUploadJobs: Array; @@ -185,6 +188,7 @@ class App extends React.Component { isShowingPleaseFollowNotice: showPleaseFollowNotice, isShowingBootstrapLanguageNotice: false, + inferenceJobs: [], ttsInferenceJobs: [], w2lInferenceJobs: [], ttsModelUploadJobs: [], @@ -313,6 +317,40 @@ class App extends React.Component { this.setState({ isShowingBootstrapLanguageNotice: false }); }; + checkInferenceJob = async (jobToken: string) => { + const lookupResult = await GetModelInferenceJobStatus(jobToken); + + if (GetModelInferenceJobStatusIsOk(lookupResult)) { + let updatedJobs: Array = []; + + this.state.inferenceJobs.forEach((existingJob) => { + if ( + existingJob.jobToken !== lookupResult.state!.job_token || + !jobStateCanChange(existingJob.jobState) + ) { + updatedJobs.push(existingJob); + return; + } + + let updatedJob = InferenceJob.fromResponse(lookupResult.state!); + updatedJobs.push(updatedJob); + }); + + this.setState({ + inferenceJobs: updatedJobs, + }); + } + }; + + enqueueInferenceJob = (jobToken: string) => { + const newJob = new InferenceJob(jobToken); + let inferenceJobs = this.state.inferenceJobs.concat([newJob]); + + this.setState({ + inferenceJobs: inferenceJobs, + }); + }; + enqueueTtsJob = (jobToken: string) => { const newJob = new TtsInferenceJob(jobToken); let inferenceJobs = this.state.ttsInferenceJobs.concat([newJob]); @@ -531,9 +569,9 @@ class App extends React.Component { }; checkVocoderUploadJob = async (jobToken: string) => { - const lookupResult = await GetRetrievalJobStatus(jobToken); + const lookupResult = await GetRemoteDownloadJobStatus(jobToken); - if (GetRetrievalJobStatusIsOk(lookupResult)) { + if (GetRemoteDownloadJobStatusIsOk(lookupResult)) { let updatedJobs: Array = []; this.state.vocoderUploadJobs.forEach((existingJob) => { @@ -556,6 +594,11 @@ class App extends React.Component { }; pollJobs = () => { + this.state.inferenceJobs.forEach((job) => { + if (jobStateCanChange(job.jobState)) { + this.checkInferenceJob(job.jobToken); + } + }); this.state.ttsInferenceJobs.forEach((job) => { if (jobStateCanChange(job.jobState)) { this.checkTtsJob(job.jobToken); @@ -645,6 +688,8 @@ class App extends React.Component { clearBootstrapLanguageNotice={ this.clearBootstrapLanguageNotice } + enqueueInferenceJob={this.enqueueInferenceJob} + inferenceJobs={this.state.inferenceJobs} enqueueTtsJob={this.enqueueTtsJob} ttsInferenceJobs={this.state.ttsInferenceJobs} enqueueW2lJob={this.enqueueW2lJob} diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index b426004016..c73d2f8290 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -67,6 +67,7 @@ import { NewsPage } from "./pages/news/NewsPage"; import { LandingPage } from "./pages/landing/LandingPage"; import { ChannelsPage } from "./pages/channels/Channels"; import { TrumpTtsPage } from "./pages/character/trump/TrumpTtsPage"; +import { InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; //import { LandingPage } from "./pages/landing/LandingPage"; //import { VcModelListPage } from "./pages/vc/vc_model_list/VcModelListPage"; @@ -94,6 +95,9 @@ interface Props { isShowingBootstrapLanguageNotice: boolean; clearBootstrapLanguageNotice: () => void; + enqueueInferenceJob: (jobToken: string) => void; + inferenceJobs: Array; + enqueueTtsJob: (jobToken: string) => void; ttsInferenceJobs: Array; @@ -294,6 +298,7 @@ class PageContainer extends React.Component { this.props.sessionSubscriptionsWrapper } enqueueTtsJob={this.props.enqueueTtsJob} + inferenceJobs={this.props.inferenceJobs} ttsInferenceJobs={this.props.ttsInferenceJobs} textBuffer={this.props.textBuffer} setTextBuffer={this.props.setTextBuffer} @@ -487,6 +492,7 @@ class PageContainer extends React.Component { this.props.sessionSubscriptionsWrapper } enqueueTtsJob={this.props.enqueueTtsJob} + inferenceJobs={this.props.inferenceJobs} ttsInferenceJobs={this.props.ttsInferenceJobs} ttsModelUploadJobs={this.props.ttsModelUploadJobs} w2lInferenceJobs={this.props.w2lInferenceJobs} @@ -545,6 +551,8 @@ class PageContainer extends React.Component { clearBootstrapLanguageNotice={ this.props.clearBootstrapLanguageNotice } + enqueueInferenceJob={this.props.enqueueInferenceJob} + inferenceJobs={this.props.inferenceJobs} enqueueTtsJob={this.props.enqueueTtsJob} ttsInferenceJobs={this.props.ttsInferenceJobs} ttsModelUploadJobs={this.props.ttsModelUploadJobs} diff --git a/packages/fakeyou.com/src/v2/view/_common/SessionTtsInferenceResultsList.tsx b/packages/fakeyou.com/src/v2/view/_common/SessionTtsInferenceResultsList.tsx index af75736b81..eb0e31d45f 100644 --- a/packages/fakeyou.com/src/v2/view/_common/SessionTtsInferenceResultsList.tsx +++ b/packages/fakeyou.com/src/v2/view/_common/SessionTtsInferenceResultsList.tsx @@ -22,8 +22,10 @@ import { GetPendingTtsJobCountIsOk, GetPendingTtsJobCountSuccessResponse, } from "@storyteller/components/src/api/tts/GetPendingTtsJobCount"; +import { InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; interface Props { + inferenceJobs: Array; ttsInferenceJobs: Array; sessionSubscriptionsWrapper: SessionSubscriptionsWrapper; } @@ -62,6 +64,123 @@ function SessionTtsInferenceResultList(props: Props) { let results: Array = []; + // TODO(bt,2023-04-08): Clean this utter garbage duplication up. + + // ============================= GENERIC INFERENCE ============================= + + props.inferenceJobs.forEach((job) => { + if (!job.maybeResultToken) { + let cssStyle = "alert alert-secondary mb-0"; + let stateDescription = "Pending..."; + + switch (job.jobState) { + case JobState.PENDING: + case JobState.UNKNOWN: + stateDescription = + job.maybeExtraStatusDescription == null + ? t("common.SessionTtsInferenceResults.progress.pending") + : job.maybeExtraStatusDescription; + break; + case JobState.STARTED: + cssStyle = "alert alert-success mb-0"; + stateDescription = + job.maybeExtraStatusDescription == null + ? t("common.SessionTtsInferenceResults.progress.started") + : job.maybeExtraStatusDescription; + break; + case JobState.ATTEMPT_FAILED: + cssStyle = "alert alert-danger mb-0"; + stateDescription = `Failed ${job.attemptCount} attempt(s). Will retry...`; + break; + case JobState.COMPLETE_FAILURE: + case JobState.DEAD: + cssStyle = "alert alert-danger mb-0"; + // TODO(bt,2023-01-23): Translate when I can test it + stateDescription = t( + "common.SessionTtsInferenceResults.progress.dead" + ); + break; + case JobState.COMPLETE_SUCCESS: + cssStyle = "message is-success mb-0"; + // Not sure why we're here instead of other branch! + stateDescription = t( + "common.SessionTtsInferenceResults.progress.success" + ); + break; + } + + results.push( +
+
+
+ + {stateDescription} + +
+
+
+ ); + } else { + let audioLink = new BucketConfig().getGcsUrl( + job.maybeResultPublicBucketMediaPath + ); + let ttsPermalink = `/tts/result/${job.maybeResultToken}`; + + let wavesurfers = ; + + results.push( +
+ {/*
+

{job.title}

+ +
*/} +
+ +
+
{job.maybeModelTitle}
+

{job.maybeRawInferenceText}

+
+ + {/* */} + + {wavesurfers} + +
+ { + Analytics.ttsClickResultLink(); + }} + className="fw-semibold" + > + + {t("common.SessionTtsInferenceResults.result.shareDownload")} + +
+ +
+
+ ); + } + }); + + // TODO(bt,2023-04-08): Clean this utter garbage duplication up. + + // ============================= LEGACY TTS ============================= + props.ttsInferenceJobs.forEach((job) => { if (!job.maybeResultToken) { let cssStyle = "alert alert-secondary mb-0"; @@ -171,6 +290,8 @@ function SessionTtsInferenceResultList(props: Props) { } }); + // ============================= END LEGACY TTS ============================= + let noResultsSection = (
diff --git a/packages/fakeyou.com/src/v2/view/pages/character/trump/TrumpTtsPage.tsx b/packages/fakeyou.com/src/v2/view/pages/character/trump/TrumpTtsPage.tsx index a46100a9f7..d8c277c421 100644 --- a/packages/fakeyou.com/src/v2/view/pages/character/trump/TrumpTtsPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/character/trump/TrumpTtsPage.tsx @@ -46,6 +46,7 @@ import { DynamicallyCategorizeModels } from "../../../../../model/categories/Syn import { usePrefixedDocumentTitle } from "../../../../../common/UsePrefixedDocumentTitle"; import { SearchOmnibar } from "./search/SearchOmnibar"; +import { InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; const PAGE_MODEL_TOKENS = new Set([ "TM:pmd1wm3kf6az", // Development: "Fake Donald Trump #1" @@ -66,6 +67,7 @@ interface Props { sessionSubscriptionsWrapper: SessionSubscriptionsWrapper; enqueueTtsJob: (jobToken: string) => void; + inferenceJobs: Array; ttsInferenceJobs: Array; ttsModelUploadJobs: Array; w2lInferenceJobs: Array; @@ -472,6 +474,7 @@ function TrumpTtsPage(props: Props) {
void; + enqueueInferenceJob: (jobToken: string) => void; + inferenceJobs: Array; + enqueueTtsJob: (jobToken: string) => void; ttsInferenceJobs: Array; + ttsModelUploadJobs: Array; w2lInferenceJobs: Array; w2lTemplateUploadJobs: Array; @@ -292,7 +297,13 @@ function TtsModelListPage(props: Props) { if (GenerateTtsAudioIsOk(response)) { setMaybeTtsError(undefined); - props.enqueueTtsJob(response.inference_job_token); + + if (response.inference_job_token_type === "generic") { + props.enqueueInferenceJob(response.inference_job_token); + } else { + props.enqueueTtsJob(response.inference_job_token); + } + } else if (GenerateTtsAudioIsError(response)) { setMaybeTtsError(response.error); } @@ -598,6 +609,7 @@ function TtsModelListPage(props: Props) {
void; + inferenceJobs: Array; ttsInferenceJobs: Array; textBuffer: string; setTextBuffer: (textBuffer: string) => void; @@ -857,6 +859,7 @@ function TtsModelViewPage(props: Props) { Session TTS Results diff --git a/packages/fakeyou.com/src/v2/view/pages/upload/UploadTtsModelPage.tsx b/packages/fakeyou.com/src/v2/view/pages/upload/UploadTtsModelPage.tsx index 7d44385832..84a1017f42 100644 --- a/packages/fakeyou.com/src/v2/view/pages/upload/UploadTtsModelPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/upload/UploadTtsModelPage.tsx @@ -28,6 +28,9 @@ function UploadTtsModelPage(props: Props) { const [downloadUrl, setDownloadUrl] = useState(""); const [title, setTitle] = useState(""); + const [modelType, setModelType] = useState("tacotron2"); // valid options: tacotron2, vits + + // Form errors const [downloadUrlInvalidReason] = useState(""); const [titleInvalidReason] = useState(""); @@ -65,6 +68,10 @@ function UploadTtsModelPage(props: Props) { return false; }; + const handleModelTypeChange = (ev: React.FormEvent) => { + setModelType((ev.target as HTMLSelectElement).value); + }; + const handleFormSubmit = (ev: React.FormEvent) => { ev.preventDefault(); @@ -77,6 +84,7 @@ function UploadTtsModelPage(props: Props) { idempotency_token: idempotencyToken, title: title, download_url: downloadUrl, + tts_model_type: modelType, }; fetch(endpointUrl, { @@ -176,6 +184,30 @@ function UploadTtsModelPage(props: Props) {
+ + {/* Model Type */} +
+ +
+ +
+
+ + {/* Title */}
- {/* - https://drive.google.com/file/d/{TOKEN}/view?usp=sharing - */} + {/* Download URL */}

{downloadUrlInvalidReason}

-
- {/*
-
- -
-
*/} +
diff --git a/packages/fakeyou.com/src/v2/view/pages/upload/UploadVocoderPage.tsx b/packages/fakeyou.com/src/v2/view/pages/upload/UploadVocoderPage.tsx index e2c297c12e..6879ea161b 100644 --- a/packages/fakeyou.com/src/v2/view/pages/upload/UploadVocoderPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/upload/UploadVocoderPage.tsx @@ -2,9 +2,9 @@ import React, { useState } from "react"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { DiscordLink } from "@storyteller/components/src/elements/DiscordLink"; import { - EnqueueRetrieval, - EnqueueRetrievalIsOk, -} from "@storyteller/components/src/api/retrieval/EnqueueRetrieval"; + EnqueueRemoteDownload, + EnqueueRemoteDownloadIsOk, +} from "@storyteller/components/src/api/remote_downloads/EnqueueRemoteDownload"; import { useHistory } from "react-router-dom"; import { v4 as uuidv4 } from "uuid"; import { BackLink } from "../../_common/BackLink"; @@ -75,9 +75,9 @@ function UploadVocoderPage(props: Props) { generic_download_type: "hifigan", }; - const response = await EnqueueRetrieval(request); + const response = await EnqueueRemoteDownload(request); - if (EnqueueRetrievalIsOk(response)) { + if (EnqueueRemoteDownloadIsOk(response)) { props.enqueueVocoderUploadJob(response.job_token); history.push("/"); }