*/}
+
+ {/* {npzData.map((npz) => (
+
+ ))} */}
+ {npzData
+ .map((npz) => ({
+ npz,
+ generations: generations.filter(
+ ({ history_hash }) => history_hash === npz.hash
+ ),
+ }))
+ .map(({ npz, generations }) => (
+
+ {generations.map((generation) => (
+
+ ))}
+
+ ))}
+
{" "}
+
+
+ );
+}
+
+export const getStaticProps = async () => {
+ const generations: GenerationRaw[] = await getOggData();
+ const npzData = await getNpzData();
+ return {
+ props: {
+ generations: generations,
+ npzData: npzData,
+ },
+ };
+};
diff --git a/react-ui/src/styles/globals.css b/react-ui/src/styles/globals.css
new file mode 100644
index 00000000..100acf78
--- /dev/null
+++ b/react-ui/src/styles/globals.css
@@ -0,0 +1,27 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+:root {
+ --foreground-rgb: 0, 0, 0;
+ --background-start-rgb: 214, 219, 220;
+ --background-end-rgb: 255, 255, 255;
+}
+
+@media (prefers-color-scheme: dark) {
+ :root {
+ /* --foreground-rgb: 255, 255, 255;
+ --background-start-rgb: 0, 0, 0;
+ --background-end-rgb: 0, 0, 0; */
+ }
+}
+
+body {
+ color: rgb(var(--foreground-rgb));
+ background: linear-gradient(
+ to bottom,
+ transparent,
+ rgb(var(--background-end-rgb))
+ )
+ rgb(var(--background-start-rgb));
+}
diff --git a/react-ui/src/types/Generation.tsx b/react-ui/src/types/Generation.tsx
new file mode 100644
index 00000000..4bf87450
--- /dev/null
+++ b/react-ui/src/types/Generation.tsx
@@ -0,0 +1,50 @@
+export type Generation = {
+ name: string;
+ prompt?: string;
+ directory: string;
+ audio: string;
+ tags: string[];
+ // deprecated
+ download: string;
+ language:
+ | "american"
+ | "german"
+ | "spanish"
+ | "french"
+ | "hindi"
+ | "chinese"
+ | "portuguese"
+ | "russian"
+ | "turkish"
+ | "polish"
+ | "korean"
+ | "japanese"
+ | "italian";
+ author: string;
+ gender: "male" | "female" | "other";
+ image: string;
+};
+
+export interface GenerationRaw {
+ prompt: string;
+ language: string;
+ speaker_id: string;
+ history_prompt: string;
+ history_prompt_npz: string;
+ history_hash: string;
+ text_temp: number;
+ waveform_temp: number;
+ date: string;
+ seed: string;
+ filename: string;
+ filename_png: string;
+ filename_json: string;
+ filename_npz: string;
+
+ is_big_semantic_model: boolean;
+ is_big_coarse_model: boolean;
+ is_big_fine_model: boolean;
+
+ hash?: string;
+ name?: string;
+}
diff --git a/react-ui/src/types/Voice.tsx b/react-ui/src/types/Voice.tsx
new file mode 100644
index 00000000..e3e92184
--- /dev/null
+++ b/react-ui/src/types/Voice.tsx
@@ -0,0 +1,11 @@
+
+export type Voice = {
+ name: string;
+ image: string;
+ audio: string;
+ download: string;
+ tags: string[];
+ language: "american" | "german" | "spanish" | "french" | "hindi" | "chinese" | "portuguese" |"russian" | "turkish" | "polish" | "korean" | "japanese" | "italian";
+ author: string;
+ gender: "male" | "female" | "other";
+};
diff --git a/react-ui/tailwind.config.js b/react-ui/tailwind.config.js
new file mode 100644
index 00000000..d53b2eaa
--- /dev/null
+++ b/react-ui/tailwind.config.js
@@ -0,0 +1,18 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+ content: [
+ './src/pages/**/*.{js,ts,jsx,tsx,mdx}',
+ './src/components/**/*.{js,ts,jsx,tsx,mdx}',
+ './src/app/**/*.{js,ts,jsx,tsx,mdx}',
+ ],
+ theme: {
+ extend: {
+ backgroundImage: {
+ 'gradient-radial': 'radial-gradient(var(--tw-gradient-stops))',
+ 'gradient-conic':
+ 'conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))',
+ },
+ },
+ },
+ plugins: [],
+}
diff --git a/react-ui/tsconfig.json b/react-ui/tsconfig.json
new file mode 100644
index 00000000..c49d55ee
--- /dev/null
+++ b/react-ui/tsconfig.json
@@ -0,0 +1,45 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "lib": [
+ "dom",
+ "dom.iterable",
+ "esnext"
+ ],
+ "allowJs": true,
+ "skipLibCheck": true,
+ "strict": true,
+ "forceConsistentCasingInFileNames": true,
+ "noEmit": true,
+ "esModuleInterop": true,
+ "module": "esnext",
+ "moduleResolution": "node",
+ "resolveJsonModule": true,
+ "isolatedModules": true,
+ "jsx": "preserve",
+ "incremental": true,
+ "noImplicitAny": false,
+ "paths": {
+ "@/*": [
+ "./src/*"
+ ]
+ },
+ "plugins": [
+ {
+ "name": "next"
+ }
+ ]
+ },
+ "include": [
+ "next-env.d.ts",
+ "**/*.ts",
+ "**/*.tsx",
+ ".next/types/**/*.ts"
+ ],
+ "exclude": [
+ "node_modules"
+ ],
+ "ts-node": {
+ "esm": true
+ }
+}
diff --git a/src/bark/generation_tab_bark.py b/src/bark/generation_tab_bark.py
index a978de3b..97b81d98 100644
--- a/src/bark/generation_tab_bark.py
+++ b/src/bark/generation_tab_bark.py
@@ -403,7 +403,7 @@ def gen(
waveform_temp=waveform_temp,
history_prompt=history_prompt,
history_prompt_semantic=history_prompt_semantic,
- seed=seed,
+ seed=_original_seed,
index=i,
)
pieces += [audio_array]
@@ -702,6 +702,7 @@ def generate_button(text, count, variant):
fn=generate_multi(count, output_components),
inputs=inputs,
outputs=all_outputs_flat,
+ # api_name=f"bark_{count}",
)
return button
diff --git a/src/demucs/demucs_tab.py b/src/demucs/demucs_tab.py
index f3671db8..86daaad7 100644
--- a/src/demucs/demucs_tab.py
+++ b/src/demucs/demucs_tab.py
@@ -68,6 +68,7 @@ def demucs_ui():
inputs=demucs_input,
outputs=outputs,
fn=demucs_audio,
+ api_name="demucs",
)
diff --git a/src/musicgen/musicgen_tab.py b/src/musicgen/musicgen_tab.py
index 2a070a61..c027bdd9 100644
--- a/src/musicgen/musicgen_tab.py
+++ b/src/musicgen/musicgen_tab.py
@@ -29,6 +29,7 @@
AUDIOCRAFT_VERSION = version("audiocraft")
FB_MUSICGEN_MELODY = "facebook/musicgen-melody"
+
class MusicGenGeneration(TypedDict):
model: str
text: str
@@ -226,6 +227,7 @@ def generate(params: MusicGenGeneration, melody_in: Optional[Tuple[int, np.ndarr
os.path.dirname(filename),
plot,
params["seed"],
+ _metadata,
]
@@ -410,6 +412,9 @@ def update_json(
}
seed_cache = gr.State() # type: ignore
+ result_json = gr.JSON(
+ visible=False,
+ )
set_old_seed_button.click(
fn=lambda x: gr.Number.update(value=x),
@@ -424,8 +429,8 @@ def update_json(
).then(
fn=generate,
inputs=[musicgen_atom, melody],
- outputs=[output, history_bundle_name_data, image, seed_cache],
- api_name="MusicGen",
+ outputs=[output, history_bundle_name_data, image, seed_cache, result_json],
+ api_name="musicgen",
)
return tab, musicgen_atom
diff --git a/update.py b/update.py
index 548ec67a..e384c266 100644
--- a/update.py
+++ b/update.py
@@ -20,14 +20,39 @@ def try_install(requirements, name=None):
print(f"Failed to install {name or requirements} dependencies")
+def is_node_installed():
+ try:
+ print("Checking if node is installed...")
+ do("node --version")
+ return True
+ except Exception:
+ print("Node is not installed, skipping node_modules setup")
+ return False
+
+
+def setup_node_modules():
+ try:
+ print("Installing node_modules...")
+ do("cd react-ui && npm install")
+ print("Successfully installed node_modules")
+ except Exception:
+ print("Failed to install node_modules")
+
+
def main():
print("Updating dependencies...")
try_install("requirements_audiocraft.txt", "musicgen, audiocraft")
- try_install("requirements_bark_hubert_quantizer.txt", "Bark Voice Clone, bark-hubert-quantizer")
+ try_install(
+ "requirements_bark_hubert_quantizer.txt",
+ "Bark Voice Clone, bark-hubert-quantizer",
+ )
try_install("requirements_rvc.txt", "RVC")
# hydracore fix because of fairseq
do("pip install hydra-core==1.3.2")
+ if is_node_installed():
+ setup_node_modules()
+
if __name__ == "__main__":
main()
+