From 1bb24b7b4531348cf8a0d931ce4ccfe332c1d00a Mon Sep 17 00:00:00 2001 From: Hayk Martiros Date: Fri, 16 Dec 2022 08:45:02 -0800 Subject: [PATCH] Cleanup tweaks --- components/PromptPanel.tsx | 18 ++++++---- components/Settings.tsx | 2 +- pages/about.tsx | 15 ++++---- pages/index.tsx | 2 +- prompts.ts | 71 -------------------------------------- samplePrompts.ts | 69 ++++++++++++++++++++++++++++++++++++ 6 files changed, 90 insertions(+), 87 deletions(-) delete mode 100644 prompts.ts create mode 100644 samplePrompts.ts diff --git a/components/PromptPanel.tsx b/components/PromptPanel.tsx index ac8f3ca..da2f57c 100644 --- a/components/PromptPanel.tsx +++ b/components/PromptPanel.tsx @@ -2,8 +2,7 @@ import PromptEntry from "./PromptEntry"; import { AppState, PlayingState, InferenceResult, PromptInput } from "../types"; import { useRef } from "react"; -import { samplePrompts, rollTheDicePrompts } from "../prompts"; - +import { samplePrompts, rollTheDicePrompts } from "../samplePrompts"; interface PromptPanelProps { prompts: PromptInput[]; @@ -151,9 +150,9 @@ export default function PromptPanel({ const prompts = [...samplePrompts, ...rollTheDicePrompts]; const selectedPrompt = prompts[Math.floor(Math.random() * prompts.length)]; - + inputPrompt.current.value = selectedPrompt; - } + }; return ( <> @@ -204,8 +203,15 @@ export default function PromptPanel({ />
-
- +
+
diff --git a/components/Settings.tsx b/components/Settings.tsx index da52a18..f37d820 100644 --- a/components/Settings.tsx +++ b/components/Settings.tsx @@ -103,7 +103,7 @@ export default function Settings({

Riffusion generates music from text prompts. Try your - favorite artists, instruments like saxophone or violin, + favorite styles, instruments like saxophone or violin, modifiers like arabic or jamaican, genres like jazz or gospel, sounds like church bells or rain, or any combination. Play with the settings below to explore the diff --git a/pages/about.tsx b/pages/about.tsx index fa3ea8e..e05a1b7 100644 --- a/pages/about.tsx +++ b/pages/about.tsx @@ -449,7 +449,7 @@ export default function Home() {

Prompt - When providing prompts, get creative! Try your - favorite artists, instruments like saxophone or violin, modifiers + favorite styles, instruments like saxophone or violin, modifiers like arabic or jamaican, genres like jazz or rock, sounds like church bells or rain, or any combination. Many words that are not present in the training data still work because the text encoder can @@ -468,9 +468,9 @@ export default function Home() {

Parameters can also be specified via URL, for example:
- - https://www.riffusion.com/? &prompt=rainy+day& denoising=0.85& - seedImageId=og_beat + + https://www.riffusion.com/?&prompt=rainy+day& + denoising=0.85&seedImageId=og_beat

Examples

@@ -558,10 +558,10 @@ export default function Home() { 

             {`@software{Forsgren_Martiros_2022,
-  author = {Forsgren, Seth* 
+  author = {Forsgren, Seth*
     and Martiros, Hayk*},
-  title = {{Riffusion - 
-    Stable diffusion for 
+  title = {{Riffusion -
+    Stable diffusion for
     real-time music generation}},
   url = {https://riffusion.com/about},
   year = {2022}
@@ -577,7 +577,6 @@ export default function Home() {
 }`}
- diff --git a/pages/index.tsx b/pages/index.tsx index 999fd1a..36697f3 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -13,7 +13,7 @@ import Pause from "../components/Pause"; import PromptPanel from "../components/PromptPanel"; import ThreeCanvas from "../components/ThreeCanvas"; -import { samplePrompts, initialSeeds, initialSeedImageMap } from "../prompts"; +import { samplePrompts, initialSeeds, initialSeedImageMap } from "../samplePrompts"; import { AppState, diff --git a/prompts.ts b/prompts.ts deleted file mode 100644 index 98f1172..0000000 --- a/prompts.ts +++ /dev/null @@ -1,71 +0,0 @@ -// List of interesting prompts to randomly sample. -export const samplePrompts = [ - "lo-fi beat for the holidays", - "techno DJ and a country fiddle", - "classical italian tenor operatic pop", - "kygo tropical dance marvin gaye", - "eminem style anger rap", - "church bells", - "funk bassline with a jazzy saxophone", - "piano concerto in a minor", - "rock and roll electric guitar solo", - "acoustic folk violin jam", - "k-pop boy group", - "typing", - "post-teen pop talent show winner", - "sean paul dancehall", - "mambo but from kenya", - "jack johnson vocals", - "swing jazz trumpet", - "bubblegum eurodance", - "brazilian Forró dance", - "bongos on a havana street", - "copacabana beach", - "psychedelic nepalese trance", - "jazzy rapping from paris", - "ancient chinese hymn", -]; - -export const rollTheDicePrompts = [ - "arabic (vocals:1.5)", - "classic rock mellow gold progressive", - "west coast rap vocals", - "classical flute", - "church organ with a harpsichord", - "uk permanent wave pop", - "chainsaw funk", - "laughing", - "tropical deep sea", - "piano funk", - "jamaican ska rap", - "tropical electro house moombahton", - "breathing", - "water drops", - "british soul dance", - "pop r&b urban contemporary", - "baroque new wave pop", - "reggae fusion", - "tropical german dance house", - "alarm clock", - "(caribbean:1.5) (jazz:0.3)", - "new orleans blues", - "clarinet with maracas", - "sultry sinatra", - "square dancing in wyoming", -]; - -export const initialSeedImageMap = { - "og_beat": [3, 738973, 674, 745234, 808, 231, 3324, 323984, 123, 51209, 123, 51209, 6754, 8730], - "agile": [808, 231, 3324, 323984], - "marim": [123, 51209, 6754, 8730], - "motorway": [8730, 323984, 745234], - "vibes": [4205, 94, 78530] - } - -export const initialSeeds = [ - "og_beat", - // "agile", - // "marim", - // "motorway", - // "vibes" - ] diff --git a/samplePrompts.ts b/samplePrompts.ts new file mode 100644 index 0000000..441b35d --- /dev/null +++ b/samplePrompts.ts @@ -0,0 +1,69 @@ +// List of interesting prompts to randomly sample. +export const samplePrompts = [ + "acoustic folk violin jam", + "ancient chinese hymn", + "anger rap", + "bongos on a havana street", + "brazilian Forró dance", + "bubblegum eurodance", + "church bells", + "classical italian tenor operatic pop", + "copacabana beach", + "funk bassline with a jazzy saxophone", + "jamaican dancehall vocals", + "jazzy rapping from paris", + "k-pop boy group", + "lo-fi beat for the holidays", + "mambo but from kenya", + "piano concerto in a minor", + "post-teen pop talent show winner", + "psychedelic nepalese trance", + "rock and roll electric guitar solo", + "smooth tropical dance jazz", + "swing jazz trumpet", + "techno DJ and a country fiddle", + "typing", +]; + +export const rollTheDicePrompts = [ + "(caribbean:1.5) (jazz:0.3)", + "alarm clock", + "arabic (vocals:1.5)", + "baroque new wave pop", + "breathing", + "british soul dance", + "chainsaw funk", + "church organ with a harpsichord", + "clarinet with maracas", + "classic rock mellow gold progressive", + "classical flute", + "jamaican ska rap", + "laughing", + "new orleans blues", + "piano funk", + "pop r&b urban contemporary", + "reggae fusion", + "square dancing in wyoming", + "tropical deep sea", + "tropical electro house moombahton", + "tropical german dance house", + "uk permanent wave pop", + "water drops", + "west coast rap vocals", +]; + +export const initialSeedImageMap = { + "og_beat": [3, 738973, 674, 745234, 808, 231, 3324, 323984, 123, 51209, 123, 51209, 6754, 8730], + "agile": [808, 231, 3324, 323984], + "marim": [123, 51209, 6754, 8730], + "motorway": [8730, 323984, 745234], + "vibes": [4205, 94, 78530] +} + +export const initialSeeds = [ + "og_beat", + // "agile", + // "marim", + // "motorway", + // "vibes" +]