Add Melody to MCP UI

app.py

@@ -33,11 +33,11 @@ from modules.file_utils import get_file_parts, get_filename_from_filepath, conve
 # Added for MCP call
 from smolagents.mcp_client import MCPClient
 from modules.storage import upload_files_to_repo
-from modules.constants import HF_REPO_ID, umg_mcp_server, TMPDIR, HF_API_TOKEN
+from modules.constants import HF_REPO_ID, umg_mcp_server, TMPDIR, HF_API_TOKEN, IS_SHARED_SPACE
 
 MODEL = None
 MODELS = None
-IS_SHARED_SPACE = "Agents-MCP-Hackathon/UnlimitedMusicGen" in os.environ.get('SPACE_ID', '')
+#IS_SHARED_SPACE = "Agents-MCP-Hackathon/UnlimitedMusicGen" in os.environ.get('SPACE_ID', '')
 INTERRUPTED = False
 UNLOAD_MODEL = False
 MOVE_TO_CPU = False
@@ -318,9 +318,9 @@ def predict(
     try:
         # Upload files to Hugging Face Hub and get URLs
         files_to_upload = []
-        if melody_filepath_arg and melody_filepath_arg not in ["None", ""]:
+        if melody_filepath_arg and melody_filepath_arg not in ["None", ""] and not melody_filepath_arg.startswith("http"):
             files_to_upload.append(melody_filepath_arg)
-        if background_image_arg and background_image_arg not in ["None", ""] and not background_image_arg.startswith("http"):  # only upload if not already a URL
+        if background_image_arg and background_image_arg not in ["None", ""] and not background_image_arg.startswith("http"):
             files_to_upload.append(background_image_arg)
 
         uploaded_file_urls = {}
@@ -344,7 +344,7 @@ def predict(
 
             upload_results = upload_files_to_repo(
                 files=files_to_upload,
-                repo_id=HF_REPO_ID,  # Make sure HF_REPO_ID is defined in constants
+                repo_id=HF_REPO_ID,  
                 folder_name=folder_name,
                 create_permalink=False  # We need individual links
             )
@@ -361,7 +361,7 @@ def predict(
                         if original_filename in link:
                             uploaded_file_urls[file_path] = link
                             break
-            else:  # Handle dict case or errors if necessary, though create_permalink=False should yield a list
+            else:
                 print(f"Warning: Expected a list from upload_files_to_repo, got {type(upload_results)}")
 
         if melody_filepath_arg and melody_filepath_arg in uploaded_file_urls:
@@ -410,7 +410,7 @@ def predict(
         tool_args = {
             "model": model_name_arg,
             "text": text_arg,
-            #"melody_filepath": melody_file_url,  # Pass URL instead of file object
+            "melody_filepath": melody_file_url,  # Pass URL instead of file object
             "duration": duration_arg,
             "dimension": dimension_arg,
             "topk": topk_arg,
@@ -426,7 +426,7 @@ def predict(
             "prompt_index": prompt_index_arg,
             "include_title": include_title_arg,
             "include_settings": include_settings_arg,
-            #"harmony_only": actual_harmony_only,
+            "harmony_only": actual_harmony_only,
             "profile": profile_username_to_send,
             "segment_length": segment_length_arg,
             "settings_font_size": settings_font_size_arg,
@@ -463,9 +463,9 @@ def predict(
         if not isinstance(seed_used, (int, float)):  # Allow float for seed then cast later
             raise gr.Error(f"MCP tool returned a non-numeric seed. Received type: {type(seed_used)}, value: {seed_used}")
 
-        if isinstance(waveform_video_path, str) and (waveform_video_path.startswith("http://") or waveform_video_path.startswith("https://")):
+        if isinstance(waveform_video_path, str) and (waveform_video_path.startswith("http://", "https://")):
             waveform_video_path = str(download_and_save_file(waveform_video_path, Path(TMPDIR) / str(profile_username_to_send), HF_API_TOKEN))
-        if isinstance(wave_file_path, str) and (wave_file_path.startswith("http://") or wave_file_path.startswith("https://")):
+        if isinstance(wave_file_path, str) and (wave_file_path.startswith("http://", "https://")):
             wave_file_path = str(download_and_save_file(wave_file_path, Path(TMPDIR) / str(profile_username_to_send), HF_API_TOKEN))
 
         return waveform_video_path, wave_file_path, int(seed_used)
@@ -650,7 +650,7 @@ def ui(**kwargs):
             launch_kwargs['share'] = share
         launch_kwargs['allowed_paths'] = ["assets", "./assets", "images", "./images", 'e:/TMP']
         launch_kwargs['favicon_path'] = "./assets/favicon.ico"
-        launch_kwargs['mcp_server'] = True
+        launch_kwargs['mcp_server'] = False
 
 
         demo.queue(max_size=10, api_open=True).launch(**launch_kwargs)

modules/constants.py

@@ -74,4 +74,4 @@ video_extensions_list = list(video_extensions)
 upload_file_types = model_extensions_list + image_extensions_list + audio_extensions_list + video_extensions_list
 
 umg_mcp_server = "https://surn-unlimitedmusicgen.hf.space/gradio_api/mcp/sse"
-umg_mcp_server0 = "http://127.0.0.1:7860/gradio_api/mcp/sse"
+#umg_mcp_server = "http://127.0.0.1:7860/gradio_api/mcp/sse"