Update app.py

app.py

@@ -17,14 +17,12 @@ VEROVIO_API_URL = os.getenv("VEROVIO_API_URL")
 # Ensure output directory exists
 Path("output").mkdir(exist_ok=True)
 
-def wav_to_musicxml(wav_path: str, timestamp: str) -> Path:
+# === Tool 1: Convert WAV to MusicXML ===
+def wav_to_musicxml(wav_path: str, timestamp: str) -> str:
     output_dir = Path("output")
-
-    # Clean old MIDI files
     for f in output_dir.glob("*_basic_pitch.mid"):
         f.unlink()
 
-    # Generate MIDI using basic-pitch
     predict_and_save(
         audio_path_list=[wav_path],
         output_directory=str(output_dir),
@@ -39,15 +37,15 @@ def wav_to_musicxml(wav_path: str, timestamp: str) -> Path:
     if not midi_files:
         raise FileNotFoundError("❌ Failed to generate MIDI file")
 
-    # Convert MIDI to MusicXML
     midi_path = midi_files[0]
     score = converter.parse(midi_path)
     musicxml_path = output_dir / f"generated_{timestamp}.musicxml"
     score.write("musicxml", fp=musicxml_path)
 
-    return musicxml_path
+    return str(musicxml_path)
 
-def render_musicxml_via_verovio_api(musicxml_path: Path) -> str:
+# === Tool 2: Render MusicXML to HTML via Verovio ===
+def render_musicxml_via_verovio_api(musicxml_path: str) -> str:
     if not VEROVIO_API_URL:
         return "❌ VEROVIO_API_URL is not configured"
 
@@ -73,6 +71,7 @@ def render_musicxml_via_verovio_api(musicxml_path: Path) -> str:
     except Exception as e:
         return f"⚠️ Failed to parse SVG: {e}"
 
+# === Tool 3: Melody + Prompt => Music + Score ===
 def generate_music_and_score(melody_file, prompt):
     if not MUSICGEN_API_URL:
         return None, "❌ MUSICGEN_API_URL is not configured. Please check your .env file"
@@ -80,7 +79,6 @@ def generate_music_and_score(melody_file, prompt):
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
     wav_out_path = f"output/generated_{timestamp}.wav"
 
-    # Step 1: Call MusicGen API
     try:
         with open(melody_file, "rb") as f:
             files = {"melody": ("hum.wav", f, "audio/wav")}
@@ -95,29 +93,48 @@ def generate_music_and_score(melody_file, prompt):
     with open(wav_out_path, "wb") as out:
         out.write(response.content)
 
-    # Step 2: Convert to MusicXML
     try:
         musicxml_path = wav_to_musicxml(wav_out_path, timestamp)
     except Exception as e:
         return wav_out_path, f"⚠️ Music generated, but score conversion failed: {e}"
 
-    # Step 3: Render score using Verovio API
     html = render_musicxml_via_verovio_api(musicxml_path)
     return wav_out_path, html
 
-demo = gr.Interface(
-    fn=generate_music_and_score,
-    inputs=[
-        gr.Audio(type="filepath", label="Upload your humming (.wav)"),
-        gr.Textbox(label="Describe your desired music style (prompt)")
-    ],
-    outputs=[
-        gr.Audio(type="filepath", label="🎵 Generated Music"),
-        gr.HTML(label="🎼 Score Preview (Rendered by Verovio)")
-    ],
-    title="🎵 Vibe Jamming: Your AI melody and sheet music companion",
-    description="Upload a humming audio and a prompt. This app generates music and renders a musical score using Verovio."
-)
-
-if __name__ == "__main__":
-    demo.launch(mcp_server=True)
+# === MCP Tool App ===
+with gr.Blocks(title="🎵 Vibe Jamming Tools") as demo:
+    
+    # Tool 1: WAV to MusicXML
+    gr.Interface(
+        fn=wav_to_musicxml,
+        inputs=[
+            gr.Audio(type="filepath", label="🎤 WAV Audio File"),
+            gr.Textbox(label="Timestamp (e.g. 20250609_123000)")
+        ],
+        outputs=gr.Textbox(label="📄 MusicXML File Path"),
+        title="Tool 1: Convert WAV to MusicXML"
+    ).render()
+
+    # Tool 2: Render MusicXML to HTML
+    gr.Interface(
+        fn=render_musicxml_via_verovio_api,
+        inputs=gr.Textbox(label="📄 MusicXML File Path"),
+        outputs=gr.HTML(label="🎼 Rendered Score Preview"),
+        title="Tool 2: Render MusicXML via Verovio"
+    ).render()
+
+    # Tool 3: Melody + Prompt → Music + Score
+    gr.Interface(
+        fn=generate_music_and_score,
+        inputs=[
+            gr.Audio(type="filepath", label="Upload your humming (.wav)"),
+            gr.Textbox(label="Describe your desired music style (prompt)")
+        ],
+        outputs=[
+            gr.Audio(type="filepath", label="🎵 Generated Music"),
+            gr.HTML(label="🎼 Score Preview (Rendered by Verovio)")
+        ],
+        title="Tool 3: Melody2Music+Score"
+    ).render()
+
+demo.launch(mcp_server=True)