Merge branch 'mvp2/page-mocapnet' into feature/mvp

This commit is contained in:
Victor committed 2024-01-18 21:59:34 -08:00
commit 80268f820d
26 files changed
+485 -76

No files matched your search

+1 -1
View File
@@ -609,4 +609,4 @@ class ApiConfig {
}
}
export { ApiConfig };
export { ApiConfig };
@@ -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<EnqueueVideoMotionCaptureResponse>
{
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 };
});
}
@@ -0,0 +1,7 @@
export type {
EnqueueVideoMotionCaptureRequest, EnqueueVideoMotionCaptureResponse,
} from './EnqueueVideoMotionCapture';
export {
EnqueueVideoMotionCapture
} from './EnqueueVideoMotionCapture';
@@ -9,6 +9,7 @@ export enum FrontendInferenceJobType {
VoiceDesignerCreateVoice,
VoiceDesignerTts,
ImageGeneration,
VideoMotionCapture
}
// NB: Many of these fields are optional despite the response payload containing them
@@ -12,6 +12,17 @@
"dropzoneDescription": "একটি ভিডিও আপলোড করুন বা এখানে ড্রপ করুন...",
"filenamePlaceholder": "মিডিয়া থেকে বেছে নিন"
},
"message": {
"unknownError": "অজানা ত্রুটি"
},
"tab": {
"message": {
"fileUploaded": "ভিডিও আপলোড করা হয়েছে",
"fileUploading": "ভিডিও আপলোড হচ্ছে",
"mocapNetRequestSucceed": "মোশন ক্যাপচার অনুরোধ সফল",
"mocapNetRequesting": "মোশন ক্যাপচারের অনুরোধ করা হচ্ছে"
}
},
"tabTitle": {
"library": "মিডিয়া থেকে বেছে নিন",
"upload": "আপলোড করুন"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -12,6 +12,17 @@
"dropzoneDescription": "एक वीडियो अपलोड करें या इसे यहां छोड़ें...",
"filenamePlaceholder": "मीडिया से चुनें"
},
"message": {
"unknownError": "अज्ञात त्रुटि"
},
"tab": {
"message": {
"fileUploaded": "वीडियो अपलोड किया गया",
"fileUploading": "वीडियो अपलोडिंग",
"mocapNetRequestSucceed": "मोशन कैप्चर अनुरोध सफल",
"mocapNetRequesting": "मोशन कैप्चर का अनुरोध"
}
},
"tabTitle": {
"library": "मीडिया से चुनें",
"upload": "डालना"
@@ -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"
@@ -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"
@@ -12,6 +12,17 @@
"dropzoneDescription": "ビデオをアップロードするか、ここにドロップしてください...",
"filenamePlaceholder": "メディアから選ぶ"
},
"message": {
"unknownError": "不明なエラー"
},
"tab": {
"message": {
"fileUploaded": "アップロードされたビデオ",
"fileUploading": "ビデオのアップロード",
"mocapNetRequestSucceed": "モーション キャプチャ リクエストが成功しました",
"mocapNetRequesting": "モーションキャプチャのリクエスト"
}
},
"tabTitle": {
"library": "メディアから選ぶ",
"upload": "アップロード"
@@ -12,6 +12,17 @@
"dropzoneDescription": "동영상을 업로드하거나 여기에 드롭하세요.",
"filenamePlaceholder": "미디어에서 선택"
},
"message": {
"unknownError": "알수없는 오류"
},
"tab": {
"message": {
"fileUploaded": "동영상 업로드됨",
"fileUploading": "비디오 업로드",
"mocapNetRequestSucceed": "모션 캡처 요청 성공",
"mocapNetRequesting": "모션 캡처 요청"
}
},
"tabTitle": {
"library": "미디어에서 선택",
"upload": "업로드"
@@ -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"
@@ -12,6 +12,17 @@
"dropzoneDescription": "Загрузите видео или оставьте его здесь...",
"filenamePlaceholder": "Выбирайте из медиа"
},
"message": {
"unknownError": "Неизвестная ошибка"
},
"tab": {
"message": {
"fileUploaded": "Видео загружено",
"fileUploading": "Загрузка видео",
"mocapNetRequestSucceed": "Запрос на захват движения выполнен успешно",
"mocapNetRequesting": "Запрос захвата движения"
}
},
"tabTitle": {
"library": "Выбирайте из медиа",
"upload": "Загрузить"
@@ -12,6 +12,17 @@
"dropzoneDescription": "อัปโหลดวิดีโอหรือวางที่นี่...",
"filenamePlaceholder": "เลือกจากสื่อ"
},
"message": {
"unknownError": "ข้อผิดพลาดที่ไม่รู้จัก"
},
"tab": {
"message": {
"fileUploaded": "อัปโหลดวิดีโอแล้ว",
"fileUploading": "การอัปโหลดวิดีโอ",
"mocapNetRequestSucceed": "คำขอจับภาพเคลื่อนไหวสำเร็จ",
"mocapNetRequesting": "การขอจับภาพเคลื่อนไหว"
}
},
"tabTitle": {
"library": "เลือกจากสื่อ",
"upload": "อัพโหลด"
@@ -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"
@@ -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"
@@ -12,6 +12,17 @@
"dropzoneDescription": "上传视频或将其拖放到此处...",
"filenamePlaceholder": "从媒体中选择"
},
"message": {
"unknownError": "未知错误"
},
"tab": {
"message": {
"fileUploaded": "视频已上传",
"fileUploading": "视频上传",
"mocapNetRequestSucceed": "动作捕捉请求成功",
"mocapNetRequesting": "请求动作捕捉"
}
},
"tabTitle": {
"library": "从媒体中选择",
"upload": "上传"
@@ -771,13 +771,13 @@ class PageContainer extends React.Component<
<Route path="/video-mocap/:mediaToken?">
<VideoMocap
// {...{
// enqueueInferenceJob: this.props.enqueueInferenceJob,
// sessionSubscriptionsWrapper:
// this.props.sessionSubscriptionsWrapper,
// inferenceJobs: this.props.inferenceJobs,
// inferenceJobsByCategory: this.props.inferenceJobsByCategory,
// }}
{...{
enqueueInferenceJob: this.props.enqueueInferenceJob,
sessionSubscriptionsWrapper:
this.props.sessionSubscriptionsWrapper,
inferenceJobs: this.props.inferenceJobs,
inferenceJobsByCategory: this.props.inferenceJobsByCategory,
}}
/>
</Route>
@@ -1,13 +1,46 @@
import React from "react";
import { useLocalize } from "hooks";
import React, { useState } 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<InferenceJob>,
inferenceJobsByCategory: Map<FrontendInferenceJobType, Array<InferenceJob>>,
}){
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 (
<div className="container-panel py-4">
<div className="panel p-4">
@@ -21,34 +54,25 @@ export default function VideoMotionCapture(){
<div className="row g-5 mt-1">
{/*Video Chooser Tabs*/}
{/*Video Provision Tabs & Job Statuses*/}
<div className="col-12 col-md-6">
<ul className="nav nav-tabs" id="vmcTab">
<li className="nav-item">
<button
className="nav-link active"
id="vmcUploadTab"
data-bs-toggle="tab"
data-bs-target="#vmcUpload"
>
{t("tabTitle.upload")}
</button>
</li>
<li className="nav-item">
<button
className="nav-link"
id="vmcLibraryTab"
data-bs-toggle="tab"
data-bs-target="#vmcLibrary"
>
{t("tabTitle.library")}
</button>
</li>
</ul>
<div className="tab-content" id="vmcTabContent">
<TabContentUpload t={t}/>
<TabContentLibrary t={t}/>
</div>
{ pageState.index === VIDEO_PROVISION &&
<PageVideoProvision
t={t}
pageStateCallback={handlePageState}
/>
}
{ pageState.index === SHOW_JOB_STATUS &&
<PageInferenceStatuses
{...{
t,
enqueueInferenceJob,
pageStates,
pageState,
pageStateCallback: handlePageState
}}
/>
}
</div>
{/*ENDS Video Chooser Tabs*/}
@@ -0,0 +1,52 @@
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 { t, pageState, enqueueInferenceJob } = props;
useEffect(()=>{
console.log("ENQUEUE INFERENCE JOB>>")
enqueueInferenceJob(
props.pageState.jobToken,
FrontendInferenceJobType.FaceAnimation
);
}, [])
const failures = (fail = "") => {
switch (fail) {
case "sample case":
return "Sample Case, this should not have been shown";
default:
return "Uknown failure";
}
};
return(
<>
<h2>{t("tab.message.mocapNetRequestSucceed")}</h2>
<h4>Job Token: {pageState.jobToken}</h4>
<InferenceJobsList {...{
failures,
onSelect: () => Analytics.voiceConversionClickDownload(),
jobType: FrontendInferenceJobType.FaceAnimation,
}}/>
</>
)
}
@@ -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(<>
<ul className="nav nav-tabs" id="vmcTab">
<li className="nav-item">
<button
className="nav-link active"
id="vmcUploadTab"
data-bs-toggle="tab"
data-bs-target="#vmcUpload"
>
{t("tabTitle.upload")}
</button>
</li>
<li className="nav-item">
<button
disabled
className="nav-link"
id="vmcLibraryTab"
data-bs-toggle="tab"
data-bs-target="#vmcLibrary"
>
{t("tabTitle.library")}
</button>
</li>
</ul>
<div className="tab-content" id="vmcTabContent">
<TabContentUpload {...props}/>
<TabContentLibrary {...props}/>
</div>
</>);
}
@@ -1,7 +1,8 @@
import React from "react";
export default function TabContentLibrary(props: {
t: Function
t: Function,
pageStateCallback: Function
}){
const { t } = props
return(
@@ -1,21 +1,26 @@
import React, {useState} from "react";
import React, { useEffect, useState } 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<number>(NO_FILE);
enum tabStates {
NO_FILE, FILE_STAGED, FILE_UPLOADING, FILE_UPLOADED, MOCAPNET
}
const { NO_FILE, FILE_STAGED, FILE_UPLOADING, FILE_UPLOADED, MOCAPNET } = tabStates;
const [tabState, setTabState] = useState<number>(NO_FILE);
const [token, setToken] = useState<string>("");
const makeRequest = () => ({
uuid_idempotency_token: uuidv4(),
@@ -25,39 +30,101 @@ 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(
<div
className="tab-pane fade show active py-4"
id="vmcUpload"
>
<div className="row">
<div className="col-12">
<VideoInput {...{t, ...videoProps,
onStateChange: () => setVideoState(videoProps.file ? FILE_STAGED : NO_FILE),
}}/>
</div>
</div>
useEffect(()=>{
if (token!=="") setTabState(FILE_UPLOADED)
}, [token])
<div className="row py-3">
<div className="col-12">
<div className="d-flex justify-content-end gap-3">
<button
className="btn btn-primary"
disabled={videoState!==FILE_STAGED}
onClick={handleUploadVideo}
>{t("button.upload")}</button>
<button className="btn btn-primary" disabled={videoState!==FILE_UPLOADED}>{t("button.generate")}</button>
const handleEnqueueMocapNet = ()=>{
const request = {
video_source: token,
uuid_idempotency_token: uuidv4()
}
EnqueueVideoMotionCapture(request)
.then(res=>{
pageStateCallback({
tokenType: "jobToken",
token: res.inference_job_token
})
});
setTabState(MOCAPNET)
}
// contains upload inout state and controls, see docs
if (tabState === NO_FILE || tabState === FILE_STAGED){
return(
<div className="tab-pane fade show active py-4" id="vmcUpload">
<div className="row">
<div className="col-12">
<VideoInput {...{t, ...videoProps,
onStateChange: () => setTabState(videoProps.file ? FILE_STAGED : NO_FILE),
}}/>
</div>
</div>
<div className="row py-3">
<div className="col-12">
<div className="d-flex justify-content-end gap-3">
<button
className="btn btn-primary"
disabled={tabState!==FILE_STAGED}
onClick={handleUploadVideo}
>{t("button.upload")}</button>
</div>
</div>
</div>
</div>
)
} else if (tabState === FILE_UPLOADING){
return(
<div className="tab-pane fade show active py-4" id="vmcUpload">
<div className="row">
<div className="col-12">
<h2>{t("tab.message.fileUploading")}</h2>
</div>
</div>
</div>
)
}else if (tabState === FILE_UPLOADED){
return(
<div className="tab-pane fade show active py-4" id="vmcUpload">
<div className="row">
<div className="col-12">
<h2>{t("tab.message.fileUploaded")}</h2>
</div>
<div className="col-12">
<button
className="btn btn-primary"
onClick={handleEnqueueMocapNet}
>{t("button.generate")}</button>
</div>
</div>
</div>
)
} else if (tabState === MOCAPNET){
return(
<div className="tab-pane fade show active py-4" id="vmcUpload">
<div className="row">
<div className="col-12">
<h2>{t("tab.message.mocapNetRequesting")}</h2>
</div>
</div>
</div>
)
}else {
return(
<div className="tab-pane fade show active py-4" id="vmcUpload">
<div className="row">
<div className="col-12">
<h1>{t("message.UnknownError")}</h1>
</div>
</div>
</div>
)
</div>
)
}
}