Update ui/components.py

ui/components.py

@@ -289,524 +289,8 @@ def create_text2music_ui(
 
             text2music_bnt = gr.Button("生成", variant="primary")
 
-        with gr.Column():
             outputs, input_params_json = create_output_ui()
-            with gr.Tab("重试", visible=False):
-                retake_variance = gr.Slider(
-                    minimum=0.0, maximum=1.0, step=0.01, value=0.2, label="方差"
-                )
-                retake_seeds = gr.Textbox(
-                    label="重试种子 (默认为无)", placeholder="", value=None
-                )
-                retake_bnt = gr.Button("重试", variant="primary")
-                retake_outputs, retake_input_params_json = create_output_ui("重试")
-
-                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"])),
-                        (
-                            json_data["guidance_scale_text"]
-                            if "guidance_scale_text" in json_data
-                            else 0.0
-                        ),
-                        (
-                            json_data["guidance_scale_lyric"]
-                            if "guidance_scale_lyric" in json_data
-                            else 0.0
-                        ),
-                        retake_seeds=retake_seeds,
-                        retake_variance=retake_variance,
-                        task="retake",
-                        lora_name_or_path="none" if "lora_name_or_path" not in json_data else json_data["lora_name_or_path"]
-                    )
-
-                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("重绘", visible=False):
-                retake_variance = gr.Slider(
-                    minimum=0.0, maximum=1.0, step=0.01, value=0.2, label="方差"
-                )
-                retake_seeds = gr.Textbox(
-                    label="重绘种子 (默认为无)", placeholder="", value=None
-                )
-                repaint_start = gr.Slider(
-                    minimum=0.0,
-                    maximum=240.0,
-                    step=0.01,
-                    value=0.0,
-                    label="重绘开始时间",
-                    interactive=True,
-                )
-                repaint_end = gr.Slider(
-                    minimum=0.0,
-                    maximum=240.0,
-                    step=0.01,
-                    value=30.0,
-                    label="重绘结束时间",
-                    interactive=True,
-                )
-                repaint_source = gr.Radio(
-                    ["文本转音乐", "上次重绘", "上传"],
-                    value="文本转音乐",
-                    label="重绘来源",
-                    elem_id="repaint_source",
-                )
-
-                repaint_source_audio_upload = gr.Audio(
-                    label="上传音频",
-                    type="filepath",
-                    visible=False,
-                    elem_id="repaint_source_audio_upload",
-                    show_download_button=True,
-                )
-                repaint_source.change(
-                    fn=lambda x: gr.update(
-                        visible=x == "上传", elem_id="repaint_source_audio_upload"
-                    ),
-                    inputs=[repaint_source],
-                    outputs=[repaint_source_audio_upload],
-                )
-
-                repaint_bnt = gr.Button("重绘", variant="primary")
-                repaint_outputs, repaint_input_params_json = create_output_ui("重绘")
-
-                def repaint_process_func(
-                    text2music_json_data,
-                    repaint_json_data,
-                    retake_variance,
-                    retake_seeds,
-                    repaint_start,
-                    repaint_end,
-                    repaint_source,
-                    repaint_source_audio_upload,
-                    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,
-                    guidance_scale_text,
-                    guidance_scale_lyric,
-                ):
-                    if repaint_source == "上传":
-                        src_audio_path = repaint_source_audio_upload
-                        audio_duration = librosa.get_duration(filename=src_audio_path)
-                        json_data = {"audio_duration": audio_duration}
-                    elif repaint_source == "文本转音乐":
-                        json_data = text2music_json_data
-                        src_audio_path = json_data["audio_path"]
-                    elif repaint_source == "上次重绘":
-                        json_data = repaint_json_data
-                        src_audio_path = json_data["audio_path"]
-
-                    return text2music_process_func(
-                        json_data["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,
-                        guidance_scale_text,
-                        guidance_scale_lyric,
-                        retake_seeds=retake_seeds,
-                        retake_variance=retake_variance,
-                        task="repaint",
-                        repaint_start=repaint_start,
-                        repaint_end=repaint_end,
-                        src_audio_path=src_audio_path,
-                        lora_name_or_path="none" if "lora_name_or_path" not in json_data else json_data["lora_name_or_path"]
-                    )
-
-                repaint_bnt.click(
-                    fn=repaint_process_func,
-                    inputs=[
-                        input_params_json,
-                        repaint_input_params_json,
-                        retake_variance,
-                        retake_seeds,
-                        repaint_start,
-                        repaint_end,
-                        repaint_source,
-                        repaint_source_audio_upload,
-                        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,
-                        guidance_scale_text,
-                        guidance_scale_lyric,
-                    ],
-                    outputs=repaint_outputs + [repaint_input_params_json],
-                )
-            with gr.Tab("编辑", visible=False):
-                edit_prompt = gr.Textbox(lines=2, label="编辑标签", max_lines=4)
-                edit_lyrics = gr.Textbox(lines=9, label="编辑歌词", max_lines=13)
-                retake_seeds = gr.Textbox(
-                    label="编辑种子 (默认为无)", placeholder="", value=None
-                )
-
-                edit_type = gr.Radio(
-                    ["仅歌词", "混音"],
-                    value="仅歌词",
-                    label="编辑类型",
-                    elem_id="edit_type",
-                    info="`仅歌词` 将保持整首歌相同，除了歌词差异。使您的差异更小，例如更改一行歌词。\n`混音` 可以改变歌曲的旋律和流派。",
-                )
-                edit_n_min = gr.Slider(
-                    minimum=0.0,
-                    maximum=1.0,
-                    step=0.01,
-                    value=0.6,
-                    label="编辑 n_min",
-                    interactive=True,
-                )
-                edit_n_max = gr.Slider(
-                    minimum=0.0,
-                    maximum=1.0,
-                    step=0.01,
-                    value=1.0,
-                    label="编辑 n_max",
-                    interactive=True,
-                )
-
-                def edit_type_change_func(edit_type):
-                    if edit_type == "仅歌词":
-                        n_min = 0.6
-                        n_max = 1.0
-                    elif edit_type == "混音":
-                        n_min = 0.2
-                        n_max = 0.4
-                    return n_min, n_max
-
-                edit_type.change(
-                    edit_type_change_func,
-                    inputs=[edit_type],
-                    outputs=[edit_n_min, edit_n_max],
-                )
-
-                edit_source = gr.Radio(
-                    ["文本转音乐", "上次编辑", "上传"],
-                    value="文本转音乐",
-                    label="编辑来源",
-                    elem_id="edit_source",
-                )
-                edit_source_audio_upload = gr.Audio(
-                    label="上传音频",
-                    type="filepath",
-                    visible=False,
-                    elem_id="edit_source_audio_upload",
-                    show_download_button=True,
-                )
-                edit_source.change(
-                    fn=lambda x: gr.update(
-                        visible=x == "上传", elem_id="edit_source_audio_upload"
-                    ),
-                    inputs=[edit_source],
-                    outputs=[edit_source_audio_upload],
-                )
-
-                edit_bnt = gr.Button("编辑", variant="primary")
-                edit_outputs, edit_input_params_json = create_output_ui("编辑")
-
-                def edit_process_func(
-                    text2music_json_data,
-                    edit_input_params_json,
-                    edit_source,
-                    edit_source_audio_upload,
-                    prompt,
-                    lyrics,
-                    edit_prompt,
-                    edit_lyrics,
-                    edit_n_min,
-                    edit_n_max,
-                    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,
-                    guidance_scale_text,
-                    guidance_scale_lyric,
-                    retake_seeds,
-                ):
-                    if edit_source == "上传":
-                        src_audio_path = edit_source_audio_upload
-                        audio_duration = librosa.get_duration(filename=src_audio_path)
-                        json_data = {"audio_duration": audio_duration}
-                    elif edit_source == "文本转音乐":
-                        json_data = text2music_json_data
-                        src_audio_path = json_data["audio_path"]
-                    elif edit_source == "上次编辑":
-                        json_data = edit_input_params_json
-                        src_audio_path = json_data["audio_path"]
-
-                    if not edit_prompt:
-                        edit_prompt = prompt
-                    if not edit_lyrics:
-                        edit_lyrics = lyrics
-
-                    return text2music_process_func(
-                        json_data["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,
-                        guidance_scale_text,
-                        guidance_scale_lyric,
-                        task="edit",
-                        src_audio_path=src_audio_path,
-                        edit_target_prompt=edit_prompt,
-                        edit_target_lyrics=edit_lyrics,
-                        edit_n_min=edit_n_min,
-                        edit_n_max=edit_n_max,
-                        retake_seeds=retake_seeds,
-                        lora_name_or_path="none" if "lora_name_or_path" not in json_data else json_data["lora_name_or_path"]
-                    )
-
-                edit_bnt.click(
-                    fn=edit_process_func,
-                    inputs=[
-                        input_params_json,
-                        edit_input_params_json,
-                        edit_source,
-                        edit_source_audio_upload,
-                        prompt,
-                        lyrics,
-                        edit_prompt,
-                        edit_lyrics,
-                        edit_n_min,
-                        edit_n_max,
-                        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,
-                        guidance_scale_text,
-                        guidance_scale_lyric,
-                        retake_seeds,
-                    ],
-                    outputs=edit_outputs + [edit_input_params_json],
-                )
-            with gr.Tab("扩展", visible=False):
-                extend_seeds = gr.Textbox(
-                    label="扩展种子 (默认为无)", placeholder="", value=None
-                )
-                left_extend_length = gr.Slider(
-                    minimum=0.0,
-                    maximum=240.0,
-                    step=0.01,
-                    value=0.0,
-                    label="左侧扩展长度",
-                    interactive=True,
-                )
-                right_extend_length = gr.Slider(
-                    minimum=0.0,
-                    maximum=240.0,
-                    step=0.01,
-                    value=30.0,
-                    label="右侧扩展长度",
-                    interactive=True,
-                )
-                extend_source = gr.Radio(
-                    ["文本转音乐", "上次扩展", "上传"],
-                    value="文本转音乐",
-                    label="扩展来源",
-                    elem_id="extend_source",
-                )
-
-                extend_source_audio_upload = gr.Audio(
-                    label="上传音频",
-                    type="filepath",
-                    visible=False,
-                    elem_id="extend_source_audio_upload",
-                    show_download_button=True,
-                )
-                extend_source.change(
-                    fn=lambda x: gr.update(
-                        visible=x == "上传", elem_id="extend_source_audio_upload"
-                    ),
-                    inputs=[extend_source],
-                    outputs=[extend_source_audio_upload],
-                )
-
-                extend_bnt = gr.Button("扩展", variant="primary")
-                extend_outputs, extend_input_params_json = create_output_ui("扩展")
-
-                def extend_process_func(
-                    text2music_json_data,
-                    extend_input_params_json,
-                    extend_seeds,
-                    left_extend_length,
-                    right_extend_length,
-                    extend_source,
-                    extend_source_audio_upload,
-                    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,
-                    guidance_scale_text,
-                    guidance_scale_lyric,
-                ):
-                    if extend_source == "上传":
-                        src_audio_path = extend_source_audio_upload
-                        # get audio duration
-                        audio_duration = librosa.get_duration(filename=src_audio_path)
-                        json_data = {"audio_duration": audio_duration}
-                    elif extend_source == "文本转音乐":
-                        json_data = text2music_json_data
-                        src_audio_path = json_data["audio_path"]
-                    elif extend_source == "上次扩展":
-                        json_data = extend_input_params_json
-                        src_audio_path = json_data["audio_path"]
-
-                    repaint_start = -left_extend_length
-                    repaint_end = json_data["audio_duration"] + right_extend_length
-                    return text2music_process_func(
-                        json_data["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,
-                        guidance_scale_text,
-                        guidance_scale_lyric,
-                        retake_seeds=extend_seeds,
-                        retake_variance=1.0,
-                        task="extend",
-                        repaint_start=repaint_start,
-                        repaint_end=repaint_end,
-                        src_audio_path=src_audio_path,
-                        lora_name_or_path="none" if "lora_name_or_path" not in json_data else json_data["lora_name_or_path"]
-                    )
-
-                extend_bnt.click(
-                    fn=extend_process_func,
-                    inputs=[
-                        input_params_json,
-                        extend_input_params_json,
-                        extend_seeds,
-                        left_extend_length,
-                        right_extend_length,
-                        extend_source,
-                        extend_source_audio_upload,
-                        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,
-                        guidance_scale_text,
-                        guidance_scale_lyric,
-                    ],
-                    outputs=extend_outputs + [extend_input_params_json],
-                )
+            
 
         def json2output(json_data):
             return (