From ff9e421a3a85629a61b392e1660a54647f09df86 Mon Sep 17 00:00:00 2001 From: bflatastic Date: Fri, 9 Aug 2024 08:09:33 +0700 Subject: [PATCH] featured explore list sorting and support new tts model with badges --- .../src/api/_common/enums/WeightType.ts | 2 ++ .../common/Card/AudioCard/AudioCard.tsx | 2 +- .../components/entities/MediaList/MediaList.tsx | 2 ++ .../useWeightTypeInfo/useWeightTypeInfo.tsx | 8 +++++++- .../{ExploreTts.tsx => ExploreVoices.tsx} | 16 +++++++++++----- .../src/v2/view/pages/audio_gen/tts/NewTTS.tsx | 9 +++++++-- .../src/v2/view/pages/audio_gen/vc/NewVC.tsx | 9 +++++++-- 7 files changed, 37 insertions(+), 11 deletions(-) rename src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/{ExploreTts.tsx => ExploreVoices.tsx} (88%) diff --git a/src/website/packages/components/src/api/_common/enums/WeightType.ts b/src/website/packages/components/src/api/_common/enums/WeightType.ts index 246e7ca6b1..962fecd577 100644 --- a/src/website/packages/components/src/api/_common/enums/WeightType.ts +++ b/src/website/packages/components/src/api/_common/enums/WeightType.ts @@ -1,5 +1,7 @@ export enum WeightType { TT2 = "tt2", + GPT_SO_VITS = "gpt_so_vits", + TT2_5 = "tacotron2.5", HIFIGAN_TT2 = "hifigan_tt2", RVCv2 = "rvc_v2", SD_15 = "sd_1.5", diff --git a/src/website/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx b/src/website/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx index 39e9a499d6..6c444bec6a 100644 --- a/src/website/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx +++ b/src/website/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx @@ -178,7 +178,7 @@ export default function AudioCard({ label={weightBadgeLabel} color={weightBadgeColor} /> - + {data?.stats?.positive_rating_count} diff --git a/src/website/packages/fakeyou.com/src/components/entities/MediaList/MediaList.tsx b/src/website/packages/fakeyou.com/src/components/entities/MediaList/MediaList.tsx index 46505b2c2f..fa8e9856e5 100644 --- a/src/website/packages/fakeyou.com/src/components/entities/MediaList/MediaList.tsx +++ b/src/website/packages/fakeyou.com/src/components/entities/MediaList/MediaList.tsx @@ -54,6 +54,8 @@ const Cards = ({ props, type }: MediaCardsProps) => { case "so_vits_svc": return ; case "tt2": + case "tacotron2.5": + case "gpt_so_vits": return ; default: return
Unsupported type
; diff --git a/src/website/packages/fakeyou.com/src/hooks/useWeightTypeInfo/useWeightTypeInfo.tsx b/src/website/packages/fakeyou.com/src/hooks/useWeightTypeInfo/useWeightTypeInfo.tsx index f619d16b64..c4293b0cfd 100644 --- a/src/website/packages/fakeyou.com/src/hooks/useWeightTypeInfo/useWeightTypeInfo.tsx +++ b/src/website/packages/fakeyou.com/src/hooks/useWeightTypeInfo/useWeightTypeInfo.tsx @@ -8,9 +8,15 @@ const weightTypeInfo: WeightTypeInfo = { [WeightType.TT2]: { label: "TT2", color: "teal", fullLabel: "Tacotron 2" }, [WeightType.HIFIGAN_TT2]: { label: "HifiGAN TT2", - color: "blue", + color: "aqua", fullLabel: "HifiGAN Tacotron 2", }, + [WeightType.GPT_SO_VITS]: { + label: "TT+", + color: "blue", + fullLabel: "Tacotron+", + }, + [WeightType.TT2_5]: { label: "TT+", color: "blue", fullLabel: "Tacotron+" }, [WeightType.RVCv2]: { label: "RVC v2", color: "orange", fullLabel: "RVC v2" }, [WeightType.SD_15]: { label: "SD 1.5", diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/ExploreTts.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/ExploreVoices.tsx similarity index 88% rename from src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/ExploreTts.tsx rename to src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/ExploreVoices.tsx index 90c32709f8..f42706161f 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/ExploreTts.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/ExploreVoices.tsx @@ -1,14 +1,18 @@ import { ListFeaturedWeights, Weight } from "@storyteller/components/src/api"; import { useListContent } from "hooks"; import React, { useRef, useState } from "react"; -// import prepFilter from "resources/prepFilter"; import { MasonryGrid, WeightsCards } from "components/common"; +import prepFilter from "resources/prepFilter"; -interface ExploreTtsProps { +interface ExploreVoicesProps { onResultSelect?: (data: any) => void; + filterCategory?: string; } -const ExploreTts = ({ onResultSelect }: ExploreTtsProps) => { +const ExploreVoices = ({ + onResultSelect, + filterCategory, +}: ExploreVoicesProps) => { const [list, listSet] = useState([]); const [showMasonryGrid, setShowMasonryGrid] = useState(false); const gridContainerRef = useRef(null); @@ -17,7 +21,9 @@ const ExploreTts = ({ onResultSelect }: ExploreTtsProps) => { urlUpdate: false, addQueries: { page_size: "48", - // ...prepFilter("image", "filter_media_classes"), + ...(filterCategory + ? prepFilter(filterCategory, "filter_weights_categories") + : {}), }, fetcher: ListFeaturedWeights, list, @@ -87,4 +93,4 @@ const ExploreTts = ({ onResultSelect }: ExploreTtsProps) => { ); }; -export default ExploreTts; +export default ExploreVoices; diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/tts/NewTTS.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/tts/NewTTS.tsx index 4eb5b77edc..a3c5d6a4d5 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/tts/NewTTS.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/tts/NewTTS.tsx @@ -30,7 +30,7 @@ import { v4 as uuidv4 } from "uuid"; import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob"; import { isMobile } from "react-device-detect"; import { useTtsStore } from "hooks"; -import ExploreTts from "../ExploreTts"; +import ExploreTts from "../ExploreVoices"; import { AITools } from "components/marketing"; import VoicePickerPreview from "../VoicePickerPreview"; @@ -67,7 +67,12 @@ export default function NewTTS({ sessionSubscriptionsWrapper }: Props) { inputMode: 3, onSearchChange: searchChange(false), search, - emptyContent: , + emptyContent: ( + + ), showFilters: false, showPagination: false, searchFilter: "text_to_speech", diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/vc/NewVC.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/vc/NewVC.tsx index f2cb99a835..9e86a58901 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/vc/NewVC.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/audio_gen/vc/NewVC.tsx @@ -28,7 +28,7 @@ import { v4 as uuidv4 } from "uuid"; import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob"; import { isMobile } from "react-device-detect"; import { useVcStore } from "hooks"; -import ExploreTts from "../ExploreTts"; +import ExploreVoices from "../ExploreVoices"; import { AITools } from "components/marketing"; import VoicePickerPreview from "../VoicePickerPreview"; import VCRecordComponent from "./VCRecordComponent"; @@ -86,7 +86,12 @@ export default function NewVC({ sessionSubscriptionsWrapper }: Props) { inputMode: 3, onSearchChange: searchChange(false), search, - emptyContent: , + emptyContent: ( + + ), showFilters: false, showPagination: false, searchFilter: "voice_conversion",