diff --git a/packages/components/src/api/model_inference/GetJobStatus.ts b/packages/components/src/api/model_inference/GetJobStatus.ts new file mode 100644 index 0000000000..b5150bb121 --- /dev/null +++ b/packages/components/src/api/model_inference/GetJobStatus.ts @@ -0,0 +1,44 @@ +import MakeRequest from "../MakeRequest"; +import { UserDetailsLight } from "../_common/UserDetailsLight"; + +export interface RequestDetails { + inference_category: string, + maybe_model_type?: string, + maybe_model_token?: string, + maybe_model_title?: string, + maybe_raw_inference_text?: string, +} + +export interface StatusDetails { + status: string, + maybe_extra_status_description?: string, + maybe_failure_category?: string, + attempt_count: number, +} + +export interface ResultDetails { + entity_type: string, + entity_token: string, + maybe_public_bucket_media_path?: string, +} + +export interface JobStatus { + job_token: string, + request: RequestDetails, + status: StatusDetails, + maybe_result?: ResultDetails, + created_at: Date, + updated_at: Date, +} + +export interface GetJobStatusRequest {} + +export interface GetJobStatusResponse { + success: boolean; + state: JobStatus +} + +export const GetJobStatus = MakeRequest({ + method: "GET", + routingFunction: (jobToken: string) =>`/v1/model_inference/job_status/${jobToken}`, +}); diff --git a/packages/fakeyou.com/src/components/common/Card/WeightsCards.tsx b/packages/fakeyou.com/src/components/common/Card/WeightsCards.tsx index ee8ee9d52b..52245242f8 100644 --- a/packages/fakeyou.com/src/components/common/Card/WeightsCards.tsx +++ b/packages/fakeyou.com/src/components/common/Card/WeightsCards.tsx @@ -9,7 +9,6 @@ interface Props { } export default function WeightsCards({ props, type }: Props) { - console.log(props); switch (type) { case WeightCategory.TTS: case WeightCategory.VC: diff --git a/packages/fakeyou.com/src/components/common/NavItem/NavItem.scss b/packages/fakeyou.com/src/components/common/NavItem/NavItem.scss index 7bb28aa022..c46d0cd1a1 100644 --- a/packages/fakeyou.com/src/components/common/NavItem/NavItem.scss +++ b/packages/fakeyou.com/src/components/common/NavItem/NavItem.scss @@ -6,15 +6,21 @@ cursor: pointer; font-size: 15px; font-weight: 500; - color: rgba($white, 0.8); + color: rgba($white, 0.8) !important; transition: 0.15s all; a { - color: rgba($white, 0.8); + color: rgba($white, 0.8) !important; font-size: 15px; - font-weight: 500; + font-weight: 500 !important; transition: 0.15s all; } + + &:hover { + a { + color: $white !important; + } + } } .fy-nav-item:hover .fy-dropdown-menu { diff --git a/packages/fakeyou.com/src/components/common/NavItem/NavItem.tsx b/packages/fakeyou.com/src/components/common/NavItem/NavItem.tsx index c0a38350da..3195eedf42 100644 --- a/packages/fakeyou.com/src/components/common/NavItem/NavItem.tsx +++ b/packages/fakeyou.com/src/components/common/NavItem/NavItem.tsx @@ -30,7 +30,7 @@ export default function NavItem({ }: NavItemProps) { const [isHovered, setIsHovered] = useState(false); - const textHover = `${isHovered && "text-white"}`.trim(); + const textHover = `${isHovered ? "text-white" : ""}`.trim(); const renderContent = () => { if (isHoverable && dropdownItems) { diff --git a/packages/fakeyou.com/src/components/common/VideoQuickTrim/styles.scss b/packages/fakeyou.com/src/components/common/VideoQuickTrim/styles.scss index 567e461701..28aa477ebc 100644 --- a/packages/fakeyou.com/src/components/common/VideoQuickTrim/styles.scss +++ b/packages/fakeyou.com/src/components/common/VideoQuickTrim/styles.scss @@ -13,6 +13,7 @@ $playbar-height: 2rem; } .fy-video { max-height: 500px; + width: 100%; margin-bottom: -7px; video { diff --git a/packages/fakeyou.com/src/components/common/index.tsx b/packages/fakeyou.com/src/components/common/index.tsx index d8032c0830..80e274c861 100644 --- a/packages/fakeyou.com/src/components/common/index.tsx +++ b/packages/fakeyou.com/src/components/common/index.tsx @@ -27,9 +27,11 @@ import NumberSliderV2 from "./NumberSliderV2"; import Pagination from "./Pagination"; import Panel from "./Panel"; import Radio from "./Radio"; +import Scene3D from "./Scene3D"; import Searcher from "./Searcher"; import SegmentButtons from "./SegmentButtons"; import Select from "./Select"; +import SelectionBubbles from "./SelectionBubbles"; import SelectModal, { SelectModalData } from "./SelectModal"; import SelectModalVideoTabs from "./SelectModalVideoTabs"; import SelectModalWeightsTabs from "./SelectModalWeightsTabs"; @@ -49,9 +51,7 @@ import VideoBasic from "./VideoBasic"; import VideoFakeyou from "./VideoFakeyou"; import VideoInput from "./VideoInput"; // import VideoQuickTrim, {QuickTrimType} from "./VideoQuickTrim"; -import SelectionBubbles from "./SelectionBubbles"; -import Scene3D from "./Scene3D"; - +import WeightCoverImage from "./WeightCoverImage"; export type { SelectModalData }; export { @@ -89,9 +89,11 @@ export { Pagination, Panel, Radio, + Scene3D, SegmentButtons, Searcher, Select, + SelectionBubbles, SelectModal, SelectModalVideoTabs, SelectModalWeightsTabs, @@ -110,7 +112,6 @@ export { VideoBasic, VideoFakeyou, VideoInput, + WeightCoverImage, // VideoQuickTrim, - SelectionBubbles, - Scene3D, }; diff --git a/packages/fakeyou.com/src/components/entities/CardBadge.tsx b/packages/fakeyou.com/src/components/entities/CardBadge.tsx index 94587ddda9..6da6e95296 100644 --- a/packages/fakeyou.com/src/components/entities/CardBadge.tsx +++ b/packages/fakeyou.com/src/components/entities/CardBadge.tsx @@ -2,7 +2,7 @@ import React from "react"; import { Badge } from "components/common"; export default function CardBadge(props: any) { - return
+ return
diff --git a/packages/fakeyou.com/src/components/entities/index.tsx b/packages/fakeyou.com/src/components/entities/index.tsx index c93556549c..6773dbf08c 100644 --- a/packages/fakeyou.com/src/components/entities/index.tsx +++ b/packages/fakeyou.com/src/components/entities/index.tsx @@ -1,4 +1,5 @@ import AudioCard from "./AudioCard"; +import CardBadge from "./CardBadge"; import CardFooter from "./CardFooter"; import CardWrapper from "./CardWrapper"; import EntityInput from "./EntityInput"; @@ -6,4 +7,4 @@ import MediaList from "./MediaList"; import OverlayCard from "./OverlayCard"; import WeightCard from "./WeightCard"; -export { AudioCard, CardFooter, CardWrapper, EntityInput, MediaList, OverlayCard, WeightCard }; \ No newline at end of file +export { AudioCard, CardBadge, CardFooter, CardWrapper, EntityInput, MediaList, OverlayCard, WeightCard }; \ No newline at end of file diff --git a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx index 4b450bb292..817dc103d4 100644 --- a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx +++ b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx @@ -22,6 +22,7 @@ import { faWaveformLines, faTransporter, faClipboardList, + faFilm, } from "@fortawesome/pro-solid-svg-icons"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { FakeYouFrontendEnvironment } from "@storyteller/components/src/env/FakeYouFrontendEnvironment"; @@ -231,9 +232,20 @@ export default function SideNav({ let maybeBetaFeatures = <>; if (sessionWrapper.canAccessStudio()) { - maybeBetaFeatures= ( + maybeBetaFeatures = ( <>
  • Beta Features
  • +
  • + + + Storyteller Onboarding + {/* {t("videoStorytellerStudio")} */} + +
  • - + {t("videoStyleTransfer")}
  • diff --git a/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.scss b/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.scss index a60424f16f..63582fb0ca 100644 --- a/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.scss +++ b/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.scss @@ -17,6 +17,11 @@ margin-bottom: 1rem; } + .fy-input { + margin-bottom: 0; + flex-grow: 1; + } + .icon-close-button { cursor: pointer; height: 1.5rem; diff --git a/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.tsx b/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.tsx index c23fda4946..6a70f43960 100644 --- a/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.tsx +++ b/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.tsx @@ -7,10 +7,10 @@ import SkeletonCard from "components/common/Card/SkeletonCard"; import { GetBookmarksByUser } from "@storyteller/components/src/api/bookmarks/GetBookmarksByUser"; import { GetMediaByUser } from "@storyteller/components/src/api/media_files/GetMediaByUser"; import { GetWeightsByUser } from "@storyteller/components/src/api/weights/GetWeightsByUser"; -import { SearchWeights } from "@storyteller/components/src/api/weights/SearchWeights"; +import { SearchWeight } from "@storyteller/components/src/api/weights/Search"; import { MediaFile } from "@storyteller/components/src/api/media_files/GetMedia"; import { Weight } from "@storyteller/components/src/api/weights/GetWeight"; -import { useListContent, +import { useDebounce, useListContent, // useRatings } from "hooks"; import { faArrowDownWideShort, faFilter } from "@fortawesome/pro-solid-svg-icons"; @@ -18,11 +18,14 @@ import prepFilter from "resources/prepFilter"; import ModalHeader from "../ModalHeader"; import "./MediaBrowser.scss"; +const n = () => {}; + interface Props { accept?: AcceptTypes[], handleClose: any; inputMode: EntityInputMode; mediaToken: string; + onSearchChange?: (e: any) => void; onSelect?: any; owner?: string; search?: string; @@ -32,8 +35,9 @@ interface Props { export default function MediaBrowser({ accept, mediaToken, - handleClose = () => {}, + handleClose = n, inputMode, + onSearchChange = n, onSelect, owner, search, @@ -43,15 +47,17 @@ export default function MediaBrowser({ const [showMasonryGrid, setShowMasonryGrid] = useState(true); const [filterType, filterTypeSet] = useState(accept ? accept[0] : "all"); const [list, listSet] = useState([]); - const fetcher = [GetBookmarksByUser,GetMediaByUser,GetWeightsByUser,SearchWeights][inputMode]; + const [localSearch,localSearchSet] = useState(search); + const [searchUpdated,searchUpdatedSet] = useState(false); + const fetcher = [GetBookmarksByUser,GetMediaByUser,GetWeightsByUser,SearchWeight][inputMode]; const entities = useListContent({ debug: "media browser", addQueries: { - ...(search ? {} : { page_size: 24 }), + ...(localSearch ? {} : { page_size: 24 }), ...prepFilter( filterType, - ["maybe_scoped_weight_type", "filter_media_type", "maybe_scoped_weight_type",""][inputMode] + ["maybe_scoped_weight_type", "filter_media_type", "maybe_scoped_weight_type","abc"][inputMode] ), }, addSetters: { filterTypeSet }, @@ -64,13 +70,28 @@ export default function MediaBrowser({ // ratings.gather({ res, key: "token" }); setShowMasonryGrid(true); }, - ...(search ? { request: { search_term: search } } : {}), + ...(localSearch ? { request: { search_term: localSearch } } : {}), requestList: true, - // ...(search ? { resultsKey: "weights" } : {}), - urlParam: owner || username, + ...(localSearch ? { resultsKey: "weights" } : {}), + urlParam: owner || username || "", urlUpdate: false, }); + useDebounce({ + blocked: !searchUpdated, + onTimeout: () => { + searchUpdatedSet(false); + entities.reFetch(); + } + }) + + const localSearchChange = ({ target }: { target: any }) => { + searchUpdatedSet(true); + // entities.reFetch(); + onSearchChange({ target }); + localSearchSet(target.value); + }; + const handlePageClick = (selectedItem: { selected: number }) => { entities.pageChange(selectedItem.selected); }; @@ -108,7 +129,12 @@ export default function MediaBrowser({ return ( <> - + void; + search?: string; title?: string; } -export default function ModalHeader({ children, handleClose, title }: Props) { +export default function ModalHeader({ children, handleClose, onSearchChange = () => {}, search, title }: Props) { return (
    - {title &&

    {title}

    } - {handleClose && ( + { search !== undefined ? : + title &&

    { title }

    } + { handleClose && ( any +} + +export default function useDebounce({ blocked, delay = 500, onTimeout = () => {} }: Props) { + useEffect(() => { + const delayed = setTimeout(() => { + if (!blocked) { + onTimeout(); + } + }, delay) + + return () => clearTimeout(delayed) + }, [blocked,delay,onTimeout]); + + return null; +}; \ No newline at end of file diff --git a/packages/fakeyou.com/src/hooks/useInferenceJobs/useInferenceJobs.tsx b/packages/fakeyou.com/src/hooks/useInferenceJobs/useInferenceJobs.tsx index 2f11e6e8c8..e034f17778 100644 --- a/packages/fakeyou.com/src/hooks/useInferenceJobs/useInferenceJobs.tsx +++ b/packages/fakeyou.com/src/hooks/useInferenceJobs/useInferenceJobs.tsx @@ -16,8 +16,8 @@ export default function useInferenceJobs(jobType: JobListTypes = 0, debug = fals return { // enqueue, - enqueue: (jobToken: string) => { - openJobListModal(); + enqueue: (jobToken: string, noModalPls = false) => { + if (!noModalPls) { openJobListModal(); } enqueue(jobToken,jobType); }, inferenceJobs: jobType === JobListAll.All ? inferenceJobs : (byCategory?.get(jobType - 1) || []), diff --git a/packages/fakeyou.com/src/hooks/useInterval/useInterval.tsx b/packages/fakeyou.com/src/hooks/useInterval/useInterval.tsx index 2424d3a278..c34354597d 100644 --- a/packages/fakeyou.com/src/hooks/useInterval/useInterval.tsx +++ b/packages/fakeyou.com/src/hooks/useInterval/useInterval.tsx @@ -19,20 +19,19 @@ export default function useInterval(props: any) { const { end = 3, index, locked = false, onTick = (e: IntervalEvent) => {}, start = 0 } = config.current; config.current.index = index < end ? index + 1 : start; - if (!locked) onTick(config.current); - }, props.interval); + if (!locked) { + onTick(config.current); + } + }, props.interval || 500); tickerSet(Number(newTicker) || 9999); - // loadedSet(true); } - if (props.locked !== config.current.locked) { + if (ticker && props.locked !== config.current.locked) { config.current.locked = props.locked; + tickerSet(null); + return () => clearInterval(ticker); } - // if (kill && ticker) { // not needed for now - // return () => clearInterval(ticker); - // } - },[props,ticker]); return config.current; diff --git a/packages/fakeyou.com/src/hooks/useJobStatus/index.tsx b/packages/fakeyou.com/src/hooks/useJobStatus/index.tsx new file mode 100644 index 0000000000..84df1132a0 --- /dev/null +++ b/packages/fakeyou.com/src/hooks/useJobStatus/index.tsx @@ -0,0 +1 @@ +export { default } from "./useJobStatus"; \ No newline at end of file diff --git a/packages/fakeyou.com/src/hooks/useJobStatus/useJobStatus.tsx b/packages/fakeyou.com/src/hooks/useJobStatus/useJobStatus.tsx new file mode 100644 index 0000000000..078f563793 --- /dev/null +++ b/packages/fakeyou.com/src/hooks/useJobStatus/useJobStatus.tsx @@ -0,0 +1,38 @@ +import { useState } from 'react'; +import { useInterval } from "hooks"; +import { JobState, jobStateFromString, jobStateCanChange } from "@storyteller/components/src/jobs/JobStates"; +import { GetJobStatus, GetJobStatusResponse, JobStatus } + from "@storyteller/components/src/api/model_inference/GetJobStatus"; + +interface Props { + jobToken?: string; +} + +export default function useJobStatus({ jobToken }: Props) { + const [job,jobSet] = useState(); + const [stop,stopSet] = useState(); + + useInterval({ + // locked: true, + locked: stop || !jobToken, + interval: 1500, + onTick: (a: any) => { + if (jobToken) { + GetJobStatus(jobToken,{}) + .then((res: GetJobStatusResponse) => { + let continuePolling = jobStateCanChange(jobStateFromString(res.state.status.status)); + + console.log("😎",res.state); + jobSet(res.state); + if (!continuePolling) stopSet(true); + }); + } + } + }); + + return { + ...job, + maybe_result: job?.maybe_result || null, + isSuccessful: jobStateFromString(job?.status.status || "") === JobState.COMPLETE_SUCCESS + }; +}; \ No newline at end of file diff --git a/packages/fakeyou.com/src/hooks/useListContent/useListContent.tsx b/packages/fakeyou.com/src/hooks/useListContent/useListContent.tsx index 65c17358fa..906aa6e214 100644 --- a/packages/fakeyou.com/src/hooks/useListContent/useListContent.tsx +++ b/packages/fakeyou.com/src/hooks/useListContent/useListContent.tsx @@ -81,7 +81,7 @@ export default function useListContent({ ...(sort ? { sort_ascending: true } : {}), }; - if (urlParam) { + if (urlParam !== undefined) { if (status === FetchStatus.ready) { let search = new URLSearchParams(queries).toString(); diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index 73c2c0820e..d04313e233 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -123,6 +123,7 @@ import TextToImagePage from "./pages/text_to_image/TextToImagePage"; import DomainConfigProvider from "context/DomainConfigContext"; import DevUpload from "./pages/dev_upload/DevUpload"; import DevMediaInput from "./pages/dev_upload/DevMediaInput"; +import DevTTS from "./pages/dev_tts/DevTTS"; import { StudioIntroPage } from "./pages/storyteller_studio_intro/StudioIntroPage"; import StudioVSTPage from "./pages/storyteller_studio_intro/StudioVST/StudioVSTPage"; import { StudioIntroResultPage } from "./pages/storyteller_studio_intro/StudioIntroResultPage"; @@ -808,11 +809,10 @@ class PageContainer extends React.Component< - { - // - // - // - } + + + + {/* Route for initial voice creation */} (); + const [text,textSet] = useState(""); + const bucketConfig = new BucketConfig(); + const preview = bucketConfig.getCdnUrl(selectedVoice?.cover_image?.maybe_cover_image_public_bucket_path || ""); + + const textChange = ({ target }: { target: any }) => { + textSet(target.value); + }; + + const searchChange = (setUpdate = true) => ({ target }: { target: any }) => { + // console.log("🩵",target.value); + if (setUpdate) updatedSet(true); + // console.log("aaaa",); + searchSet(target.value); + }; + + useDebounce({ + blocked: !(updated && !modalState && search), + onTimeout: () => { + updatedSet(false); + open({ + component: MediaBrowser, + props: { + onSelect: (weight: any) => selectedVoiceSet(weight), + inputMode: 3, + onSearchChange: searchChange(false), + search + } + }); + } + }); + + return + + +