diff --git a/packages/components/src/api/upload/UploadAudio.ts b/packages/components/src/api/upload/UploadAudio.ts index b35e53209d..770a19d806 100644 --- a/packages/components/src/api/upload/UploadAudio.ts +++ b/packages/components/src/api/upload/UploadAudio.ts @@ -2,6 +2,7 @@ import { ApiConfig } from "../ApiConfig"; export interface UploadAudioRequest { uuid_idempotency_token: string, + source?: string, // eg. "device", "file" file: any, } @@ -33,6 +34,10 @@ export async function UploadAudio(request: UploadAudioRequest) : Promise; ttsInferenceJobs: Array; w2lInferenceJobs: Array; ttsModelUploadJobs: Array; @@ -138,6 +137,10 @@ interface State { vocoderUploadJobs: Array; voiceConversionModelUploadJobs: Array; + // Generic inference jobs. + inferenceJobs: Array; + inferenceJobsByCategory: Map>; + // Current text entered textBuffer: string; @@ -152,6 +155,13 @@ function newVocodes() { return discord || twitter || alphaCookie; } +function initInferenceJobsByCategoryMap() : Map { + let inferenceJobsByCategory = new Map(); + inferenceJobsByCategory.set(FrontendInferenceJobType.TextToSpeech, []); + inferenceJobsByCategory.set(FrontendInferenceJobType.VoiceConversion, []); + return inferenceJobsByCategory; +} + function isMacOs() { // Not on macs yet // https://stackoverflow.com/a/38241481 @@ -176,6 +186,8 @@ class App extends React.Component { let showPleaseFollowNotice = false; + let inferenceJobsByCategory = initInferenceJobsByCategoryMap(); + this.state = { enableAlpha: enableAlpha, migrationMode: migrationMode, @@ -194,7 +206,6 @@ class App extends React.Component { isShowingPleaseFollowNotice: showPleaseFollowNotice, isShowingBootstrapLanguageNotice: false, - inferenceJobs: [], ttsInferenceJobs: [], w2lInferenceJobs: [], ttsModelUploadJobs: [], @@ -202,6 +213,9 @@ class App extends React.Component { vocoderUploadJobs: [], voiceConversionModelUploadJobs: [], + inferenceJobs: [], + inferenceJobsByCategory: inferenceJobsByCategory, + textBuffer: "", voiceConversionModels: [], @@ -338,6 +352,8 @@ class App extends React.Component { checkInferenceJob = async (jobToken: string) => { const lookupResult = await GetModelInferenceJobStatus(jobToken); + let inferenceJobsByCategory = initInferenceJobsByCategoryMap(); + if (GetModelInferenceJobStatusIsOk(lookupResult)) { let updatedJobs: Array = []; @@ -347,21 +363,28 @@ class App extends React.Component { !jobStateCanChange(existingJob.jobState) ) { updatedJobs.push(existingJob); + inferenceJobsByCategory.get(existingJob.frontendJobType)?.push(existingJob); return; } - let updatedJob = InferenceJob.fromResponse(lookupResult.state!); + let updatedJob = InferenceJob.fromResponse( + lookupResult.state!, + existingJob.frontendJobType + ); + updatedJobs.push(updatedJob); + inferenceJobsByCategory.get(updatedJob.frontendJobType)?.push(existingJob); }); this.setState({ inferenceJobs: updatedJobs, + inferenceJobsByCategory: inferenceJobsByCategory, }); } }; - enqueueInferenceJob = (jobToken: string) => { - const newJob = new InferenceJob(jobToken); + enqueueInferenceJob = (jobToken: string, frontendJobType: FrontendInferenceJobType) => { + const newJob = new InferenceJob(jobToken, frontendJobType); let inferenceJobs = this.state.inferenceJobs.concat([newJob]); this.setState({ @@ -747,6 +770,7 @@ class App extends React.Component { } enqueueInferenceJob={this.enqueueInferenceJob} inferenceJobs={this.state.inferenceJobs} + inferenceJobsByCategory={this.state.inferenceJobsByCategory} enqueueTtsJob={this.enqueueTtsJob} ttsInferenceJobs={this.state.ttsInferenceJobs} enqueueW2lJob={this.enqueueW2lJob} diff --git a/packages/fakeyou.com/src/common/Analytics.ts b/packages/fakeyou.com/src/common/Analytics.ts index dcc5915657..35208a4438 100644 --- a/packages/fakeyou.com/src/common/Analytics.ts +++ b/packages/fakeyou.com/src/common/Analytics.ts @@ -227,6 +227,14 @@ class Analytics { Analytics.sendCategorizedEvent(this.VOICE_CONVERSION, 'open_primary_voice_select_menu'); } + static voiceConversionGenerate(modelToken: string) { + Analytics.sendCategorizedEvent(this.VOICE_CONVERSION, 'generate_vc', modelToken); + } + + static voiceConversionClickDownload() { + Analytics.sendCategorizedEvent(this.VOICE_CONVERSION, 'click_download'); + } + // ========== UI ========== static uiTurnOnAnimations() { diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index ebb8c647d0..9d19f30dfa 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -68,7 +68,7 @@ import { NewsPage } from "./pages/news/NewsPage"; import { LandingPage } from "./pages/landing/LandingPage"; import { ChannelsPage } from "./pages/channels/Channels"; import { TrumpTtsPage } from "./pages/character/trump/TrumpTtsPage"; -import { InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; +import { FrontendInferenceJobType, InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; //import { LandingPage } from "./pages/landing/LandingPage"; import { VcModelListPage } from "./pages/vc/vc_model_list/VcModelListPage"; import { UploadVoiceConversionModel } from "./pages/upload/UploadVoiceConversionModel"; @@ -98,8 +98,9 @@ interface Props { isShowingBootstrapLanguageNotice: boolean; clearBootstrapLanguageNotice: () => void; - enqueueInferenceJob: (jobToken: string) => void; + enqueueInferenceJob: (jobToken: string, frontendInferenceJobType: FrontendInferenceJobType) => void; inferenceJobs: Array; + inferenceJobsByCategory: Map>; enqueueTtsJob: (jobToken: string) => void; ttsInferenceJobs: Array; @@ -478,15 +479,6 @@ class PageContainer extends React.Component { - - - - { setVoiceConversionModels={this.props.setVoiceConversionModels} maybeSelectedVoiceConversionModel={this.props.maybeSelectedVoiceConversionModel} setMaybeSelectedVoiceConversionModel={this.props.setMaybeSelectedVoiceConversionModel} + enqueueInferenceJob={this.props.enqueueInferenceJob} + inferenceJobs={this.props.inferenceJobs} + inferenceJobsByCategory={this.props.inferenceJobsByCategory} /> @@ -563,7 +558,7 @@ class PageContainer extends React.Component { /> - + { } enqueueInferenceJob={this.props.enqueueInferenceJob} inferenceJobs={this.props.inferenceJobs} + inferenceJobsByCategory={this.props.inferenceJobsByCategory} enqueueTtsJob={this.props.enqueueTtsJob} ttsInferenceJobs={this.props.ttsInferenceJobs} ttsModelUploadJobs={this.props.ttsModelUploadJobs} @@ -623,6 +619,15 @@ class PageContainer extends React.Component { } /> + + + + diff --git a/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx b/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx new file mode 100644 index 0000000000..64ac3462ef --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx @@ -0,0 +1,256 @@ +import React, { useEffect, useState } from "react"; +import { t } from "i18next"; +import { Trans } from "react-i18next"; +import { Link } from "react-router-dom"; +import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; +import { JobState } from "@storyteller/components/src/jobs/JobStates"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { + faClock, + faHeadphonesSimple, + faDownload, +} from "@fortawesome/free-solid-svg-icons"; +import { motion } from "framer-motion"; +import { container, sessionItem } from "../../../data/animation"; +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"; + +interface Props { + inferenceJobs: 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 SessionVoiceConversionResultsList(props: Props) { + 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("common.SessionTtsInferenceResults.progress.pending") + : job.maybeExtraStatusDescription; + break; + case JobState.STARTED: + cssStyle = "alert alert-success mb-0"; + stateDescription = + job.maybeExtraStatusDescription == null + ? t("common.SessionTtsInferenceResults.progress.started") + : job.maybeExtraStatusDescription; + break; + case JobState.ATTEMPT_FAILED: + cssStyle = "alert alert-danger mb-0"; + stateDescription = `Failed ${job.attemptCount} attempt(s). Will retry...`; + 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( + "common.SessionTtsInferenceResults.progress.dead" + ); + break; + case JobState.COMPLETE_SUCCESS: + cssStyle = "message is-success mb-0"; + // Not sure why we're here instead of other branch! + stateDescription = t( + "common.SessionTtsInferenceResults.progress.success" + ); + break; + } + + results.push( +
+
+
+ + {stateDescription} + +
+
+
+ ); + } else { + let audioLink = new BucketConfig().getGcsUrl( + job.maybeResultPublicBucketMediaPath + ); + //let ttsPermalink = `/tts/result/${job.maybeResultToken}`; + + let wavesurfers = ; + + let audioDownloadFilename = `fakeyou-${job.jobToken}.wav`; + + results.push( +
+ {/*
+

{job.title}

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

{job.maybeRawInferenceText}

+
+ + {/* */} + + {wavesurfers} + +
+ {/* { + Analytics.ttsClickResultLink(); + }} + className="fw-semibold" + > + + {t("common.SessionTtsInferenceResults.result.shareDownload")} + */} + + { + Analytics.voiceConversionClickDownload(); + }} + download={audioDownloadFilename} + > + + Download File{" "} + +
+
+
+
+ ); + } + }); + + let noResultsSection = ( +
+
+ +
+ {t("common.SessionTtsInferenceResults.noResults.title")} +
+

{t("common.SessionTtsInferenceResults.noResults.subtitle")}

+
+
+ ); + + if (results.length === 0) { + return <>{noResultsSection}; + } + + let upgradeNotice = <>; + + // Ask non-premium users to upgrade + if ( + results.length !== 0 && + !props.sessionSubscriptionsWrapper.hasPaidFeatures() + ) { + upgradeNotice = ( +
+ + + + Don't want to wait? Step to the back of the line with a{" "} + { + Analytics.ttsTooSlowUpgradePremium(); + }} + className="alert-link fw-semibold" + > + FakeYou membership. + + {" "} + (TTS Queued:{" "} + ~{pendingTtsJobs.pending_job_count}) + +
+ ); + } + + // Users have requested reverse chronological results + results.reverse(); + + return ( + +
+
+ {upgradeNotice} +
{results}
+
+
+
+ ); +} + +export { SessionVoiceConversionResultsList }; diff --git a/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx b/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx index 6848cf2ccd..b4eba4c83c 100644 --- a/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx @@ -127,7 +127,11 @@ function FooterNav(props: Props) {

AI Tools

  • - Text to Speech + Text to Speech +
  • + +
  • + Voice Conversion
  • diff --git a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx index 77c5914b5d..a7ffdac5e8 100644 --- a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx @@ -38,8 +38,7 @@ import "tippy.js/dist/tippy.css"; import "tippy.js/animations/shift-away.css"; import { ThirdPartyLinks } from "@storyteller/components/src/constants/ThirdPartyLinks"; import { Analytics } from "../../../common/Analytics"; -import { faWaveformLines } from "@fortawesome/pro-solid-svg-icons"; -import { faTvRetro } from "@fortawesome/pro-regular-svg-icons"; +import { faMicrophoneLines, faWaveformLines } from "@fortawesome/pro-solid-svg-icons"; // TODO: This is duplicated in SessionTtsInferenceResultsList ! // Default to querying every 15 seconds, but make it configurable serverside @@ -357,7 +356,7 @@ function TopNav(props: Props) {
  • -
  • + {/*
  • { @@ -368,7 +367,7 @@ function TopNav(props: Props) { {t("nav.TopNav.main.newsLink")} -
  • + */}
  • {/* TODO(echelon): Fix the build warnings about href not being accessible. */} @@ -388,7 +387,7 @@ function TopNav(props: Props) { aria-labelledby="offcanvasNavbarLgDropdown-tts" >
  • - +
  • - {/* TODO(bt, 2023-01-11): Not ready to launch voice conversion
  • - */}
  • diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx b/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx index 634ff30c80..72e47d6a13 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx @@ -9,11 +9,6 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faUsers, faStar, - faShapes, - faMicrophoneAlt, - faPaintBrush, - faPersonRunning, - faMusic, faArrowRight, faUser, } from "@fortawesome/free-solid-svg-icons"; @@ -109,14 +104,16 @@ function LandingPage(props: Props) { className="display-4 fw-bold lh-2 mb-3 zi-2" variants={item} > - Text to Speech, + AI Music,
    - Voice, and AI Tools + Text to Speech, +
    + and Creator Tools
  • - Use FakeYou deep fake technology to say stuff with your favorite + Use FakeYou deep fake technology to make movies and music with your favorite characters.
    @@ -159,7 +156,7 @@ function LandingPage(props: Props) {
    @@ -168,7 +165,7 @@ function LandingPage(props: Props) { src="/mascot/VC-img.webp" alt="Voice Conversion" /> -

    Voice Conversion

    +

    Music & Voice Conversion

    Speak as your favorite characters
    @@ -203,6 +200,7 @@ function LandingPage(props: Props) {
    + {/*
    @@ -255,6 +253,7 @@ function LandingPage(props: Props) {
    + */}
    diff --git a/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsModelListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsModelListPage.tsx index 1ded1e31ab..7815eb29dd 100644 --- a/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsModelListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsModelListPage.tsx @@ -7,7 +7,7 @@ import { SessionTtsModelUploadResultList } from "../../../_common/SessionTtsMode import { SessionW2lInferenceResultList } from "../../../_common/SessionW2lInferenceResultsList"; import { SessionW2lTemplateUploadResultList } from "../../../_common/SessionW2lTemplateUploadResultsList"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; -import { InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; +import { FrontendInferenceJobType, InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; import { TtsInferenceJob } from "@storyteller/components/src/jobs/TtsInferenceJobs"; import { TtsModelUploadJob } from "@storyteller/components/src/jobs/TtsModelUploadJobs"; import { W2lInferenceJob } from "@storyteller/components/src/jobs/W2lInferenceJobs"; @@ -92,8 +92,9 @@ interface Props { isShowingBootstrapLanguageNotice: boolean; clearBootstrapLanguageNotice: () => void; - enqueueInferenceJob: (jobToken: string) => void; + enqueueInferenceJob: (jobToken: string, frontendInferenceJobType: FrontendInferenceJobType) => void; inferenceJobs: Array; + inferenceJobsByCategory: Map>; enqueueTtsJob: (jobToken: string) => void; ttsInferenceJobs: Array; @@ -299,7 +300,7 @@ function TtsModelListPage(props: Props) { setMaybeTtsError(undefined); if (response.inference_job_token_type === "generic") { - props.enqueueInferenceJob(response.inference_job_token); + props.enqueueInferenceJob(response.inference_job_token, FrontendInferenceJobType.TextToSpeech); } else { props.enqueueTtsJob(response.inference_job_token); } @@ -609,7 +610,7 @@ function TtsModelListPage(props: Props) {
    void; + + enqueueInferenceJob: (jobToken: string, frontendInferenceJobType: FrontendInferenceJobType) => void; + inferenceJobs: Array; + inferenceJobsByCategory: Map>; } function VcModelListPage(props: Props) { - const [loading, setLoading] = useState(false); + usePrefixedDocumentTitle("Voice Conversion"); + + const [canConvert, setCanConvert] = useState(false); const [mediaUploadToken, setMediaUploadToken] = useState(undefined); - // Auto generated - const [idempotencyToken, setIdempotencyToken] = useState(uuidv4()); + const [convertIdempotencyToken, setConvertIdempotencyToken] = useState(uuidv4()); - usePrefixedDocumentTitle("Voice Conversion"); + // NB: Something of a UI hack here. + // The 3rd party microphone component doesn't let you clear it, so we emulate form clearing + // with this variable. + const [formIsCleared, setFormIsCleared] = useState(false); let { setVoiceConversionModels, @@ -53,10 +57,10 @@ function VcModelListPage(props: Props) { setMaybeSelectedVoiceConversionModel, } = props; - const ttsModelsLoaded = voiceConversionModels.length > 0; + const vcModelsLoaded = voiceConversionModels.length > 0; const listModels = useCallback(async () => { - if (ttsModelsLoaded) { + if (vcModelsLoaded) { return; // Already queried. } const models = await ListVoiceConversionModels(); @@ -77,36 +81,20 @@ function VcModelListPage(props: Props) { setVoiceConversionModels, maybeSelectedVoiceConversionModel, setMaybeSelectedVoiceConversionModel, - ttsModelsLoaded, + vcModelsLoaded, ]); - const handleLoading = useCallback(() => { - setLoading(true); - setTimeout(() => { - setLoading(false); - }, 2000); - }, []); - useEffect(() => { listModels(); - const timeout = setTimeout(() => { - setLoading(false); - }, 2000); - return () => clearTimeout(timeout); - }, [ - handleLoading, - listModels, - ]); + }, [listModels]); - const handleClearClick = (ev: React.FormEvent) => { - ev.preventDefault(); - - return false; - }; + const changeConvertIdempotencyToken = () => { + setConvertIdempotencyToken(uuidv4()); + } const interceptModelChange = (maybeSelectedVoiceConversionModel: VoiceConversionModelListItem) => { if (maybeSelectedVoiceConversionModel !== props.maybeSelectedVoiceConversionModel) { - setIdempotencyToken(uuidv4()); + changeConvertIdempotencyToken(); } props.setMaybeSelectedVoiceConversionModel(maybeSelectedVoiceConversionModel); } @@ -117,52 +105,33 @@ function VcModelListPage(props: Props) { } let request : EnqueueVoiceConversionRequest = { - uuid_idempotency_token: idempotencyToken, + uuid_idempotency_token: convertIdempotencyToken, voice_conversion_model_token: props.maybeSelectedVoiceConversionModel.token, source_media_upload_token: mediaUploadToken, }; + Analytics.voiceConversionGenerate(props.maybeSelectedVoiceConversionModel.token); + let result = await EnqueueVoiceConversion(request); - if (EnqueueRemoteDownloadIsOk(result)) { - console.log("successful enqueue"); + if (EnqueueVoiceConversionIsSuccess(result)) { + props.enqueueInferenceJob(result.inference_job_token, FrontendInferenceJobType.VoiceConversion); } }; - const handleFormSubmit = async (ev: React.FormEvent) => { ev.preventDefault(); }; + const loading = false; // TODO: Remove. + const speakButtonClass = loading ? "btn btn-primary w-100 disabled" : "btn btn-primary w-100"; - const canBeginConversion = mediaUploadToken !== undefined && props.maybeSelectedVoiceConversionModel !== undefined; - console.log('canBeginConversion', canBeginConversion, mediaUploadToken, props.maybeSelectedVoiceConversionModel); - - let noResultsSection = ( -
    -
    - -
    - {t("common.SessionTtsInferenceResults.noResults.title")} -
    -

    {t("common.SessionTtsInferenceResults.noResults.subtitle")}

    -
    -
    - ); - - // let comingSoon = ( - //
    - //
    - //
    - // - //

    This feature is coming soon!

    - //
    - //
    - //
    - // ); + const enableConvertButton = canConvert + && mediaUploadToken !== undefined + && props.maybeSelectedVoiceConversionModel !== undefined; return ( @@ -243,11 +212,15 @@ function VcModelListPage(props: Props) {
    -
    + {/*
    @@ -270,32 +243,31 @@ function VcModelListPage(props: Props) { })} />
    +
    +
    */} + +
    + + +
    +
    -
    - - -
    - +
    -
    - - +
    + + +
    + +
    +
    @@ -349,23 +326,10 @@ function VcModelListPage(props: Props) { Session VC Results
    - {noResultsSection} - {/* -
    -
    Title
    -

    text

    -
    - (wavesurfer) -
    - - - Details - -
    -
    */} +
    diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx index cf9313094d..8e7c6bc59f 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx @@ -1,67 +1,171 @@ -import React, { useState } from "react"; +import React, { useEffect, useMemo } from "react"; +import { v4 as uuidv4 } from "uuid"; import { useAudioRecorder } from "react-audio-voice-recorder"; import { InputVcAudioPlayer } from "../../../../_common/InputVcAudioPlayer"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { faMicrophone } from "@fortawesome/pro-solid-svg-icons"; +import { faMicrophone, faUpload } from "@fortawesome/pro-solid-svg-icons"; +import { UploadAudio, UploadAudioIsOk, UploadAudioRequest } from "@storyteller/components/src/api/upload/UploadAudio"; +import { faTrash } from "@fortawesome/free-solid-svg-icons"; -export default function RecordComponent() { - const [recorded, setRecorded] = useState(false); - const [loading, setLoading] = useState(false); - const [audioLink, setAudioLink] = useState(); +interface Props { + setMediaUploadToken: (token?: string) => void, + formIsCleared: boolean, + setFormIsCleared: (cleared: boolean) => void, + + setCanConvert: (canConvert: boolean) => void, + changeConvertIdempotencyToken: () => void, +} + +export default function RecordComponent(props: Props) { const { startRecording, stopRecording, recordingBlob, isRecording } = useAudioRecorder(); - const addAudioElement = (blob: any) => { - stopRecording(); - setLoading(true); - - if (recordingBlob) { - const url = URL.createObjectURL(recordingBlob); - setAudioLink(url); - setRecorded(true); - setLoading(false); + useEffect(() => { + // NB: This is used to detect changes to `recordingBlob` and upload them + if (!recordingBlob) { return; } + + //(async () => { + // let idempotencyToken = uuidv4(); + + // const request : UploadAudioRequest = { + // uuid_idempotency_token: idempotencyToken, + // file: recordingBlob, + // source: 'device', + // } + + // let result = await UploadAudio(request); + + // if (UploadAudioIsOk(result)) { + // //setIsUploadDisabled(true); + // //ggprops.setMediaUploadToken(result.upload_token); + // props.setMediaUploadToken(result.upload_token); + // } + //})(); + }, [recordingBlob]) + + const handleStartRecording = async () => { + startRecording(); + props.setCanConvert(false); }; + const handleStopRecording = async (blob: any) => { + stopRecording(); + props.setFormIsCleared(false); + props.setCanConvert(false); + }; + + const handleClear = () => { + stopRecording(); + props.setMediaUploadToken(undefined); // clear + props.setFormIsCleared(true); + props.setCanConvert(false); + props.changeConvertIdempotencyToken(); + }; + + const handleUpload = async () => { + const request : UploadAudioRequest = { + uuid_idempotency_token: uuidv4(), // TODO: only send on change. + file: recordingBlob, + source: 'device', + } + + let result = await UploadAudio(request); + + if (UploadAudioIsOk(result)) { + props.setMediaUploadToken(result.upload_token); + props.setFormIsCleared(false); + props.setCanConvert(true); + props.changeConvertIdempotencyToken(); + } + } + + const enableMediaReview = !props.formIsCleared && recordingBlob !== undefined; + const enableUploadButton = !props.formIsCleared && recordingBlob !== undefined && !isRecording; + + const speakButtonClass = enableUploadButton + ? "btn btn-primary w-100" + : "btn btn-primary w-100 disabled"; + return (
    {isRecording ? ( - ) : ( - )} - {recorded ? ( -
    - -
    - ) : ( - <> - )} + {enableMediaReview ? ( + <> + + +
    + + +
    + + ) : ( + <> + ) + } + +
    + ); +} + +interface RecorderProps { + recordingBlob: any; +} + +function RecordedAudioComponent(props: RecorderProps) { + + // Only generate the URL on change. + const audioLink = useMemo(() => { + if (!props.recordingBlob) { + return; + } + return URL.createObjectURL(props.recordingBlob); + }, [props.recordingBlob]); + + if (!props.recordingBlob) { + return <>; + } + + return ( +
    +
    ); } diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx index f19068a139..089e940d64 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx @@ -1,4 +1,4 @@ -import { faFileArrowUp, faFileAudio } from "@fortawesome/pro-solid-svg-icons"; +import { faFileArrowUp, faFileAudio, faTrash } from "@fortawesome/pro-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import React, { useState } from "react"; import { FileUploader } from "react-drag-drop-files"; @@ -9,7 +9,13 @@ import { UploadAudio, UploadAudioIsOk, UploadAudioRequest } from "@storyteller/c const FILE_TYPES = ["MP3", "WAV", "FLAC"]; interface Props { - setMediaUploadToken: (token: string) => void, + setMediaUploadToken: (token?: string) => void, + + formIsCleared: boolean, + setFormIsCleared: (cleared: boolean) => void, + + setCanConvert: (canConvert: boolean) => void, + changeConvertIdempotencyToken: () => void, } function UploadComponent(props: Props) { @@ -21,10 +27,14 @@ function UploadComponent(props: Props) { const [idempotencyToken, setIdempotencyToken] = useState(uuidv4()); const handleChange = (file: any) => { + console.log('handle change'); setFile(file); setIdempotencyToken(uuidv4()); const audioUrl = URL.createObjectURL(file); setAudioLink(audioUrl ?? ""); + props.setFormIsCleared(false); + props.setCanConvert(false); + props.changeConvertIdempotencyToken(); }; const handleDragOver = (e: React.DragEvent): void => { @@ -39,6 +49,16 @@ function UploadComponent(props: Props) { e.currentTarget.classList.remove("upload-zone-drag"); }; + const handleClear = () => { + setFile(null); + setAudioLink(""); + setIdempotencyToken(uuidv4()); + props.setMediaUploadToken(undefined); // clear + props.setFormIsCleared(true); + props.setCanConvert(false); + props.changeConvertIdempotencyToken(); + }; + const handleUploadFile = async () => { if (file === undefined) { return false; @@ -47,6 +67,7 @@ function UploadComponent(props: Props) { const request : UploadAudioRequest = { uuid_idempotency_token: idempotencyToken, file: file, + source: 'file', } let result = await UploadAudio(request); @@ -54,7 +75,8 @@ function UploadComponent(props: Props) { if (UploadAudioIsOk(result)) { setIsUploadDisabled(true); props.setMediaUploadToken(result.upload_token); - console.log('TOKEN', result.upload_token) + props.setFormIsCleared(false); + props.setCanConvert(true); } }; @@ -159,6 +181,14 @@ function UploadComponent(props: Props) { /> Upload Audio + + ) : ( <>