add remix and data sample

ui/components.py

@@ -1,52 +1,51 @@
 import gradio as gr
-from pathlib import Path
 
 
-TAG_PLACEHOLDER = "jazz, deep, bass-driven, conscious, acid jazz, electronic, 90 bpm"
+TAG_PLACEHOLDER = "funk, pop, soul, rock, melodic, guitar, drums, bass, keyboard, percussion, 105 BPM, energetic, upbeat, groovy, vibrant, dynamic"
 LYRIC_PLACEHOLDER = """[verse]
-夜风轻轻吹过脸颊，
-城市霓虹闪烁如画。
-脚步追随节奏的牵挂，
-思绪飘荡，梦的火花。
-
-[chorus]
-夜色中，心如电光闪耀，
-节奏深，带我飞向云霄。
-音符跳跃，击退烦忧来到，
-在这梦里，我们自由起舞不老。
+Neon lights they flicker bright
+City hums in dead of night
+Rhythms pulse through concrete veins
+Lost in echoes of refrains
 
 [verse]
-低音如潮冷冷拉扯，
-心跳同步，扣人心弦如歌。
-键盘奏出泪隐藏的选择，
-鼓点敲醒藏于夜里的角色。
+Bassline groovin' in my chest
+Heartbeats match the city's zest
+Electric whispers fill the air
+Synthesized dreams everywhere
 
 [chorus]
-夜色中，心如电光闪耀，
-节奏深，带我飞向云霄。
-音符跳跃，击退烦忧来到，
-在这梦里，我们自由起舞不老。
+Turn it up and let it flow
+Feel the fire let it grow
+In this rhythm we belong
+Hear the night sing out our song
+
+[verse]
+Guitar strings they start to weep
+Wake the soul from silent sleep
+Every note a story told
+In this night we’re bold and gold
 
 [bridge]
-每一滴汗珠画出轨迹，
-肢体语言无声诉心意。
-触碰世界不可言语的秘语，
-在旋律中找回真实的自己。
+Voices blend in harmony
+Lost in pure cacophony
+Timeless echoes timeless cries
+Soulful shouts beneath the skies
 
-[chorus]
-夜色中，心如电光闪耀，
-节奏深，带我飞向云霄。
-音符跳跃，击退烦忧来到，
-在这梦里，我们自由起舞不老。
+[verse]
+Keyboard dances on the keys
+Melodies on evening breeze
+Catch the tune and hold it tight
+In this moment we take flight
 """
 
 
-def create_output_ui():
+def create_output_ui(task_name="Text2Music"):
     # For many consumer-grade GPU devices, only one batch can be run
-    output_audio1 = gr.Audio(type="filepath", label="Generated Audio 1")
+    output_audio1 = gr.Audio(type="filepath", label=f"{task_name} Generated Audio 1")
     # output_audio2 = gr.Audio(type="filepath", label="Generated Audio 2")
-    with gr.Accordion("Input Parameters", open=False):
-        input_params_json = gr.JSON(label="Input Parameters")
+    with gr.Accordion(f"{task_name} Parameters", open=False):
+        input_params_json = gr.JSON(label=f"{task_name} Parameters")
     # outputs = [output_audio1, output_audio2]
     outputs = [output_audio1]
     return outputs, input_params_json
@@ -60,24 +59,25 @@ def dump_func(*args):
 def create_text2music_ui(
     gr,
     text2music_process_func,
-    sample_bnt=None,
     sample_data_func=None,
 ):
     with gr.Row():
         with gr.Column():
-
-            audio_duration = gr.Slider(-1, 300.0, step=0.1, value=60, label="Audio Duration", interactive=True, info="Duration of the audio in seconds. -1 means random duration (30 ~ 300).")
-
+            
+            with gr.Row(equal_height=True):
+                audio_duration = gr.Slider(-1, 240.0, step=0.00001, value=180, label="Audio Duration", interactive=True, info="Duration of the audio in seconds. -1 means random duration (30 ~ 240).", scale=9)
+                sample_bnt = gr.Button("Sample", variant="primary", scale=1)
+            
             prompt = gr.Textbox(lines=2, label="Tags", max_lines=4, placeholder=TAG_PLACEHOLDER)
             lyrics = gr.Textbox(lines=9, label="Lyrics", max_lines=13, placeholder=LYRIC_PLACEHOLDER)
 
-            with gr.Accordion("Basic Settings", open=False):
+            with gr.Accordion("Basic Settings", open=True):
                 infer_step = gr.Slider(minimum=1, maximum=1000, step=1, value=60, label="Infer Steps", interactive=True)
                 guidance_scale = gr.Slider(minimum=0.0, maximum=200.0, step=0.1, value=15.0, label="Guidance Scale", interactive=True)
-                scheduler_type = gr.Radio(["euler", "heun"], value="euler", label="Scheduler Type", elem_id="scheduler_type", )
                 manual_seeds = gr.Textbox(label="manual seeds (default None)", placeholder="1,2,3,4", value=None)
             
             with gr.Accordion("Advanced Settings", open=False):
+                scheduler_type = gr.Radio(["euler", "heun"], value="euler", label="Scheduler Type", elem_id="scheduler_type", )
                 cfg_type = gr.Radio(["cfg", "apg", "cfg_star"], value="apg", label="CFG Type", elem_id="cfg_type", )
                 use_erg_tag = gr.Checkbox(label="use ERG for tag", value=True, )
                 use_erg_lyric = gr.Checkbox(label="use ERG for lyric", value=True, )
@@ -94,12 +94,91 @@ def create_text2music_ui(
 
         with gr.Column():
             outputs, input_params_json = create_output_ui()
+            with gr.Tab("retake"):
+                retake_variance = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, value=0.2, label="variance")
+                retake_seeds = gr.Textbox(label="retake seeds (default None)", placeholder="1,2,3,4", value=None)
+                retake_bnt = gr.Button(variant="primary")
+                retake_outputs, retake_input_params_json = create_output_ui("Retake")
+                
+                def retake_process_func(json_data, retake_variance, retake_seeds):
+                    return text2music_process_func(
+                        json_data["audio_duration"],
+                        json_data["prompt"],
+                        json_data["lyrics"],
+                        json_data["infer_step"],
+                        json_data["guidance_scale"],
+                        json_data["scheduler_type"],
+                        json_data["cfg_type"],
+                        json_data["omega_scale"],
+                        ", ".join(map(str, json_data["actual_seeds"])),
+                        json_data["guidance_interval"],
+                        json_data["guidance_interval_decay"],
+                        json_data["min_guidance_scale"],
+                        json_data["use_erg_tag"],
+                        json_data["use_erg_lyric"],
+                        json_data["use_erg_diffusion"],
+                        ", ".join(map(str, json_data["oss_steps"])),
+                        retake_seeds,
+                        retake_variance,
+                        "retake",
+                    )
+                
+                retake_bnt.click(
+                    fn=retake_process_func,
+                    inputs=[
+                        input_params_json,
+                        retake_variance,
+                        retake_seeds,
+                    ],
+                    outputs=retake_outputs + [retake_input_params_json],
+                )
+            with gr.Tab("repainting"):
+                pass
+            with gr.Tab("edit"):
+                pass
 
-        # sample_bnt.click(
-        #     sample_data_func,
-        #     inputs=[dataset_example_idx, dataset_source, source],
-        #     outputs=[dataset_example_idx, prompt, lyrics, target_audio, audio_duration, input_params_json],
-        # )
+        def sample_data():
+            json_data = sample_data_func()
+            return (
+                json_data["audio_duration"],
+                json_data["prompt"],
+                json_data["lyrics"],
+                json_data["infer_step"],
+                json_data["guidance_scale"],
+                json_data["scheduler_type"],
+                json_data["cfg_type"],
+                json_data["omega_scale"],
+                ", ".join(map(str, json_data["actual_seeds"])),
+                json_data["guidance_interval"],
+                json_data["guidance_interval_decay"],
+                json_data["min_guidance_scale"],
+                json_data["use_erg_tag"],
+                json_data["use_erg_lyric"],
+                json_data["use_erg_diffusion"],
+                ", ".join(map(str, json_data["oss_steps"])),
+            )
+    
+        sample_bnt.click(
+            sample_data,
+            outputs=[
+                audio_duration,
+                prompt,
+                lyrics,
+                infer_step,
+                guidance_scale,
+                scheduler_type,
+                cfg_type,
+                omega_scale,
+                manual_seeds,
+                guidance_interval,
+                guidance_interval_decay,
+                min_guidance_scale,
+                use_erg_tag,
+                use_erg_lyric,
+                use_erg_diffusion,
+                oss_steps,
+            ],
+        )
 
     text2music_bnt.click(
         fn=text2music_process_func,
@@ -136,17 +215,13 @@ def create_main_demo_ui(
             <h1 style="text-align: center;">FusicModel 1.0 DEMO</h1>
             """
         )
-    
-        sample_bnt = None
 
         with gr.Tab("text2music"):
             create_text2music_ui(
                 gr=gr,
                 text2music_process_func=text2music_process_func,
-                sample_bnt=sample_bnt,
                 sample_data_func=sample_data_func,
             )
-
     return demo