Merge branch 'master' into bflat-fy-vd-delete-modal

This commit is contained in:
BFlat authored and GitHub committed 2023-11-17 13:24:10 +07:00
commit 3082848b2e
16 files changed
+480 -33

No files matched your search

@@ -5,8 +5,12 @@ import {
GetPendingTtsJobCountIsOk,
GetPendingTtsJobCountSuccessResponse,
} from "@storyteller/components/src/api/tts/GetPendingTtsJobCount";
import { JobState } from "@storyteller/components/src/jobs/JobStates";
import { InferenceJob } from "@storyteller/components/src/jobs/InferenceJob";
// import { springs } from "resources";
import { useInferenceJobs } from "hooks";
// import { useInferenceJobs } from "hooks";
import { Button } from 'components/common';
import { Analytics } from "common/Analytics";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -14,8 +18,10 @@ import { faChevronRight, faHourglass1, faRemove, faTrophy, faWarning } from "@fo
const DEFAULT_QUEUE_REFRESH_INTERVAL_MILLIS = 15000;
export default function InferenceJobsList({ t }: { t: any }) {
const { inferenceJobs = [] } = useInferenceJobs({ type: 0 });
export default function InferenceJobsList({ t, inferenceJobs }: { t: any, inferenceJobs?: any }) {
// const { inferenceJobs = [] } = useInferenceJobs({ type: 0 });
// const oldJobs = thejobs || inferenceJobs;
console.log("😎",inferenceJobs);
const [pending, pendingSet] = useState<GetPendingTtsJobCountSuccessResponse>({
success: true,
pending_job_count: 0,
@@ -32,6 +38,24 @@ export default function InferenceJobsList({ t }: { t: any }) {
}
};
const processStatus = (job: InferenceJob) => {
switch (job.jobState) {
case JobState.PENDING:
case JobState.UNKNOWN: return 0;
case JobState.STARTED: return 1
case JobState.ATTEMPT_FAILED: return 2;
case JobState.COMPLETE_FAILURE:
case JobState.DEAD: return 3;
case JobState.COMPLETE_SUCCESS: return 4;
default: return -1;
}
};
const jobs = inferenceJobs.map((job: InferenceJob, i: number) => ({
...job!,
statusIndex: processStatus(job!)
}));
// const transitions = useTransition(inferenceJobs, { // not today
// ...springs.soft,
// from: { opacity: 0, position: "absolute" },
@@ -61,9 +85,10 @@ export default function InferenceJobsList({ t }: { t: any }) {
return () => clearInterval(interval);
}, [pending]);
return inferenceJobs.length ? <div {...{ className: "face-animator-jobs panel" }}>
return jobs.length ? <div {...{ className: "face-animator-jobs panel" }}>
<h5>{ t("headings.yourJobs") }</h5>
{ inferenceJobs.map((job, key) => {
{ jobs.map((job: any, key: number) => {
console.log("🌸",job);
return <div {...{ className: "panel face-animator-job", key }}>
<FontAwesomeIcon {...{ className: `job-status-icon job-status-${job.statusIndex}`, icon: statusIcons[job.statusIndex] }}/>
<div {...{ className: "job-details" }}>
@@ -9,6 +9,7 @@ import {
faSignOutAlt,
faFaceViewfinder,
faCloudUpload,
faWandMagicSparkles,
} from "@fortawesome/pro-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import Button from "components/common/Button/Button";
@@ -39,7 +40,7 @@ export default function SideNav(props: SideNavProps) {
let history = useHistory();
const [windowWidth, setWindowWidth] = useState(window.innerWidth);
const fakeYouFrontendEnv = FakeYouFrontendEnvironment.getInstance();
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const isDevelopmentEnv = fakeYouFrontendEnv.isDevelopment()
const handleNavLinkClick = () => {
const wrapper = document.getElementById("wrapper");
@@ -270,7 +271,6 @@ export default function SideNav(props: SideNavProps) {
{t("speechVc")}
</NavLink>
</li>
{isDevelopmentEnv && (
<li>
<NavLink
to="/voice-designer"
@@ -278,13 +278,12 @@ export default function SideNav(props: SideNavProps) {
onClick={handleNavLinkClick}
>
<FontAwesomeIcon
icon={faWaveformLines}
icon={faWandMagicSparkles}
className="sidebar-heading-icon"
/>
{"Voice Designer"}
</NavLink>
</li>
)}
<hr className="mb-4 mt-3" />
<li className="sidebar-heading">{t("videoTitle")}</li>
<li>
@@ -10,6 +10,7 @@ const useUploadedFiles = create<UploadedFilesState>((set) => ({
setFiles: (files: any[]) => set({ files }),
audioLinks: [],
setAudioLinks: (audioLinks: string[]) => set({ audioLinks }),
deleteEverything:() => set({ files: [], audioLinks: [] }),
}));
export default useUploadedFiles;
@@ -642,22 +642,31 @@ class PageContainer extends React.Component<
<Route
exact
path="/voice-designer/create"
component={VoiceDesignerFormPage}
/>
>
<VoiceDesignerFormPage {...{
enqueueInferenceJob: this.props.enqueueInferenceJob
}}/>
</Route>
{/* Route for editing the dataset details */}
<Route
exact
path="/voice-designer/dataset/:dataset_token/edit"
component={VoiceDesignerFormPage}
/>
>
<VoiceDesignerFormPage {...{
enqueueInferenceJob: this.props.enqueueInferenceJob
}}/>
</Route>
{/* Route for handling dataset token for uploading samples */}
<Route
exact
path="/voice-designer/dataset/:dataset_token/upload"
component={VoiceDesignerFormPage}
/>
>
<VoiceDesignerFormPage {...{
enqueueInferenceJob: this.props.enqueueInferenceJob
}}/>
</Route>
<Route path="/voice-designer/voice/:voice_token/edit">
<VoiceDesignerVoiceEditPage />
@@ -677,7 +686,10 @@ class PageContainer extends React.Component<
</Route>
<Route path="/voice-designer">
<VoiceDesignerMainPage />
<VoiceDesignerMainPage {...{
enqueueInferenceJob: this.props.enqueueInferenceJob,
inferenceJobs: this.props.inferenceJobs
}} />
</Route>
<Route path="/generate-speech">
@@ -0,0 +1,341 @@
import React, { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import { TtsInferenceJob } from "../../../App";
import { BucketConfig } from "@storyteller/components/src/api/BucketConfig";
import { JobState } from "@storyteller/components/src/jobs/JobStates";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
faClock,
faLink,
faHeadphonesSimple,
} from "@fortawesome/free-solid-svg-icons";
import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper";
import { Analytics } from "../../../common/Analytics";
import { SessionTtsAudioPlayer } from "./SessionTtsAudioPlayer";
import { WebUrl } from "../../../common/WebUrl";
import {
GetPendingTtsJobCount,
GetPendingTtsJobCountIsOk,
GetPendingTtsJobCountSuccessResponse,
} from "@storyteller/components/src/api/tts/GetPendingTtsJobCount";
import { InferenceJob } from "@storyteller/components/src/jobs/InferenceJob";
import { useLocalize } from "hooks";
interface Props {
inferenceJobs: Array<InferenceJob>;
ttsInferenceJobs: Array<TtsInferenceJob>;
sessionSubscriptionsWrapper: SessionSubscriptionsWrapper;
}
// TODO: This is duplicated in SessionTtsInferenceResultsList !
// Default to querying every 15 seconds, but make it configurable serverside
const DEFAULT_QUEUE_REFRESH_INTERVAL_MILLIS = 15000;
function SessionVoiceDesignerInferenceResultsList(props: Props) {
const { t } = useLocalize("SessionTtsInferenceResultList");
const [pendingTtsJobs, setPendingTtsJobs] =
useState<GetPendingTtsJobCountSuccessResponse>({
success: true,
pending_job_count: 0,
cache_time: new Date(0), // NB: Epoch is used for vector clock's initial state
refresh_interval_millis: DEFAULT_QUEUE_REFRESH_INTERVAL_MILLIS,
});
useEffect(() => {
const fetch = async () => {
const response = await GetPendingTtsJobCount();
if (GetPendingTtsJobCountIsOk(response)) {
if (
response.cache_time.getTime() > pendingTtsJobs.cache_time.getTime()
) {
setPendingTtsJobs(response);
}
}
};
// TODO: We're having an outage and need to lower this.
//const interval = setInterval(async () => fetch(), 15000);
const refreshInterval = Math.max(
DEFAULT_QUEUE_REFRESH_INTERVAL_MILLIS,
pendingTtsJobs.refresh_interval_millis
);
const interval = setInterval(async () => fetch(), refreshInterval);
fetch();
return () => clearInterval(interval);
}, [pendingTtsJobs]);
let results: Array<JSX.Element> = [];
// 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("resultsProgressPending")
: job.maybeExtraStatusDescription;
break;
case JobState.STARTED:
cssStyle = "alert alert-success mb-0";
stateDescription =
job.maybeExtraStatusDescription == null
? t("resultsProgressStarted")
: job.maybeExtraStatusDescription;
break;
case JobState.ATTEMPT_FAILED:
cssStyle = "alert alert-danger mb-0";
stateDescription = `${t("resultsProgressFail", {
0: job.attemptCount || "0",
})}}`;
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("resultsProgressDead");
break;
case JobState.COMPLETE_SUCCESS:
cssStyle = "message is-success mb-0";
// Not sure why we're here instead of other branch!
stateDescription = t("resultsProgressSuccess");
break;
}
results.push(
<div key={job.jobToken}>
<div>
<div>
<div className={cssStyle}>{stateDescription}</div>
</div>
</div>
</div>
);
} else {
let audioLink = new BucketConfig().getGcsUrl(
job.maybeResultPublicBucketMediaPath
);
let ttsPermalink = `/media/${job.maybeResultToken}`;
let wavesurfers = <SessionTtsAudioPlayer filename={audioLink} />;
results.push(
<div key={job.jobToken}>
{/*<div className="message-header">
<p>{job.title}</p>
<button className="delete" aria-label="delete"></button>
</div>*/}
<div>
<div className="panel panel-tts-results p-4 gap-3 d-flex flex-column">
<div>
<h5 className="mb-2">{job.maybeModelTitle}</h5>
<p>{job.maybeRawInferenceText}</p>
</div>
{/* <audio
className="w-100"
controls
src={audioLink}
onClick={() => {
Analytics.ttsClickResultInlinePlay();
}}
>
Your browser does not support the
<code>audio</code> element.
</audio> */}
{wavesurfers}
<div className="mt-2">
<Link
to={ttsPermalink}
onClick={() => {
Analytics.ttsClickResultLink();
}}
className="fw-semibold"
>
<FontAwesomeIcon icon={faLink} className="me-2" />
{t("resultsAudioShareDownload")}
</Link>
</div>
</div>
</div>
</div>
);
}
});
// 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";
let stateDescription = "Pending...";
switch (job.jobState) {
case JobState.PENDING:
case JobState.UNKNOWN:
stateDescription =
job.maybeExtraStatusDescription == null
? t("resultsProgressPending")
: job.maybeExtraStatusDescription;
break;
case JobState.STARTED:
cssStyle = "alert alert-success mb-0";
stateDescription =
job.maybeExtraStatusDescription == null
? t("resultsProgressStarted")
: job.maybeExtraStatusDescription;
break;
case JobState.ATTEMPT_FAILED:
cssStyle = "alert alert-danger mb-0";
stateDescription = `${t("resultsProgressFail", {
0: job.attemptCount || "0",
})}}`;
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("resultsProgressDead");
break;
case JobState.COMPLETE_SUCCESS:
cssStyle = "message is-success mb-0";
// Not sure why we're here instead of other branch!
stateDescription = t("resultsProgressSuccess");
break;
}
results.push(
<div key={job.jobToken}>
<div>
<div>
<div className={cssStyle}>{stateDescription}</div>
</div>
</div>
</div>
);
} else {
let audioLink = new BucketConfig().getGcsUrl(
job.maybePublicBucketWavAudioPath
);
let ttsPermalink = `/tts/result/${job.maybeResultToken}`;
let wavesurfers = <SessionTtsAudioPlayer filename={audioLink} />;
results.push(
<div key={job.jobToken}>
{/*<div className="message-header">
<p>{job.title}</p>
<button className="delete" aria-label="delete"></button>
</div>*/}
<div>
<div className="panel panel-tts-results p-4 gap-3 d-flex flex-column">
<div>
<h5 className="mb-2">{job.title}</h5>
<p>{job.rawInferenceText}</p>
</div>
{/* <audio
className="w-100"
controls
src={audioLink}
onClick={() => {
Analytics.ttsClickResultInlinePlay();
}}
>
Your browser does not support the
<code>audio</code> element.
</audio> */}
{wavesurfers}
<div className="mt-2">
<Link
to={ttsPermalink}
onClick={() => {
Analytics.ttsClickResultLink();
}}
className="fw-semibold"
>
<FontAwesomeIcon icon={faLink} className="me-2" />
{t("resultsAudioShareDownload")}
</Link>
</div>
</div>
</div>
</div>
);
}
});
// ============================= END LEGACY TTS =============================
let noResultsSection = (
<div className="panel panel-inner text-center p-5 rounded-5 h-100">
<div className="d-flex flex-column opacity-75 h-100 justify-content-center">
<FontAwesomeIcon icon={faHeadphonesSimple} className="fs-3 mb-3" />
<h5 className="fw-semibold">{t("resultsBlankText")}</h5>
<p>{t("resultsBlankSubText")}</p>
</div>
</div>
);
if (results.length === 0) {
return <>{noResultsSection}</>;
}
let upgradeNotice = <></>;
// Ask non-premium users to upgrade
if (
results.length !== 0 &&
!props.sessionSubscriptionsWrapper.hasPaidFeatures()
) {
upgradeNotice = (
<div className="d-flex flex-column gap-3 sticky-top zi-2">
<div className="alert alert-warning alert-cta mb-0">
<FontAwesomeIcon icon={faClock} className="me-2" />
{t("resultsUpgradeNotice")}{" "}
<Link
to={WebUrl.pricingPageWithReferer("nowait")}
onClick={() => {
Analytics.ttsTooSlowUpgradePremium();
}}
className="alert-link fw-semibold"
>
{t("resultsUpgradeLinkText")}
</Link>{" "}
({t("resultsTtsQueued")}{" "}
<span className="text-red">~{pendingTtsJobs.pending_job_count}</span>)
</div>
</div>
);
}
// Users have requested reverse chronological results
results.reverse();
return (
<div>
<div>
<div className="d-flex flex-column gap-3">
{upgradeNotice}
<div className="d-flex flex-column gap-3">{results}</div>
</div>
</div>
</div>
);
}
export { SessionVoiceDesignerInferenceResultsList };
@@ -10,6 +10,7 @@ import {
faDiscord,
faTwitter,
faTiktok,
} from "@fortawesome/free-brands-svg-icons";
import { ThirdPartyLinks } from "@storyteller/components/src/constants/ThirdPartyLinks";
import {
@@ -213,6 +214,10 @@ function FooterNav(props: Props) {
<Link to="/voice-conversion">{t("productVc")}</Link>
</li>
<li>
<Link to="/voice-designer">Voice Designer</Link>
</li>
<li>
<Link to="/face-animator">{t("productFaceAnimator")}</Link>
</li>
@@ -12,6 +12,7 @@ import {
faSignOutAlt,
faBook,
faStar,
faWandMagicSparkles
} from "@fortawesome/free-solid-svg-icons";
import { faDiscord } from "@fortawesome/free-brands-svg-icons";
import { Logout } from "@storyteller/components/src/api/session/Logout";
@@ -244,6 +245,15 @@ function TopNav(props: Props) {
{t("productVc")}
</Link>
</li>
<li data-bs-toggle="offcanvas">
<Link className="dropdown-item" to="/voice-designer">
<FontAwesomeIcon
icon={faWandMagicSparkles}
className="me-2"
/>
Voice Designer
</Link>
</li>
<li data-bs-toggle="offcanvas">
<Link className="dropdown-item" to="/face-animator">
<FontAwesomeIcon
@@ -298,6 +298,40 @@ function LandingPage(props: Props) {
/>
</Link>
</div>
<div className="col-12 col-md-4">
<Link
to="/voice-designer"
className="panel panel-select d-flex flex-column align-items-center"
>
<div className="d-flex px-4 pt-4 align-items-start w-100">
<div className="flex-grow-1">
<div className="mb-1">
<span className="badge-new d-inline-flex align-items-center mb-2 me-2">
<FontAwesomeIcon icon={faSparkles} className="me-1" />
{t("productNewTag")}
</span>
<h4 className="fw-bold text-white d-inline-flex align-items-center mb-0">
<span>Voice Designer</span>
</h4>
</div>
<h6 className="fw-normal opacity-75 text-white">
Make yourself sound like anyone
</h6>
</div>
<Link to="/voice-designer" className="btn btn-square mt-1">
<FontAwesomeIcon icon={faArrowRight} />
</Link>
</div>
<img
className="img-fluid"
src="/images/landing/hanashi-after.webp"
alt="Voice Designer"
/>
</Link>
</div>
<div className="col-12 col-md-4">
<Link
to="/face-animator"
@@ -32,6 +32,7 @@ import { usePrefixedDocumentTitle } from "common/UsePrefixedDocumentTitle";
export default function LipsyncEditor({
enqueueInferenceJob,
sessionSubscriptionsWrapper,
inferenceJobs,
inferenceJobsByCategory,
...rest
}: FaceAnimatorCore) {
@@ -182,7 +183,7 @@ export default function LipsyncEditor({
);
})}
</div>
<InferenceJobsList {...{ t }}/>
<InferenceJobsList {...{ t, inferenceJobs }}/>
<div {...{ className: "face-animator-mobile-sample" }}>
<BasicVideo {...{ src: "/videos/face-animator-instruction-en.mp4" }} />
</div>
@@ -21,19 +21,22 @@ import { v4 as uuidv4 } from "uuid";
import { useFile } from "hooks";
import useVoiceRequests from "./useVoiceRequests";
import useUploadedFiles from "hooks/useUploadedFiles";
import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob";
interface RouteParams {
dataset_token?: string;
}
function VoiceDesignerFormPage() {
function VoiceDesignerFormPage({ enqueueInferenceJob }: { enqueueInferenceJob: any }) {
const history = useHistory();
const { datasets, inputCtrl, languages, visibilityOptions, voices } = useVoiceRequests({});
const [language, languageSet] = useState("en");
const [visibility, visibilitySet] = useState("");
const [visibility, visibilitySet] = useState("hidden");
const [title, titleSet] = useState("");
const [fetched,fetchedSet] = useState(false);
const deleteEverything = useUploadedFiles((state: any) => state.deleteEverything);
const audioProps = useFile({}); // contains upload inout state and controls, see docs
const datasetInputs = [
@@ -70,6 +73,7 @@ function VoiceDesignerFormPage() {
const initialStep = history.location.pathname.includes("/upload") ? 1 : 0;
const [currentStep, setCurrentStep] = useState(initialStep);
const [audioSamplesReady, setAudioSamplesReady] = useState(false);
const steps = isEditMode
? ["Edit Details", "Edit Samples"]
@@ -81,7 +85,7 @@ function VoiceDesignerFormPage() {
return <VoiceDetails {...{ datasetInputs }} />;
case 1:
return (
<UploadSamples {...{ audioProps, datasetToken: dataset_token }} />
<UploadSamples key={!isNewCreation && dataset_token || uuidv4()} {...{ audioProps, datasetToken: dataset_token, setAudioSamplesReady }} />
);
default:
return null;
@@ -108,9 +112,8 @@ function VoiceDesignerFormPage() {
creator_set_visibility: visibility,
idempotency_token: uuidv4(),
}).then((res: any) => {
console.log("😎",res);
if (res && res.success && res.token) {
deleteEverything();
history.push(`/voice-designer/dataset/${ res.token }/upload`);
}
});
@@ -140,7 +143,13 @@ function VoiceDesignerFormPage() {
voice_dataset_token: dataset_token || "",
})
.then((res: any) => {
deleteEverything();
if (res && res.success) {
enqueueInferenceJob(
res.inference_job_token,
FrontendInferenceJobType.VoiceDesignerTts
);
history.push("/voice-designer");
}
});
@@ -189,6 +198,7 @@ function VoiceDesignerFormPage() {
onBack={handleBack}
onNext={handleNext}
onCreate={handleCreateVoice}
createDisabled={!audioSamplesReady}
/>
</Panel>
</Container>
@@ -12,7 +12,7 @@ import ListItems from "./components/NewList";
import Modal from "components/common/Modal";
import useVoiceRequests from "./useVoiceRequests";
function VoiceDesignerMainPage() {
function VoiceDesignerMainPage({ inferenceJobs }: { inferenceJobs: any }) {
const { pathname } = useLocation();
const { t } = useLocalize("FaceAnimator");
const { datasets, voices } = useVoiceRequests({
@@ -147,7 +147,8 @@ function VoiceDesignerMainPage() {
panel={false}
imageUrl="/images/header/voice-designer.png"
/>
<InferenceJobsList {...{ t }} />
<InferenceJobsList {...{ t, inferenceJobs }}/>
<Panel mb={true}>
<nav>
<ul className="nav nav-tabs">
@@ -19,7 +19,7 @@ import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapp
import Container from "components/common/Container/Container";
import TextArea from "components/common/TextArea";
import { Button } from "components/common";
import { SessionTtsInferenceResultList } from "v2/view/_common/SessionTtsInferenceResultsList";
import { SessionVoiceDesignerInferenceResultsList } from "v2/view/_common/SessionVoiceDesignerInferenceResultsList";
import {
FrontendInferenceJobType,
InferenceJob,
@@ -230,7 +230,7 @@ export default function VoiceDesignerUseVoicePage(
Session TTS Results
</h4>
<div className="d-flex flex-column gap-3 session-tts-section">
<SessionTtsInferenceResultList
<SessionVoiceDesignerInferenceResultsList
inferenceJobs={
props.inferenceJobsByCategory.get(
FrontendInferenceJobType.VoiceDesignerTts
@@ -16,7 +16,7 @@ import { useHistory } from "react-router-dom";
function VoiceDesignerVoiceEditPage() {
const [language, languageSet] = useState("en");
const [visibility, visibilitySet] = useState("");
const [visibility, visibilitySet] = useState("hidden");
const [title, titleSet] = useState("");
const [fetched,fetchedSet] = useState(false);
@@ -88,6 +88,7 @@ function VoiceDesignerVoiceEditPage() {
</div>
<div>
aaaaa
<TempSelect
{...{
icon: faEye,
@@ -4,6 +4,7 @@ interface StepperControlsProps {
onBack: () => void;
onNext: () => void;
onCreate: () => void;
createDisabled: boolean;
steps: string[];
currentStep: number;
}
@@ -14,6 +15,7 @@ const StepperControls: React.FC<StepperControlsProps> = ({
steps,
currentStep,
onCreate,
createDisabled
}) => {
return (
<div className="p-3 pb-4 px-lg-4 pt-0 d-flex gap-3">
@@ -30,7 +32,7 @@ const StepperControls: React.FC<StepperControlsProps> = ({
)}
{currentStep === 1 && (
<button className="btn btn-primary w-100" onClick={onCreate}>
<button disabled={ createDisabled } className="btn btn-primary w-100" onClick={onCreate}>
Create Voice
</button>
)}
@@ -27,10 +27,11 @@ interface Props {
formIsCleared: boolean;
setFormIsCleared: (cleared: boolean) => void;
setCanConvert: (canConvert: boolean) => void;
setAudioSamplesReady: (ready: boolean) => void;
changeConvertIdempotencyToken: () => void;
}
function VoiceDesignerUploadComponent({ changeConvertIdempotencyToken, datasetToken, setCanConvert, setFormIsCleared }: Props) {
function VoiceDesignerUploadComponent({ changeConvertIdempotencyToken, datasetToken, setCanConvert, setFormIsCleared, setAudioSamplesReady }: Props) {
const [isUploadDisabled, setIsUploadDisabled] = useState<boolean>(false);
const files = useUploadedFiles((state: any) => state.files);
@@ -38,6 +39,7 @@ function VoiceDesignerUploadComponent({ changeConvertIdempotencyToken, datasetTo
const audioLinks = useUploadedFiles((state: any) => state.audioLinks);
const setAudioLinks = useUploadedFiles((state: any) => state.setAudioLinks);
// Auto generated
// eslint-disable-next-line @typescript-eslint/no-unused-vars
// const [idempotencyToken, setIdempotencyToken] = useState(uuidv4());
@@ -53,7 +55,9 @@ function VoiceDesignerUploadComponent({ changeConvertIdempotencyToken, datasetTo
file: file,
uuid_idempotency_token: uuidv4(),
})
.then(res => {});
.then(res => {
setAudioSamplesReady(true);
});
setFormIsCleared(false);
setCanConvert(false);
@@ -100,6 +104,7 @@ function VoiceDesignerUploadComponent({ changeConvertIdempotencyToken, datasetTo
<div className="d-flex flex-column gap-3">
{/* Usage refer to https://github.com/KarimMokhtar/react-drag-drop-files */}
<FileUploader
key={datasetToken || uuidv4()}
handleChange={handleChange}
name="file"
types={FILE_TYPES}
@@ -2,7 +2,7 @@ import React, { useState } from "react";
import VoiceDesignerUploadComponent from "../VoiceDesignerUploadComponent";
import { v4 as uuidv4 } from "uuid";
function UploadSamples({ audioProps, datasetToken }: { audioProps: any, datasetToken?: string }) {
function UploadSamples({ audioProps, datasetToken, setAudioSamplesReady }: { audioProps: any, datasetToken?: string, setAudioSamplesReady:any }) {
/* eslint-disable @typescript-eslint/no-unused-vars */
const [convertLoading, setConvertLoading] = useState(false);
const [canConvert, setCanConvert] = useState(false);
@@ -25,7 +25,7 @@ function UploadSamples({ audioProps, datasetToken }: { audioProps: any, datasetT
<div>
<label className="sub-title">Upload Audio</label>
<div className="d-flex flex-column gap-3 upload-component">
<VoiceDesignerUploadComponent {...{ changeConvertIdempotencyToken, datasetToken, formIsCleared, setCanConvert, setFormIsCleared, setMediaUploadToken }}/>
<VoiceDesignerUploadComponent {...{ changeConvertIdempotencyToken, datasetToken, formIsCleared, setCanConvert, setFormIsCleared, setMediaUploadToken, setAudioSamplesReady }}/>
</div>
</div>
</div>