update app.py

app.py

@@ -28,12 +28,10 @@ sys.path.append('{}/third_party/Matcha-TTS'.format(ROOT_DIR))
 
 import spaces
 import gradio as gr
-from inspiremusic.cli.inference import InspireMusicUnified, set_env_variables
+from inspiremusic.cli.inference import InspireMusicModel, env_variables
 import torchaudio
 import datetime
 import hashlib
-import threading
-import time
 import importlib
 
 MODELS = ["InspireMusic-1.5B-Long", "InspireMusic-1.5B", "InspireMusic-Base", "InspireMusic-1.5B-24kHz", "InspireMusic-Base-24kHz"]
@@ -47,16 +45,6 @@ DEMO_TEXT_PROMPTS = ["Jazz music with drum beats.",
 					 "The classical instrumental piece exudes a haunting and evocative atmosphere, characterized by its intricate guitar work and profound emotional depth.",
 					 "Experience a dynamic blend of instrumental electronic music with futuristic house vibes, featuring energetic beats and a captivating rhythm. The tracks are likely instrumental, focusing on the immersive soundscapes rather than vocal performances."]
 
-# Shared flag to control the process
-stop_flag = threading.Event()
-
-def cancel_process():
-    """
-    Sets the stop_flag to stop the long-running process.
-    """
-    stop_flag.set()
-    return "Cancellation requested. Please wait for the process to stop."
-
 def generate_filename():
 	hash_object = hashlib.sha256(str(int(datetime.datetime.now().timestamp())).encode())
 	hash_string = hash_object.hexdigest()
@@ -116,8 +104,8 @@ def trim_audio(audio_file, cut_seconds=5):
 
 @spaces.GPU(duration=120)
 def music_generation(args):
-	set_env_variables()
-	model = InspireMusicUnified(
+	env_variables()
+	model = InspireMusicModel(
 			model_name=args["model_name"],
 			model_dir=args["model_dir"],
 			min_generate_audio_seconds=args["min_generate_audio_seconds"],
@@ -163,18 +151,6 @@ def demo_inspiremusic_con(text, audio, model_name, chorus,
 			max_generate_audio_seconds=max_generate_audio_seconds)
 	return music_generation(args)
 
-def process(args, progress=gr.Progress()):
-	progress(0, desc="Starting process...")
-	idx = 1
-	for i in range(idx):
-		if stop_flag.is_set():
-			progress(i / idx, desc="Process canceled.")
-			break
-		music_generation(args)
-		time.sleep(1)
-		progress((i + 1) / idx, desc=f"Processing step {i + 1}/{idx}")
-	return "Process completed successfully."
-
 def main():
 	with gr.Blocks(theme=gr.themes.Soft()) as demo:
 		gr.Markdown("""
@@ -209,7 +185,7 @@ def main():
 		music_output = gr.Audio(label="Generated Music", type="filepath", autoplay=True, show_download_button = True)
 
 		with gr.Row():
-			button = gr.Button("Submit Text-to-Music Task")
+			button = gr.Button("Start Text-to-Music Task")
 			button.click(demo_inspiremusic_t2m,
 						 inputs=[text_input, model_name,
 								 chorus,
@@ -217,20 +193,13 @@ def main():
 								 max_generate_audio_seconds],
 						 outputs=music_output)
 
-			generate_button = gr.Button("Submit Music Continuation Task")
+			generate_button = gr.Button("Start Music Continuation Task")
 			generate_button.click(demo_inspiremusic_con,
 								  inputs=[text_input, audio_input, model_name,
 										  chorus,
 										  output_sample_rate,
 										  max_generate_audio_seconds],
 								  outputs=music_output)
-			cancel_button = gr.Button("Cancel")
-
-		cancel_button.click(
-				fn=cancel_process,
-				inputs=[],
-				outputs="Cancel process."
-		)
 		t2m_examples = gr.Examples(examples=DEMO_TEXT_PROMPTS, inputs=[text_input])
 	demo.launch()