more plumbing

This commit is contained in:
Brandon Thomas committed 2022-01-05 21:22:01 -05:00
1 parent 6a9996ce96
commit 5d8279cc0d
5 files changed
+111 -59

No files matched your search

+12
View File
@@ -38,6 +38,12 @@ interface Props {
allTtsCategoriesByTokenMap: Map<string,TtsCategory>,
allTtsModelsByTokenMap: Map<string,TtsModelListItem>,
ttsModelsByCategoryToken: Map<string,Set<TtsModelListItem>>,
dropdownCategories: TtsCategory[][],
setDropdownCategories: (dropdownCategories: TtsCategory[][]) => void,
selectedCategories: TtsCategory[],
setSelectedCategories: (selectedCategories: TtsCategory[]) => void,
}
interface State {
@@ -456,6 +462,12 @@ class App extends React.Component<Props, State> {
allTtsCategoriesByTokenMap={this.props.allTtsCategoriesByTokenMap}
allTtsModelsByTokenMap={this.props.allTtsModelsByTokenMap}
ttsModelsByCategoryToken={this.props.ttsModelsByCategoryToken}
dropdownCategories={this.props.dropdownCategories}
setDropdownCategories={this.props.setDropdownCategories}
selectedCategories={this.props.selectedCategories}
setSelectedCategories={this.props.setSelectedCategories}
currentTtsModelSelected={this.state.currentTtsModelSelected}
setCurrentTtsModelSelected={this.setCurrentTtsModelSelected}
+12 -5
View File
@@ -23,6 +23,12 @@ export function AppWrapper(props: Props) {
const [allCategoriesByTokenMap, setAllCategoriesByTokenMap] = useState<Map<string,TtsCategory>>(new Map());
const [allTtsModelsByTokenMap, setAllTtsModelsByTokenMap] = useState<Map<string,TtsModelListItem>>(new Map());
// Lookup by foreign key
// A TTS voice is attached to every category up the tree from the leaf.
// We recursively build this, 1) to ensure we can access a voice at all levels
// of specificity, and 2) to prune empty categories.
const [ttsModelsByCategoryToken, setTtsModelsByCategoryToken] = useState<Map<string,Set<TtsModelListItem>>>(new Map());
// Outer array has length of at least one, one element per <select>
// Inner array contains the categories in each level.
// Structure: [dropdownLevel][categories]
@@ -33,11 +39,6 @@ export function AppWrapper(props: Props) {
// Structure: [firstSelected, secondSelected...]
const [selectedCategories, setSelectedCategories] = useState<TtsCategory[]>([]);
// A TTS voice is attached to every category up the tree from the leaf.
// We recursively build this, 1) to ensure we can access a voice at all levels
// of specificity, and 2) to prune empty categories.
const [ttsModelsByCategoryToken, setTtsModelsByCategoryToken] = useState<Map<string,Set<TtsModelListItem>>>(new Map());
// TODO: Handle empty category list
useEffect(() => {
// Category lookup by token
@@ -269,6 +270,12 @@ export function AppWrapper(props: Props) {
allTtsCategoriesByTokenMap={allCategoriesByTokenMap}
allTtsModelsByTokenMap={allTtsModelsByTokenMap}
ttsModelsByCategoryToken={ttsModelsByCategoryToken}
dropdownCategories={dropdownCategories}
setDropdownCategories={setDropdownCategories}
selectedCategories={selectedCategories}
setSelectedCategories={setSelectedCategories}
/>
</>
)
@@ -77,6 +77,12 @@ interface Props {
allTtsCategoriesByTokenMap: Map<string,TtsCategory>,
allTtsModelsByTokenMap: Map<string,TtsModelListItem>,
ttsModelsByCategoryToken: Map<string,Set<TtsModelListItem>>,
dropdownCategories: TtsCategory[][],
setDropdownCategories: (dropdownCategories: TtsCategory[][]) => void,
selectedCategories: TtsCategory[],
setSelectedCategories: (selectedCategories: TtsCategory[]) => void,
currentTtsModelSelected?: TtsModelListItem,
setCurrentTtsModelSelected: (ttsModel: TtsModelListItem) => void,
@@ -373,6 +379,11 @@ class NewVocodesContainer extends React.Component<Props, State> {
setAllTtsCategories={this.props.setAllTtsCategories}
allTtsCategoriesByTokenMap={this.props.allTtsCategoriesByTokenMap}
allTtsModelsByTokenMap={this.props.allTtsModelsByTokenMap}
ttsModelsByCategoryToken={this.props.ttsModelsByCategoryToken}
dropdownCategories={this.props.dropdownCategories}
setDropdownCategories={this.props.setDropdownCategories}
selectedCategories={this.props.selectedCategories}
setSelectedCategories={this.props.setSelectedCategories}
currentTtsModelSelected={this.props.currentTtsModelSelected}
setCurrentTtsModelSelected={this.props.setCurrentTtsModelSelected}
/>
@@ -10,6 +10,12 @@ interface Props {
allTtsCategoriesByTokenMap: Map<string,TtsCategory>,
allTtsModelsByTokenMap: Map<string,TtsModelListItem>,
ttsModelsByCategoryToken: Map<string,Set<TtsModelListItem>>,
dropdownCategories: TtsCategory[][],
setDropdownCategories: (dropdownCategories: TtsCategory[][]) => void,
selectedCategories: TtsCategory[],
setSelectedCategories: (selectedCategories: TtsCategory[]) => void,
// Pass state up the chain
setCurrentTtsModelSelected: (ttsModel: TtsModelListItem) => void,
@@ -21,63 +27,68 @@ export function MultiDropdownSearch(props: Props) {
allTtsModels,
allTtsCategoriesByTokenMap,
allTtsModelsByTokenMap,
ttsModelsByCategoryToken,
dropdownCategories,
setDropdownCategories,
selectedCategories,
setSelectedCategories,
} = props;
// Outer array has length of at least one, one element per <select>
// Inner array contains the categories in each level.
// Structure: [dropdownLevel][categories]
const [dropdownCategories, setDropdownCategories] = useState<TtsCategory[][]>([]);
// // Outer array has length of at least one, one element per <select>
// // Inner array contains the categories in each level.
// // Structure: [dropdownLevel][categories]
// const [dropdownCategories, setDropdownCategories] = useState<TtsCategory[][]>([]);
//
// // Every category in the heirarchy that has been selected by the user.
// // Empty list if none are selected.
// // Structure: [firstSelected, secondSelected...]
// const [selectedCategories, setSelectedCategories] = useState<TtsCategory[]>([]);
//
// // A TTS voice is attached to every category up the tree from the leaf.
// // We recursively build this, 1) to ensure we can access a voice at all levels
// // of specificity, and 2) to prune empty categories.
// const [ttsModelsByCategoryToken, setTtsModelsByCategoryToken] = useState<Map<string,Set<TtsModelListItem>>>(new Map());
// Every category in the heirarchy that has been selected by the user.
// Empty list if none are selected.
// Structure: [firstSelected, secondSelected...]
const [selectedCategories, setSelectedCategories] = useState<TtsCategory[]>([]);
// A TTS voice is attached to every category up the tree from the leaf.
// We recursively build this, 1) to ensure we can access a voice at all levels
// of specificity, and 2) to prune empty categories.
const [ttsModelsByCategoryToken, setTtsModelsByCategoryToken] = useState<Map<string,Set<TtsModelListItem>>>(new Map());
// TODO: Handle empty category list
useEffect(() => {
// Initial dropdown state
const rootCategories = allTtsCategories.filter(category => {
return !category.maybe_super_category_token;
});
const rootLevel = [rootCategories];
setDropdownCategories(rootLevel);
// Voice lookup table
let categoriesToTtsModelTokens = new Map();
// Category ancestry memoization
let categoryTokenToAllAncestorTokens : Map<string, Set<string>> = new Map();
// N * M with memoization should't be too bad here.
// Also note that the models should be lexographically sorted by name.
allTtsModels.forEach(ttsModel => {
if (ttsModel.category_tokens.length === 0) {
// TODO: Attach to "uncategorized" special category
return;
}
ttsModel.category_tokens.forEach(categoryToken => {
let ancestors = categoryTokenToAllAncestorTokens.get(categoryToken);
if (ancestors === undefined) {
ancestors = findAllAncestorTokens(categoryToken, allTtsCategoriesByTokenMap);
categoryTokenToAllAncestorTokens.set(categoryToken, ancestors);
}
ancestors.forEach(categoryToken => {
let models : Set<TtsModelListItem> = categoriesToTtsModelTokens.get(categoryToken);
if (models === undefined) {
models = new Set();
categoriesToTtsModelTokens.set(categoryToken, models);
}
models.add(ttsModel);
})
});
});
setTtsModelsByCategoryToken(categoriesToTtsModelTokens);
}, [allTtsCategories, allTtsModels, allTtsCategoriesByTokenMap]);
// // TODO: Handle empty category list
// useEffect(() => {
// // Initial dropdown state
// const rootCategories = allTtsCategories.filter(category => {
// return !category.maybe_super_category_token;
// });
// const rootLevel = [rootCategories];
// setDropdownCategories(rootLevel);
//
// // Voice lookup table
// let categoriesToTtsModelTokens = new Map();
// // Category ancestry memoization
// let categoryTokenToAllAncestorTokens : Map<string, Set<string>> = new Map();
//
// // N * M with memoization should't be too bad here.
// // Also note that the models should be lexographically sorted by name.
// allTtsModels.forEach(ttsModel => {
// if (ttsModel.category_tokens.length === 0) {
// // TODO: Attach to "uncategorized" special category
// return;
// }
// ttsModel.category_tokens.forEach(categoryToken => {
// let ancestors = categoryTokenToAllAncestorTokens.get(categoryToken);
// if (ancestors === undefined) {
// ancestors = findAllAncestorTokens(categoryToken, allTtsCategoriesByTokenMap);
// categoryTokenToAllAncestorTokens.set(categoryToken, ancestors);
// }
// ancestors.forEach(categoryToken => {
// let models : Set<TtsModelListItem> = categoriesToTtsModelTokens.get(categoryToken);
// if (models === undefined) {
// models = new Set();
// categoriesToTtsModelTokens.set(categoryToken, models);
// }
// models.add(ttsModel);
// })
// });
// });
// setTtsModelsByCategoryToken(categoriesToTtsModelTokens);
//
// }, [allTtsCategories, allTtsModels, allTtsCategoriesByTokenMap]);
const doChangeCategory = (level: number, maybeToken: string) => {
@@ -42,6 +42,12 @@ interface Props {
allTtsCategoriesByTokenMap: Map<string,TtsCategory>,
allTtsModelsByTokenMap: Map<string,TtsModelListItem>,
ttsModelsByCategoryToken: Map<string,Set<TtsModelListItem>>,
dropdownCategories: TtsCategory[][],
setDropdownCategories: (dropdownCategories: TtsCategory[][]) => void,
selectedCategories: TtsCategory[],
setSelectedCategories: (selectedCategories: TtsCategory[]) => void,
// TODO: rename 'active'
currentTtsModelSelected?: TtsModelListItem,
@@ -214,6 +220,11 @@ function TtsModelListFc(props: Props) {
allTtsModels={props.ttsModels}
allTtsCategoriesByTokenMap={props.allTtsCategoriesByTokenMap}
allTtsModelsByTokenMap={props.allTtsModelsByTokenMap}
ttsModelsByCategoryToken={props.ttsModelsByCategoryToken}
dropdownCategories={props.dropdownCategories}
setDropdownCategories={props.setDropdownCategories}
selectedCategories={props.selectedCategories}
setSelectedCategories={props.setSelectedCategories}
setCurrentTtsModelSelected={props.setCurrentTtsModelSelected}
/>