DevUpload uses useMediaUploader

This commit is contained in:
Victor committed 2024-03-13 16:45:29 -07:00
1 parent f37cc1d8f1
commit 6703e9fcc2
8 files changed
+218 -264

No files matched your search

@@ -35,14 +35,13 @@ export default function EntityInputEmpty({ accept, open, inputMode, inputProps,
const mediaIcons = () => {
switch (accepted[0]) {
case "audio": return faWaveform;
case "image": return faImage;
case "mp3": return faWaveform;
case "jpg": return faImage;
case "bvh": return faPersonWalking;
default: return faFile;
}
};
const supported = `${ accepted.length ? accepted.join(", ") : accepted[0] } files supported`;
return <>
@@ -1,3 +1,5 @@
import { enumToKeyArr } from "resources";
export enum EntityInputMode {
bookmarks,
media,
@@ -10,10 +12,7 @@ export enum MediaFilters {
audio,
image,
video,
bvh,
glb,
gltf,
fbx
engine_asset
}
export enum WeightsFilters {
@@ -36,19 +35,46 @@ export enum WeightsCategories {
voiceConversion
}
export type EntityModeProp = keyof typeof EntityInputMode;
export type MediaFilterProp = keyof typeof MediaFilters;
export type WeightFilterProp = keyof typeof WeightsFilters;
export type WeightCategoriesProp = keyof typeof WeightsCategories;
export type AcceptTypes = MediaFilterProp | WeightFilterProp;
export type JobSelection = WeightCategoriesProp | WeightFilterProp;
export enum EntityType {
unknown,
media,
weights
}
export enum EngineTypes {
bvh,
fbx,
glb,
gltf,
obj,
ron
}
export enum AudioTypes {
mp3,
wav
}
export enum ImageTypes {
jpg,
png
}
export enum VideoTypes {
mp4,
}
export type EntityModeProp = keyof typeof EntityInputMode;
export type MediaFilterProp = keyof typeof MediaFilters;
export type WeightFilterProp = keyof typeof WeightsFilters;
export type EngineFilterProp = keyof typeof EngineTypes;
export type AudioFilterProp = keyof typeof AudioTypes;
export type ImageFilterProp = keyof typeof ImageTypes;
export type VideoFilterProp = keyof typeof VideoTypes;
export type WeightCategoriesProp = keyof typeof WeightsCategories;
export type AcceptTypes = EngineFilterProp | AudioFilterProp | ImageFilterProp | VideoFilterProp | WeightFilterProp;
export type JobSelection = WeightCategoriesProp | WeightFilterProp;
export const ListEntityFilters = (mode?: number) => {
const bookmarkFilters = Object.keys({ ...MediaFilters, ...WeightsFilters }).filter(val => isNaN(Number(val))).reduce((obj,current) => ({ ...obj, [current]: current }),{});
@@ -62,4 +88,26 @@ export const EntityFilterOptions = (mode?: EntityInputMode, t = (v:string) => v)
if (typeof value === "string") return { value, label: t(value) }
return { label: "all", value: "all" };
});
};
};
export const isSelectedType = (mode: MediaFilters, fileExtension: string) => enumToKeyArr([
{ ...AudioTypes, ...ImageTypes, ...VideoTypes, ...EngineTypes },
AudioTypes,
ImageTypes,
VideoTypes,
EngineTypes
][mode]).includes(fileExtension);
export const getMediaCategory = (fileExtension: string) => {
console.log("🍔",isSelectedType(MediaFilters.image,fileExtension));
isSelectedType(MediaFilters.image,fileExtension);
if (isSelectedType(MediaFilters.engine_asset, fileExtension)) return MediaFilters.engine_asset;
if (isSelectedType(MediaFilters.audio, fileExtension)) return MediaFilters.audio;
if (isSelectedType(MediaFilters.image, fileExtension)) return MediaFilters.image;
if (isSelectedType(MediaFilters.video, fileExtension)) return MediaFilters.video;
return MediaFilters.all; // will change to "unknown" eventually
}
+2
View File
@@ -14,6 +14,7 @@ import useLazyLists from './useLazyLists';
import useListContent from './useListContent';
import useLocalize from './useLocalize';
import useMedia from './useMedia';
import useMediaUploader from './useMediaUploader';
import useModal from './useModal';
import useNotifications from './useNotifications';
import useOnScreen from "./useOnScreen";
@@ -44,6 +45,7 @@ export {
useListContent,
useLocalize,
useMedia,
useMediaUploader,
useModal,
useNotifications,
useOnScreen,
@@ -19,7 +19,7 @@ export default function useFile({ debug, onChange = n, onClear = n }: Props) {
blobSet(inputFile ? URL.createObjectURL(inputFile) : "");
};
const inputChange = ({ target = {} }: { target: any }) => {
fileChange(target.value);
fileChange(target.files ? target.files[0] : target.value);
};
const clear = () => {
if (inputRef?.current?.value) inputRef.current.value = '';
@@ -0,0 +1 @@
export { default } from "./useMediaUploader";
@@ -0,0 +1,62 @@
import { useState } from "react";
import { useFile } from "hooks";
import { v4 as uuidv4 } from "uuid";
import { isSelectedType, MediaFilters } from "components/entities/EntityTypes";
import { UploadMedia, UploadMediaResponse } from "@storyteller/components/src/api/media_files/UploadMedia";
import {
UploadEngineAsset,
UploadEngineAssetResponse
}from "@storyteller/components/src/api/media_files/UploadEngineAsset";
import { MediaFileSubtype } from "@storyteller/components/src/api/enums/MediaFileSubtype";
import { GetFileTypeByExtension as extension } from "@storyteller/components/src/utils/GetFileTypeByExtension";
type UploaderResponse = UploadEngineAssetResponse | UploadMediaResponse;
interface Props {
onSuccess?: (res: UploaderResponse) => any;
}
const n = () => {};
export default function useMediaUploader({ onSuccess = n }: Props) {
const [engineSubtype,engineSubtypeSet] = useState<MediaFileSubtype | undefined>();
const createUpload = (inputFile: File, todo = n ) => {
const fileExtension = extension(inputFile.name || "");
const isEngineAsset = isSelectedType(MediaFilters.engine_asset, fileExtension);
const baseConfig = { uuid_idempotency_token: uuidv4(), file: inputFile };
const engineConfig = { ...baseConfig, media_file_subtype: engineSubtype };
const mediaConfig = { ...baseConfig, source: "file" };
const uploader = isEngineAsset ? UploadEngineAsset(engineConfig) : UploadMedia(mediaConfig);
if (inputFile) {
uploader
.then((res: UploaderResponse) => {
if ("media_file_token" in res) {
onSuccess(res);
todo();
}
});
}
};
const { file, clear, inputProps } = useFile({});
const upload = () => createUpload(file,clear);
const engineSubtypeChange = ({ target }: { target: any }) => engineSubtypeSet(target.value);
return {
clear,
engineSubtype,
engineSubtypeChange,
file,
inputProps,
isAudio: isSelectedType(MediaFilters.audio, extension(file?.name || "")),
isEngineAsset: isSelectedType(MediaFilters.engine_asset, extension(file?.name || "")),
isImage: isSelectedType(MediaFilters.image, extension(file?.name || "")),
isVideo: isSelectedType(MediaFilters.video, extension(file?.name || "")),
upload
}
};
@@ -1,142 +1,47 @@
import React, { useState } from "react";
import Panel from "components/common/Panel";
import Container from "components/common/Container";
import PageHeader from "components/layout/PageHeader";
import { useSession } from "hooks";
import { Button } from "components/common";
import { useMediaUploader, useSession } from "hooks";
import { Button, Container, Panel } from "components/common";
import { faUpload } from "@fortawesome/pro-solid-svg-icons";
import { FileType, GetFileTypeByExtension } from "@storyteller/components/src/utils/GetFileTypeByExtension";
import { UploadMedia, UploadMediaResponse, } from "@storyteller/components/src/api/media_files/UploadMedia";
import { UploadEngineAsset, UploadEngineAssetResponse, } from "@storyteller/components/src/api/media_files/UploadEngineAsset";
import { MediaFileSubtype } from "@storyteller/components/src/api/enums/MediaFileSubtype";
import { v4 as uuidv4 } from "uuid";
import { Link } from "react-router-dom";
enum UploadType {
EngineAsset = "engine_asset",
Image = "image",
Audio = "audio",
Video = "video",
Unknown = "unknown",
}
interface DevUploadProps {}
export default function DevUpload(props: DevUploadProps) {
const { studioAccessCheck } = useSession();
const [file, fileSet] = useState<File | null>(null);
const [maybeMediaFileSubtype, maybeMediaFileSubtypeSet] = useState<MediaFileSubtype | undefined>(undefined);
const [uploadType, uploadTypeSet] = useState<UploadType>(UploadType.Unknown);
const [tokens, tokensSet] = useState<string[]>([]);
const { engineSubtype, engineSubtypeChange, file, inputProps, isEngineAsset, isVideo, upload } = useMediaUploader({
onSuccess: (res: any) => tokensSet([res.media_file_token, ...tokens])
});
const handleFileChange = (event: any) => {
const maybeFile = event.target.files[0];
const fileType = GetFileTypeByExtension(maybeFile?.name || "");
let uploadType = UploadType.Unknown;
switch (fileType) {
case FileType.Bvh:
case FileType.Fbx:
case FileType.Glb:
case FileType.Gltf:
case FileType.Obj:
case FileType.Ron:
uploadType = UploadType.EngineAsset;
break;
case FileType.Jpg:
case FileType.Png:
uploadType = UploadType.Image;
break;
case FileType.Mp3:
case FileType.Wav:
uploadType = UploadType.Audio;
break;
case FileType.Mp4:
uploadType = UploadType.Video;
break;
case FileType.Unknown:
default:
uploadType = UploadType.Unknown;
break;
}
fileSet(maybeFile);
uploadTypeSet(uploadType);
};
const handleSubtypeChange = (ev: React.FormEvent<HTMLSelectElement>) => {
const value = (ev.target as HTMLSelectElement).value;
const maybeSubtype = value as MediaFileSubtype;
maybeMediaFileSubtypeSet(maybeSubtype);
}
const handleUpload = () => {
if (!file) {
console.error("no file specified for upload");
return;
}
switch(uploadType) {
case UploadType.EngineAsset:
UploadEngineAsset({
uuid_idempotency_token: uuidv4(),
file,
media_file_subtype: maybeMediaFileSubtype,
})
.then((res: UploadEngineAssetResponse) => {
if ("media_file_token" in res) {
tokensSet([res.media_file_token, ...tokens]);
fileSet(null);
}
});
break;
default:
UploadMedia({
uuid_idempotency_token: uuidv4(),
file,
source: "file",
})
.then((res: UploadMediaResponse) => {
if ("media_file_token" in res) {
tokensSet([res.media_file_token, ...tokens]);
fileSet(null);
}
});
}
};
const { onChange } = inputProps;
const { studioAccessCheck } = useSession();
let title = "Upload Generic File";
let mediaFileSubtypeForm = <></>;
switch (uploadType) {
case UploadType.Video:
title = "Upload Video";
break;
case UploadType.EngineAsset:
title = "Upload Engine Asset";
mediaFileSubtypeForm = (
<>
<div className="mb-3">
<label htmlFor="fileSubtypeSelect" className="form-label">Engine Media File Subtype</label>
<select
onChange={handleSubtypeChange}
className="form-select"
aria-label="Default select example"
id="fileSubtypeSelect"
value={maybeMediaFileSubtype}
>
<option value={MediaFileSubtype.SceneImport}>Scene Import (default)</option>
<option value={MediaFileSubtype.Mixamo}>Mixamo Animation</option>
<option value={MediaFileSubtype.StorytellerScene}>Storyteller Scene</option>
<option value={MediaFileSubtype.AnimationOnly}>Animation Only</option>
</select>
</div>
</>
);
break;
if (isVideo) { title = "Upload Video"; }
if (isEngineAsset) {
title = "Upload Engine Asset";
mediaFileSubtypeForm = (
<>
<div className="mb-3">
<label htmlFor="fileSubtypeSelect" className="form-label">Engine Media File Subtype</label>
<select
onChange={engineSubtypeChange}
className="form-select"
aria-label="Default select example"
id="fileSubtypeSelect"
value={engineSubtype}
>
<option value={MediaFileSubtype.SceneImport}>Scene Import (default)</option>
<option value={MediaFileSubtype.Mixamo}>Mixamo Animation</option>
<option value={MediaFileSubtype.StorytellerScene}>Storyteller Scene</option>
<option value={MediaFileSubtype.AnimationOnly}>Animation Only</option>
</select>
</div>
</>
);
}
return studioAccessCheck(
@@ -146,7 +51,7 @@ export default function DevUpload(props: DevUploadProps) {
subText="Upload files to the server for testing."
/>
{maybeMediaFileSubtype}
{engineSubtype}
<Panel padding={true}>
<div className="d-flex flex-column gap-5">
@@ -154,12 +59,12 @@ export default function DevUpload(props: DevUploadProps) {
<div className="mb-3">
<label htmlFor="formFile" className="form-label">Select File for Upload</label>
<input
className="form-control form-control-lg"
id="formFile"
type="file"
onChange={handleFileChange}
/>
<input {...{
onChange,
className: "form-control form-control-lg",
type: "file",
id: "formFile"
}}/>
</div>
{mediaFileSubtypeForm}
@@ -169,7 +74,7 @@ export default function DevUpload(props: DevUploadProps) {
disabled={!file}
icon={faUpload}
label="Upload Media"
onClick={handleUpload}
onClick={upload}
/>
</div>
@@ -19,6 +19,9 @@ import {
EnqueueFbxToGltfIsSuccess,
EnqueueFbxToGltfIsError,
} from "@storyteller/components/src/api/file_conversion/EnqueueFbxToGltf";
import { onChanger } from "resources";
import { EntityInput } from "components/entities";
interface FbxToGltfPageProps {
enqueueInferenceJob: (
@@ -30,86 +33,8 @@ interface FbxToGltfPageProps {
export default function FbxToGltfPage({
enqueueInferenceJob,
}: FbxToGltfPageProps) {
const history = useHistory();
const { mediaToken: mediaTokenParam } = useParams<{ mediaToken: string }>();
const [mediaToken, setMediaToken] = useState<string | null>(mediaTokenParam);
const { media: presetFile } = useMedia({
mediaToken: mediaToken ?? undefined,
});
const fileProps = useFile({});
const [isSubmitting, setIsSubmitting] = useState(false);
const [isWorking, setIsWorking] = useState(false);
const { inferenceJobs } = useInferenceJobs(
FrontendInferenceJobType.ConvertFbxtoGltf
);
console.log("inferenceJobs", inferenceJobs);
useEffect(() => {
// If there's a mediaToken, automatically prepare the file for conversion
if (mediaToken && presetFile) {
}
}, [mediaToken, presetFile]);
const clearMediaToken = () => {
// Reset the media token state
setMediaToken(null);
history.push("/fbx-to-gltf");
};
const makeFBXUploadRequest = () => ({
uuid_idempotency_token: uuidv4(),
file: fileProps.file,
source: "file",
type: "fbx/model",
});
const handleUploadFBX = async () => {
try {
const res = await UploadMedia(makeFBXUploadRequest());
if (res.success && res.media_file_token) {
return { upload_token: res.media_file_token };
}
console.error("Upload failed:", res);
return null;
} catch (error) {
console.error("Error in upload:", error);
return null;
}
};
const submit = async () => {
if (isSubmitting) return;
setIsSubmitting(true);
setIsWorking(true);
try {
let uploadToken = mediaToken;
// If no media token, upload the file first
if (!mediaToken && fileProps.file) {
const uploadResponse = await handleUploadFBX();
if (uploadResponse && uploadResponse.upload_token) {
uploadToken = uploadResponse.upload_token;
} else {
console.error("Failed to upload file. Response:", uploadResponse);
throw new Error("File upload failed");
}
}
// Enqueue the conversion job
if (uploadToken) {
await EnqueueConvert({ upload_token: uploadToken });
} else {
console.error("No upload token available for conversion");
}
} catch (error) {
console.error("Error in submit process: ", error);
} finally {
setIsWorking(false);
setIsSubmitting(false);
}
};
const [mediaToken,mediaTokenSet] = useState();
const onChange = onChanger({ mediaTokenSet });
const EnqueueConvert = async ({ upload_token }: any) => {
if (!upload_token) return false;
@@ -156,47 +81,59 @@ export default function FbxToGltfPage({
<Panel padding={true}>
<div className="d-flex flex-column gap-3">
{mediaToken && presetFile ? (
<div>
<label className="sub-title">FBX file from media</label>
<Panel className="panel-inner p-3 rounded">
<div className="d-flex gap-3 align-items-center flex-wrap">
<div className="d-flex gap-3 flex-grow-1 align-items-center">
<FontAwesomeIcon icon={faFile} className="display-6" />
<div>
<h6 className="mb-1">{presetFile.token}</h6>
<p className="opacity-75">
Created by {presetFile.maybe_creator_user?.display_name}
</p>
</div>
</div>
<Button
icon={faTrashAlt}
square={true}
onClick={clearMediaToken}
variant="danger"
small={true}
tooltip="Remove file"
/>
</div>
</Panel>
</div>
) : (
<FileInput
{...fileProps}
label="Select FBX File"
fileTypes={["FBX"]}
mediaToken={mediaToken}
/>
)}
<EntityInput {...{
accept: ["fbx"],
aspectRatio: "landscape",
label: "Choose entity",
name: "mediaToken",
onChange,
owner: "echelon",
type: "media"
}}/>
{
// mediaToken && presetFile ? (
// <div>
// <label className="sub-title">FBX file from media</label>
// <Panel className="panel-inner p-3 rounded">
// <div className="d-flex gap-3 align-items-center flex-wrap">
// <div className="d-flex gap-3 flex-grow-1 align-items-center">
// <FontAwesomeIcon icon={faFile} className="display-6" />
// <div>
// <h6 className="mb-1">{presetFile.token}</h6>
// <p className="opacity-75">
// Created by {presetFile.maybe_creator_user?.display_name}
// </p>
// </div>
// </div>
// <Button
// icon={faTrashAlt}
// square={true}
// onClick={clearMediaToken}
// variant="danger"
// small={true}
// tooltip="Remove file"
// />
// </div>
// </Panel>
// </div>
// ) : (
// <FileInput
// {...fileProps}
// label="Select FBX File"
// fileTypes={["FBX"]}
// mediaToken={mediaToken}
// />
// )
}
<div className="d-flex justify-content-end">
<Button
icon={faArrowRightArrowLeft}
label="Convert to glTF"
onClick={submit}
disabled={!mediaToken && !fileProps.file}
isLoading={isWorking}
// onClick={submit}
disabled={!mediaToken}
isLoading={false} // REPLACE
/>
</div>
</div>