From fa32ac5edc8d5313a5d9849a769ce18af4fe62f8 Mon Sep 17 00:00:00 2001 From: dev Date: Thu, 18 Jan 2024 18:22:10 -0500 Subject: [PATCH 1/4] better UI and flow for uploading video and triggering generate MoCap --- packages/components/src/api/ApiConfig.ts | 5 + .../video_mocap/EnqueueVideoMotionCapture.ts | 42 ++++++ .../components/src/api/video_mocap/index.ts | 7 + packages/components/src/jobs/InferenceJob.ts | 1 + .../fakeyou.com/src/v2/view/PageContainer.tsx | 8 +- .../v2/view/pages/video_mocap/VideoMocap.tsx | 88 ++++++++----- .../components/pageInferenceStatuses.tsx | 47 +++++++ .../components/pageVideoProvision.tsx | 39 ++++++ .../components/tabContentLibrary.tsx | 3 +- .../components/tabContentUpload.tsx | 124 +++++++++++++----- 10 files changed, 296 insertions(+), 68 deletions(-) create mode 100644 packages/components/src/api/video_mocap/EnqueueVideoMotionCapture.ts create mode 100644 packages/components/src/api/video_mocap/index.ts create mode 100644 packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx create mode 100644 packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageVideoProvision.tsx diff --git a/packages/components/src/api/ApiConfig.ts b/packages/components/src/api/ApiConfig.ts index 7d9b4e8135..6d915810d8 100644 --- a/packages/components/src/api/ApiConfig.ts +++ b/packages/components/src/api/ApiConfig.ts @@ -471,6 +471,11 @@ class ApiConfig { return `${this.getApiOrigin()}/v1/animation/face_animation/create`; } + // =============== Motion Capture / mocap =============== + enqueueVideoMotionCapture(): string{ + return `${this.getApiOrigin()}/v1/mocap/mocapnet/create` + } + // =============== Generic Model Downloads =============== enqueueRemoteDownloadJob(): string { diff --git a/packages/components/src/api/video_mocap/EnqueueVideoMotionCapture.ts b/packages/components/src/api/video_mocap/EnqueueVideoMotionCapture.ts new file mode 100644 index 0000000000..5652109927 --- /dev/null +++ b/packages/components/src/api/video_mocap/EnqueueVideoMotionCapture.ts @@ -0,0 +1,42 @@ +import { ApiConfig } from "@storyteller/components"; + +export interface EnqueueVideoMotionCaptureRequest { + uuid_idempotency_token: string, + video_source: string, +} + +export interface EnqueueVideoMotionCaptureResponse { + success: boolean, + inference_job_token?: string, +} + +export async function EnqueueVideoMotionCapture(request: EnqueueVideoMotionCaptureRequest) : Promise +{ + const endpoint = new ApiConfig().enqueueVideoMotionCapture(); + + return await fetch(endpoint, { + method: 'POST', + headers: { + 'Accept': 'application/json', + 'Content-Type': 'application/json', + }, + credentials: 'include', + body: JSON.stringify(request), + }) + .then(res => res.json()) + .then(res => { + if (!res) { + return { success : false }; + } + + if (res && 'success' in res) { + return res; + } else { + return { success : false }; + } + }) + .catch(e => { + return { success : false }; + }); +} + diff --git a/packages/components/src/api/video_mocap/index.ts b/packages/components/src/api/video_mocap/index.ts new file mode 100644 index 0000000000..45a1c2b9c1 --- /dev/null +++ b/packages/components/src/api/video_mocap/index.ts @@ -0,0 +1,7 @@ +export type { + EnqueueVideoMotionCaptureRequest, EnqueueVideoMotionCaptureResponse, +} from './EnqueueVideoMotionCapture'; + +export { + EnqueueVideoMotionCapture +} from './EnqueueVideoMotionCapture'; \ No newline at end of file diff --git a/packages/components/src/jobs/InferenceJob.ts b/packages/components/src/jobs/InferenceJob.ts index 93dca97161..1b529482d7 100644 --- a/packages/components/src/jobs/InferenceJob.ts +++ b/packages/components/src/jobs/InferenceJob.ts @@ -8,6 +8,7 @@ export enum FrontendInferenceJobType { VoiceConversion, VoiceDesignerCreateVoice, VoiceDesignerTts, + VideoMotionCapture } // NB: Many of these fields are optional despite the response payload containing them diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index cf5460547f..8019b9c764 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -659,7 +659,13 @@ class PageContainer extends React.Component< diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx index 9c8e89f123..0c9ac95a45 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx @@ -1,13 +1,46 @@ -import React from "react"; -import { useLocalize } from "hooks"; +import React, { useState, useEffect } from "react"; -import TabContentUpload from "./components/tabContentUpload"; -import TabContentLibrary from "./components/tabContentLibrary"; +import { useLocalize } from "hooks"; +import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; +import { FrontendInferenceJobType, InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; + +import { PageVideoProvision } from "./components/pageVideoProvision"; +import { PageInferenceStatuses } from "./components/pageInferenceStatuses"; import { BasicVideo } from "components/common"; -export default function VideoMotionCapture(){ +export default function VideoMotionCapture(props: { + sessionSubscriptionsWrapper: SessionSubscriptionsWrapper, + enqueueInferenceJob: ( + jobToken: string, + frontendInferenceJobType: FrontendInferenceJobType + ) => void, + inferenceJobs: Array, + inferenceJobsByCategory: Map>, +}){ + + const { enqueueInferenceJob } = props; const { t } = useLocalize("VideoMotionCapture"); + enum pageStates { VIDEO_PROVISION, SHOW_JOB_STATUS } + const { VIDEO_PROVISION, SHOW_JOB_STATUS} = pageStates; + const [pageState, setPageState] = useState<{ + index:number, + inputMediaToken: string, + jobToken: string, + resultMediaToken: string + }>({ index: VIDEO_PROVISION, inputMediaToken: "", jobToken: "", resultMediaToken: ""}); + const handlePageState = ( + {tokenType, token }:{tokenType:string, token:string | undefined} + ) => { + if(token && tokenType == "jobToken"){ + setPageState({ + ...pageState, + index: SHOW_JOB_STATUS, + jobToken: token + }) + } + } + return (
@@ -21,34 +54,25 @@ export default function VideoMotionCapture(){
- {/*Video Chooser Tabs*/} + {/*Video Provision Tabs & Job Statuses*/}
-
    -
  • - -
  • -
  • - -
  • -
-
- - -
+ { pageState.index === VIDEO_PROVISION && + + } + { pageState.index === SHOW_JOB_STATUS && + + }
{/*ENDS Video Chooser Tabs*/} diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx new file mode 100644 index 0000000000..a5ea888460 --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx @@ -0,0 +1,47 @@ +import React, { useEffect } from 'react' + +import { Analytics } from "common/Analytics"; +import InferenceJobsList from "components/layout/InferenceJobsList"; +import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob"; + +export function PageInferenceStatuses (props:{ + t: Function, + pageStates: Object, + pageState: { + index:number, + inputMediaToken: string, + jobToken: string, + resultMediaToken: string + }, + enqueueInferenceJob: ( + jobToken: string, + frontendInferenceJobType: FrontendInferenceJobType + ) => void, + pageStateCallback: (data:{tokenType:string, token:string | undefined}) => void +}){ + const { enqueueInferenceJob } = props; + useEffect(()=>{ + console.log("ENQUEUE INFERENCE JOB>>") + enqueueInferenceJob( + props.pageState.jobToken, + FrontendInferenceJobType.VideoMotionCapture + ); + }, []) + + const failures = (fail = "") => { + switch (fail) { + case "sample case": + return "Sample Case, this should not have been shown"; + default: + return "Uknown failure"; + } + }; + + return( + Analytics.voiceConversionClickDownload(), + jobType: FrontendInferenceJobType.VideoMotionCapture, + }}/> + ) +} \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageVideoProvision.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageVideoProvision.tsx new file mode 100644 index 0000000000..65bb821b75 --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageVideoProvision.tsx @@ -0,0 +1,39 @@ +import React from "react"; +import TabContentUpload from "./tabContentUpload"; +import TabContentLibrary from "./tabContentLibrary"; + +export function PageVideoProvision (props:{ + t: Function + pageStateCallback: (data:{tokenType:string, token:string | undefined}) => void +}){ + const {t} = props; + return(<> +
    +
  • + +
  • +
  • + +
  • +
+
+ + +
+ ); +} \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentLibrary.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentLibrary.tsx index 926d22611d..af5368fb9f 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentLibrary.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentLibrary.tsx @@ -1,7 +1,8 @@ import React from "react"; export default function TabContentLibrary(props: { - t: Function + t: Function, + pageStateCallback: Function }){ const { t } = props return( diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx index ad294938a5..51927725cf 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx @@ -2,20 +2,25 @@ import React, {useState, useEffect} from "react"; import { v4 as uuidv4 } from "uuid"; import { UploadVideo } from '@storyteller/components/src/api/upload/UploadVideo' +import { + EnqueueVideoMotionCapture +} from "@storyteller/components/src/api/video_mocap"; import { useFile } from "hooks"; import VideoInput from "v2/view/pages/video_mocap/components/VideoInput"; export default function TabContentUpload(props:{ t: Function + pageStateCallback: (data:{tokenType:string, token:string | undefined}) => void }){ - const { t } = props + const { t, pageStateCallback } = props const videoProps = useFile({}) - const NO_FILE = 0 - const FILE_STAGED = 1 - const FILE_UPLOADING = 2 - const FILE_UPLOADED = 3 - const [videoState, setVideoState] = useState(NO_FILE); + enum tabStates { + NO_FILE, FILE_STAGED, FILE_UPLOADING, FILE_UPLOADED + } + const { NO_FILE, FILE_STAGED, FILE_UPLOADING, FILE_UPLOADED } = tabStates; + const [tabState, setTabState] = useState(NO_FILE); + const [token, setToken] = useState(""); const makeRequest = () => ({ uuid_idempotency_token: uuidv4(), @@ -25,39 +30,90 @@ export default function TabContentUpload(props:{ }); const handleUploadVideo = ()=>{ - setVideoState(FILE_UPLOADING) + setTabState(FILE_UPLOADING) UploadVideo(makeRequest()).then((res=>{ - console.log("RESPONSE >>>") - console.log(res) - setVideoState(FILE_UPLOADED) + if(res.success && "upload_token" in res){ + setToken(res.upload_token) + } })); } - // contains upload inout state and controls, see docs - return( -
-
-
- setVideoState(videoProps.file ? FILE_STAGED : NO_FILE), - }}/> -
-
+ useEffect(()=>{ + if (token!=="") setTabState(FILE_UPLOADED) + }, [token]) -
-
-
- - + const handleEnqueueMocapNet = ()=>{ + const request = { + video_source: token, + uuid_idempotency_token: uuidv4() + } + EnqueueVideoMotionCapture(request) + .then(res=>{ + pageStateCallback({ + tokenType: "jobToken", + token: res.inference_job_token + }) + }); + } + // contains upload inout state and controls, see docs + if (tabState === NO_FILE || tabState === FILE_STAGED){ + return( +
+
+
+ setTabState(videoProps.file ? FILE_STAGED : NO_FILE), + }}/>
+ +
+
+
+ +
+
+
+
+ ) + } else if (tabState === FILE_UPLOADING){ + return( +
+
+
+

{t("tab.message.fileUploading")}

+
+
+
+ ) + }else if (tabState === FILE_UPLOADED){ + return( +
+
+
+

{t("tab.message.fileUploaded")}

+
+
+ +
+
+
+ ) + }else { + return( +
+
+
+

{t("tab.message.error")}

+
-
- ) +
+ ) + } } \ No newline at end of file From 02d32fc9c1c4646d1c6749c48de7939cb4ec0df3 Mon Sep 17 00:00:00 2001 From: dev Date: Thu, 18 Jan 2024 18:42:51 -0500 Subject: [PATCH 2/4] got inference ID, cannot show inference job list --- .../public/locales/bn/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/de/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/en/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/es/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/fr/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/hi/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/id/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/it/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/ja/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/ko/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/pt/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/ru/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/th/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/tr/VideoMotionCapture.json | 11 +++++++++++ .../public/locales/vi/VideoMotionCapture.json | 11 +++++++++++ .../locales/zh-Hans/VideoMotionCapture.json | 11 +++++++++++ .../v2/view/pages/video_mocap/VideoMocap.tsx | 4 ++-- .../components/pageInferenceStatuses.tsx | 17 +++++++++++------ .../video_mocap/components/tabContentUpload.tsx | 16 +++++++++++++--- 19 files changed, 202 insertions(+), 11 deletions(-) diff --git a/packages/fakeyou.com/public/locales/bn/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/bn/VideoMotionCapture.json index e9b83d9c67..b9e04712e3 100644 --- a/packages/fakeyou.com/public/locales/bn/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/bn/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "একটি ভিডিও আপলোড করুন বা এখানে ড্রপ করুন...", "filenamePlaceholder": "মিডিয়া থেকে বেছে নিন" }, + "message": { + "unknownError": "অজানা ত্রুটি" + }, + "tab": { + "message": { + "fileUploaded": "ভিডিও আপলোড করা হয়েছে", + "fileUploading": "ভিডিও আপলোড হচ্ছে", + "mocapNetRequestSucceed": "মোশন ক্যাপচার অনুরোধ সফল", + "mocapNetRequesting": "মোশন ক্যাপচারের অনুরোধ করা হচ্ছে" + } + }, "tabTitle": { "library": "মিডিয়া থেকে বেছে নিন", "upload": "আপলোড করুন" diff --git a/packages/fakeyou.com/public/locales/de/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/de/VideoMotionCapture.json index 6ecadf8492..fa9148a70e 100644 --- a/packages/fakeyou.com/public/locales/de/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/de/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "Laden Sie ein Video hoch oder legen Sie es hier ab...", "filenamePlaceholder": "Wählen Sie aus Medien" }, + "message": { + "unknownError": "Unbekannter Fehler" + }, + "tab": { + "message": { + "fileUploaded": "Video hochgeladen", + "fileUploading": "Hochladen von Videos", + "mocapNetRequestSucceed": "Motion Capture-Anfrage erfolgreich", + "mocapNetRequesting": "Motion Capture wird angefordert" + } + }, "tabTitle": { "library": "Wählen Sie aus Medien", "upload": "Hochladen" diff --git a/packages/fakeyou.com/public/locales/en/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/en/VideoMotionCapture.json index 1ea6df47dd..ad5a57d80a 100644 --- a/packages/fakeyou.com/public/locales/en/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/en/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "Upload a video or drop it here...", "filenamePlaceholder": "Choose from media" }, + "message": { + "unknownError": "Unknown Error" + }, + "tab": { + "message": { + "fileUploaded": "Video Uploaded", + "fileUploading": "Video Uploading", + "mocapNetRequestSucceed": "Motion Capture Request Succeed", + "mocapNetRequesting": "Requesting Motion Capture" + } + }, "tabTitle": { "library": "Choose from media", "upload": "Upload" diff --git a/packages/fakeyou.com/public/locales/es/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/es/VideoMotionCapture.json index d773539d65..d578cce158 100644 --- a/packages/fakeyou.com/public/locales/es/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/es/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "Sube un vídeo o déjalo aquí...", "filenamePlaceholder": "Elige entre los medios" }, + "message": { + "unknownError": "Error desconocido" + }, + "tab": { + "message": { + "fileUploaded": "Vídeo subido", + "fileUploading": "Carga de vídeo", + "mocapNetRequestSucceed": "Solicitud de captura de movimiento exitosa", + "mocapNetRequesting": "Solicitar captura de movimiento" + } + }, "tabTitle": { "library": "Elige entre los medios", "upload": "Subir" diff --git a/packages/fakeyou.com/public/locales/fr/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/fr/VideoMotionCapture.json index 64b5dc635d..4d1d4d5fc7 100644 --- a/packages/fakeyou.com/public/locales/fr/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/fr/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "Téléchargez une vidéo ou déposez-la ici...", "filenamePlaceholder": "Choisissez parmi les médias" }, + "message": { + "unknownError": "Erreur inconnue" + }, + "tab": { + "message": { + "fileUploaded": "Vidéo téléchargée", + "fileUploading": "Téléchargement de vidéo", + "mocapNetRequestSucceed": "La demande de capture de mouvement a réussi", + "mocapNetRequesting": "Demander une capture de mouvement" + } + }, "tabTitle": { "library": "Choisissez parmi les médias", "upload": "Télécharger" diff --git a/packages/fakeyou.com/public/locales/hi/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/hi/VideoMotionCapture.json index 20435ed93e..1d9922b50e 100644 --- a/packages/fakeyou.com/public/locales/hi/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/hi/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "एक वीडियो अपलोड करें या इसे यहां छोड़ें...", "filenamePlaceholder": "मीडिया से चुनें" }, + "message": { + "unknownError": "अज्ञात त्रुटि" + }, + "tab": { + "message": { + "fileUploaded": "वीडियो अपलोड किया गया", + "fileUploading": "वीडियो अपलोडिंग", + "mocapNetRequestSucceed": "मोशन कैप्चर अनुरोध सफल", + "mocapNetRequesting": "मोशन कैप्चर का अनुरोध" + } + }, "tabTitle": { "library": "मीडिया से चुनें", "upload": "डालना" diff --git a/packages/fakeyou.com/public/locales/id/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/id/VideoMotionCapture.json index 5efb8557c9..097059d799 100644 --- a/packages/fakeyou.com/public/locales/id/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/id/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "Unggah video atau letakkan di sini...", "filenamePlaceholder": "Pilih dari media" }, + "message": { + "unknownError": "Kesalahan yang tidak diketahui" + }, + "tab": { + "message": { + "fileUploaded": "Video Diunggah", + "fileUploading": "Mengunggah Video", + "mocapNetRequestSucceed": "Permintaan Tangkapan Gerakan Berhasil", + "mocapNetRequesting": "Meminta Pengambilan Gerakan" + } + }, "tabTitle": { "library": "Pilih dari media", "upload": "Mengunggah" diff --git a/packages/fakeyou.com/public/locales/it/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/it/VideoMotionCapture.json index d4a1e6a382..8271f024ad 100644 --- a/packages/fakeyou.com/public/locales/it/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/it/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "Carica un video o rilascialo qui...", "filenamePlaceholder": "Scegli tra i media" }, + "message": { + "unknownError": "Errore sconosciuto" + }, + "tab": { + "message": { + "fileUploaded": "Video caricato", + "fileUploading": "Caricamento video", + "mocapNetRequestSucceed": "La richiesta di acquisizione del movimento è riuscita", + "mocapNetRequesting": "Richiesta di Motion Capture" + } + }, "tabTitle": { "library": "Scegli tra i media", "upload": "Caricamento" diff --git a/packages/fakeyou.com/public/locales/ja/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/ja/VideoMotionCapture.json index e62254bdca..f9d252c53c 100644 --- a/packages/fakeyou.com/public/locales/ja/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/ja/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "ビデオをアップロードするか、ここにドロップしてください...", "filenamePlaceholder": "メディアから選ぶ" }, + "message": { + "unknownError": "不明なエラー" + }, + "tab": { + "message": { + "fileUploaded": "アップロードされたビデオ", + "fileUploading": "ビデオのアップロード", + "mocapNetRequestSucceed": "モーション キャプチャ リクエストが成功しました", + "mocapNetRequesting": "モーションキャプチャのリクエスト" + } + }, "tabTitle": { "library": "メディアから選ぶ", "upload": "アップロード" diff --git a/packages/fakeyou.com/public/locales/ko/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/ko/VideoMotionCapture.json index 188d978e74..7e6b8a2454 100644 --- a/packages/fakeyou.com/public/locales/ko/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/ko/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "동영상을 업로드하거나 여기에 드롭하세요.", "filenamePlaceholder": "미디어에서 선택" }, + "message": { + "unknownError": "알수없는 오류" + }, + "tab": { + "message": { + "fileUploaded": "동영상 업로드됨", + "fileUploading": "비디오 업로드", + "mocapNetRequestSucceed": "모션 캡처 요청 성공", + "mocapNetRequesting": "모션 캡처 요청" + } + }, "tabTitle": { "library": "미디어에서 선택", "upload": "업로드" diff --git a/packages/fakeyou.com/public/locales/pt/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/pt/VideoMotionCapture.json index c40d3de3fc..f1abc9399b 100644 --- a/packages/fakeyou.com/public/locales/pt/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/pt/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "Carregue um vídeo ou solte-o aqui...", "filenamePlaceholder": "Escolha entre mídias" }, + "message": { + "unknownError": "Erro desconhecido" + }, + "tab": { + "message": { + "fileUploaded": "Vídeo enviado", + "fileUploading": "Envio de vídeo", + "mocapNetRequestSucceed": "Solicitação de captura de movimento bem-sucedida", + "mocapNetRequesting": "Solicitando captura de movimento" + } + }, "tabTitle": { "library": "Escolha entre mídias", "upload": "Carregar" diff --git a/packages/fakeyou.com/public/locales/ru/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/ru/VideoMotionCapture.json index de422a3bd7..a39df3abc0 100644 --- a/packages/fakeyou.com/public/locales/ru/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/ru/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "Загрузите видео или оставьте его здесь...", "filenamePlaceholder": "Выбирайте из медиа" }, + "message": { + "unknownError": "Неизвестная ошибка" + }, + "tab": { + "message": { + "fileUploaded": "Видео загружено", + "fileUploading": "Загрузка видео", + "mocapNetRequestSucceed": "Запрос на захват движения выполнен успешно", + "mocapNetRequesting": "Запрос захвата движения" + } + }, "tabTitle": { "library": "Выбирайте из медиа", "upload": "Загрузить" diff --git a/packages/fakeyou.com/public/locales/th/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/th/VideoMotionCapture.json index 2d6d8dcd17..8343ae3912 100644 --- a/packages/fakeyou.com/public/locales/th/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/th/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "อัปโหลดวิดีโอหรือวางที่นี่...", "filenamePlaceholder": "เลือกจากสื่อ" }, + "message": { + "unknownError": "ข้อผิดพลาดที่ไม่รู้จัก" + }, + "tab": { + "message": { + "fileUploaded": "อัปโหลดวิดีโอแล้ว", + "fileUploading": "การอัปโหลดวิดีโอ", + "mocapNetRequestSucceed": "คำขอจับภาพเคลื่อนไหวสำเร็จ", + "mocapNetRequesting": "การขอจับภาพเคลื่อนไหว" + } + }, "tabTitle": { "library": "เลือกจากสื่อ", "upload": "อัพโหลด" diff --git a/packages/fakeyou.com/public/locales/tr/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/tr/VideoMotionCapture.json index ae8fff8328..b58cfca174 100644 --- a/packages/fakeyou.com/public/locales/tr/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/tr/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "Bir video yükleyin veya buraya bırakın...", "filenamePlaceholder": "Medya arasından seçim yapın" }, + "message": { + "unknownError": "Bilinmeyen hata" + }, + "tab": { + "message": { + "fileUploaded": "Video Yüklendi", + "fileUploading": "Video Yükleme", + "mocapNetRequestSucceed": "Hareket Yakalama İsteği Başarılı", + "mocapNetRequesting": "Hareket Yakalama Talebi" + } + }, "tabTitle": { "library": "Medya arasından seçim yapın", "upload": "Yüklemek" diff --git a/packages/fakeyou.com/public/locales/vi/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/vi/VideoMotionCapture.json index 2f685064d8..73c80f1200 100644 --- a/packages/fakeyou.com/public/locales/vi/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/vi/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "Tải video lên hoặc thả video vào đây...", "filenamePlaceholder": "Chọn từ phương tiện truyền thông" }, + "message": { + "unknownError": "Lỗi không rõ" + }, + "tab": { + "message": { + "fileUploaded": "Video đã tải lên", + "fileUploading": "Tải lên video", + "mocapNetRequestSucceed": "Yêu cầu chụp chuyển động thành công", + "mocapNetRequesting": "Yêu cầu chụp chuyển động" + } + }, "tabTitle": { "library": "Chọn từ phương tiện truyền thông", "upload": "Tải lên" diff --git a/packages/fakeyou.com/public/locales/zh-Hans/VideoMotionCapture.json b/packages/fakeyou.com/public/locales/zh-Hans/VideoMotionCapture.json index 99828ab29a..72498d9a3f 100644 --- a/packages/fakeyou.com/public/locales/zh-Hans/VideoMotionCapture.json +++ b/packages/fakeyou.com/public/locales/zh-Hans/VideoMotionCapture.json @@ -12,6 +12,17 @@ "dropzoneDescription": "上传视频或将其拖放到此处...", "filenamePlaceholder": "从媒体中选择" }, + "message": { + "unknownError": "未知错误" + }, + "tab": { + "message": { + "fileUploaded": "视频已上传", + "fileUploading": "视频上传", + "mocapNetRequestSucceed": "动作捕捉请求成功", + "mocapNetRequesting": "请求动作捕捉" + } + }, "tabTitle": { "library": "从媒体中选择", "upload": "上传" diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx index 0c9ac95a45..02da615b0d 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from "react"; +import React, { useState } from "react"; import { useLocalize } from "hooks"; import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; @@ -32,7 +32,7 @@ export default function VideoMotionCapture(props: { const handlePageState = ( {tokenType, token }:{tokenType:string, token:string | undefined} ) => { - if(token && tokenType == "jobToken"){ + if(token && tokenType === "jobToken"){ setPageState({ ...pageState, index: SHOW_JOB_STATUS, diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx index a5ea888460..41fffd5921 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx @@ -19,7 +19,7 @@ export function PageInferenceStatuses (props:{ ) => void, pageStateCallback: (data:{tokenType:string, token:string | undefined}) => void }){ - const { enqueueInferenceJob } = props; + const { t, pageState, enqueueInferenceJob } = props; useEffect(()=>{ console.log("ENQUEUE INFERENCE JOB>>") enqueueInferenceJob( @@ -38,10 +38,15 @@ export function PageInferenceStatuses (props:{ }; return( - Analytics.voiceConversionClickDownload(), - jobType: FrontendInferenceJobType.VideoMotionCapture, - }}/> + <> +

{t("tab.message.mocapNetRequestSucceed")}

+

Job Token: {pageState.jobToken}

+ + Analytics.voiceConversionClickDownload(), + jobType: FrontendInferenceJobType.VideoMotionCapture, + }}/> + ) } \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx index 51927725cf..5d550b0d0f 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx @@ -16,9 +16,9 @@ export default function TabContentUpload(props:{ const { t, pageStateCallback } = props const videoProps = useFile({}) enum tabStates { - NO_FILE, FILE_STAGED, FILE_UPLOADING, FILE_UPLOADED + NO_FILE, FILE_STAGED, FILE_UPLOADING, FILE_UPLOADED, MOCAPNET } - const { NO_FILE, FILE_STAGED, FILE_UPLOADING, FILE_UPLOADED } = tabStates; + const { NO_FILE, FILE_STAGED, FILE_UPLOADING, FILE_UPLOADED, MOCAPNET } = tabStates; const [tabState, setTabState] = useState(NO_FILE); const [token, setToken] = useState(""); @@ -105,12 +105,22 @@ export default function TabContentUpload(props:{
) + } else if (tabState === MOCAPNET){ + return( +
+
+
+

{t("tab.message.mocapNetRequesting")}

+
+
+
+ ) }else { return(
-

{t("tab.message.error")}

+

{t("message.UnknownError")}

From e9f3c99848b12c6902d4f646c4ee6441179ff575 Mon Sep 17 00:00:00 2001 From: dev Date: Thu, 18 Jan 2024 19:03:35 -0500 Subject: [PATCH 3/4] mocap net request message added --- .../v2/view/pages/video_mocap/components/tabContentUpload.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx index 5d550b0d0f..624ba2dbab 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx @@ -53,6 +53,7 @@ export default function TabContentUpload(props:{ token: res.inference_job_token }) }); + setTabState(MOCAPNET) } // contains upload inout state and controls, see docs if (tabState === NO_FILE || tabState === FILE_STAGED){ From 7f4cd0ae4e1630701ebc2e0a84ac18189d0a9e38 Mon Sep 17 00:00:00 2001 From: dev Date: Thu, 18 Jan 2024 19:14:37 -0500 Subject: [PATCH 4/4] dirtyfix: mocap request now pretends to be a face anime request to nudge the inference job list to show itself --- .../src/components/layout/InferenceJobsList/JobItem.tsx | 1 + .../pages/video_mocap/components/pageInferenceStatuses.tsx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/fakeyou.com/src/components/layout/InferenceJobsList/JobItem.tsx b/packages/fakeyou.com/src/components/layout/InferenceJobsList/JobItem.tsx index 6a2c180732..ee119a268f 100644 --- a/packages/fakeyou.com/src/components/layout/InferenceJobsList/JobItem.tsx +++ b/packages/fakeyou.com/src/components/layout/InferenceJobsList/JobItem.tsx @@ -104,6 +104,7 @@ export default function JobItem({ failures, maybeFailureCategory, maybeResultTok { t(`${jobType}.${jobStatus}`) } + Token: {jobToken} { isComplete ? subtitle + " >" : subtitle }
; diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx index 41fffd5921..0a30989f18 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx @@ -24,7 +24,7 @@ export function PageInferenceStatuses (props:{ console.log("ENQUEUE INFERENCE JOB>>") enqueueInferenceJob( props.pageState.jobToken, - FrontendInferenceJobType.VideoMotionCapture + FrontendInferenceJobType.FaceAnimation ); }, []) @@ -45,7 +45,7 @@ export function PageInferenceStatuses (props:{ Analytics.voiceConversionClickDownload(), - jobType: FrontendInferenceJobType.VideoMotionCapture, + jobType: FrontendInferenceJobType.FaceAnimation, }}/> )