diff --git a/packages/fakeyou.com/src/components/layout/InferenceJobsList/InferenceJobsList.tsx b/packages/fakeyou.com/src/components/layout/InferenceJobsList/InferenceJobsList.tsx index a85c49747d..9c0274f22c 100644 --- a/packages/fakeyou.com/src/components/layout/InferenceJobsList/InferenceJobsList.tsx +++ b/packages/fakeyou.com/src/components/layout/InferenceJobsList/InferenceJobsList.tsx @@ -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({ 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 ?
+ return jobs.length ?
{ t("headings.yourJobs") }
- { inferenceJobs.map((job, key) => { + { jobs.map((job: any, key: number) => { + console.log("🌸",job); return
diff --git a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx index aec522ed57..bb9f7134fd 100644 --- a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx +++ b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx @@ -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")} - {isDevelopmentEnv && (
  • {"Voice Designer"}
  • - )}
  • {t("videoTitle")}
  • diff --git a/packages/fakeyou.com/src/hooks/useUploadedFiles/useUploadedFiles.tsx b/packages/fakeyou.com/src/hooks/useUploadedFiles/useUploadedFiles.tsx index 3289abe16a..8851d3aedc 100644 --- a/packages/fakeyou.com/src/hooks/useUploadedFiles/useUploadedFiles.tsx +++ b/packages/fakeyou.com/src/hooks/useUploadedFiles/useUploadedFiles.tsx @@ -10,6 +10,7 @@ const useUploadedFiles = create((set) => ({ setFiles: (files: any[]) => set({ files }), audioLinks: [], setAudioLinks: (audioLinks: string[]) => set({ audioLinks }), + deleteEverything:() => set({ files: [], audioLinks: [] }), })); export default useUploadedFiles; diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index d2710a70d6..c6e83c444d 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -642,22 +642,31 @@ class PageContainer extends React.Component< + > + + {/* Route for editing the dataset details */} + > + + {/* Route for handling dataset token for uploading samples */} + > + + @@ -677,7 +686,10 @@ class PageContainer extends React.Component< - + diff --git a/packages/fakeyou.com/src/v2/view/_common/SessionVoiceDesignerInferenceResultsList.tsx b/packages/fakeyou.com/src/v2/view/_common/SessionVoiceDesignerInferenceResultsList.tsx new file mode 100644 index 0000000000..239baf34cb --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/_common/SessionVoiceDesignerInferenceResultsList.tsx @@ -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; + ttsInferenceJobs: Array; + 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({ + 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 = []; + + // 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( +
    +
    +
    +
    {stateDescription}
    +
    +
    +
    + ); + } else { + let audioLink = new BucketConfig().getGcsUrl( + job.maybeResultPublicBucketMediaPath + ); + let ttsPermalink = `/media/${job.maybeResultToken}`; + + let wavesurfers = ; + + results.push( +
    + {/*
    +

    {job.title}

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

    {job.maybeRawInferenceText}

    +
    + + {/* */} + + {wavesurfers} + +
    + { + Analytics.ttsClickResultLink(); + }} + className="fw-semibold" + > + + {t("resultsAudioShareDownload")} + +
    +
    +
    +
    + ); + } + }); + + // 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( +
    +
    +
    +
    {stateDescription}
    +
    +
    +
    + ); + } else { + let audioLink = new BucketConfig().getGcsUrl( + job.maybePublicBucketWavAudioPath + ); + let ttsPermalink = `/tts/result/${job.maybeResultToken}`; + + let wavesurfers = ; + + results.push( +
    + {/*
    +

    {job.title}

    + +
    */} +
    +
    +
    +
    {job.title}
    +

    {job.rawInferenceText}

    +
    + + {/* */} + + {wavesurfers} + +
    + { + Analytics.ttsClickResultLink(); + }} + className="fw-semibold" + > + + {t("resultsAudioShareDownload")} + +
    +
    +
    +
    + ); + } + }); + + // ============================= END LEGACY TTS ============================= + + let noResultsSection = ( +
    +
    + +
    {t("resultsBlankText")}
    +

    {t("resultsBlankSubText")}

    +
    +
    + ); + + if (results.length === 0) { + return <>{noResultsSection}; + } + + let upgradeNotice = <>; + + // Ask non-premium users to upgrade + if ( + results.length !== 0 && + !props.sessionSubscriptionsWrapper.hasPaidFeatures() + ) { + upgradeNotice = ( +
    +
    + + {t("resultsUpgradeNotice")}{" "} + { + Analytics.ttsTooSlowUpgradePremium(); + }} + className="alert-link fw-semibold" + > + {t("resultsUpgradeLinkText")} + {" "} + ({t("resultsTtsQueued")}{" "} + ~{pendingTtsJobs.pending_job_count}) +
    +
    + ); + } + + // Users have requested reverse chronological results + results.reverse(); + + return ( +
    +
    +
    + {upgradeNotice} +
    {results}
    +
    +
    +
    + ); +} + +export { SessionVoiceDesignerInferenceResultsList }; diff --git a/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx b/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx index ac4309b6b4..8ae4922ebc 100644 --- a/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx @@ -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) { {t("productVc")}
  • +
  • + Voice Designer +
  • +
  • {t("productFaceAnimator")}
  • diff --git a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx index f69bb2c789..6312fd0fc9 100644 --- a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx @@ -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")} +
  • + + + Voice Designer + +
  • +
    + +
    +
    +
    + + + {t("productNewTag")} + + +

    + Voice Designer +

    +
    + +
    + Make yourself sound like anyone +
    +
    + + + +
    + + Voice Designer + +
    - +
    diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerFormPage.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerFormPage.tsx index 5df88eb907..8e0c083b84 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerFormPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerFormPage.tsx @@ -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 ; case 1: return ( - + ); 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} /> diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx index 7e454496f3..8214a2cfdc 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx @@ -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" /> - + +