Fix mcp input

README.md

@@ -4,7 +4,7 @@ emoji: 🎼
 colorFrom: gray
 colorTo: red
 sdk: gradio
-sdk_version: 5.34.1
+sdk_version: 5.34.2
 python_version: 3.12.8
 app_file: app.py
 pinned: true

app.py

@@ -28,7 +28,7 @@ import librosa
 import modules.user_history
 from modules.version_info import versions_html, commit_hash, get_xformers_version
 from modules.gradio import *
-from modules.file_utils import get_file_parts, get_filename_from_filepath, convert_title_to_filename, get_unique_file_path, delete_file
+from modules.file_utils import get_file_parts, get_filename_from_filepath, convert_title_to_filename, get_unique_file_path, delete_file, download_and_save_image
 
 # Added for MCP call
 from smolagents.mcp_client import MCPClient
@@ -383,10 +383,10 @@ def predict(
                                 "transport": "sse"})
         tools = mcp_client.get_tools()
         
-        predict_tool = next((t for t in tools if t.name == "UnlimitedMusicGen_predict_simple"), None)
+        predict_tool = next((t for t in tools if "predict_simple" in t.name), None)
 
         if not predict_tool:
-            raise gr.Error("MCP tool 'UnlimitedMusicGen_predict_simple' not found on the server.")
+            raise gr.Error(f"MCP tool '{predict_tool.name}' not found on the server.")
 
         profile_username_to_send = "default_user" 
         if profile_arg:
@@ -432,15 +432,24 @@ def predict(
             "settings_font_size": settings_font_size_arg,
             "settings_animate_waveform": settings_animate_waveform_arg,
             "video_orientation": video_orientation_arg,
+            "return_history_json": True
             # "excerpt_duration": excerpt_duration_arg,
         }
         
-        print(f"Calling remote MCP tool 'UnlimitedMusicGen_predict_simple ' with arguments (URLs for files).")
+        print(f"Calling remote MCP tool '{predict_tool.name}' with arguments (URLs for files).")
         results = predict_tool(**tool_args)
         print(f"MCP tool call completed. Raw results: {results}")
 
+        if isinstance(results, str) and results.startswith('[') and results.endswith(']'):
+            try:
+                import ast
+                results = ast.literal_eval(results)
+                print(f"Parsed results as list: {results}")
+            except (SyntaxError, ValueError) as e:
+                print(f"Failed to parse results string as list: {e}")
+
         if not isinstance(results, (list, tuple)) or len(results) != 3:
-            raise gr.Error(f"MCP tool 'UnlimitedMusicGen_predict_simple' did not return the expected 3 values. Received: {results}")
+            raise gr.Error(f"MCP tool '{predict_tool.name}' did not return the expected 3 values. Received: {results}")
 
         waveform_video_path, wave_file_path, seed_used = results
 

modules/constants.py

@@ -51,14 +51,20 @@ os.makedirs(TMPDIR, exist_ok=True)
 
 
 # Constants for URL shortener
-HF_REPO_ID = "Surn/Storage"  # Or your desired repository
+HF_REPO_ID = os.getenv("HF_REPO_ID")
+if not HF_REPO_ID:
+    HF_REPO_ID = "Surn/Storage"  # Replace with your Hugging Face repository ID
 SHORTENER_JSON_FILE = "shortener.json"
 
 model_extensions = {".glb", ".gltf", ".obj", ".ply"}
 model_extensions_list = list(model_extensions)
 image_extensions = {".png", ".jpg", ".jpeg", ".webp"}
 image_extensions_list = list(image_extensions)
-music_extensions = {".mp3", ".wav", ".ogg", ".flac"}
-music_extensions_list = list(music_extensions)
-upload_file_types = model_extensions_list + image_extensions_list + music_extensions_list
-umg_mcp_server = "https://surn-unlimitedmusicgen.hf.space/gradio_api/mcp/sse"
+audio_extensions = {".mp3", ".wav", ".ogg", ".flac"}
+audio_extensions_list = list(audio_extensions)
+video_extensions = {".mp4"}
+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"

modules/file_utils.py

@@ -115,3 +115,38 @@ def get_unique_file_path(directory, filename, file_ext, counter=0):
 
 # Example usage:
 # new_file_path = get_unique_file_path(video_dir, title_file_name, video_new_ext)
+
+def download_and_save_image(url: str, dst_folder: Path, token: str = None) -> Path:
+    """
+    Downloads an image from a URL with authentication if a token is provided,
+    verifies it with PIL, and saves it in dst_folder with a unique filename.
+
+    Args:
+        url (str): The image URL.
+        dst_folder (Path): The destination folder for the image.
+        token (str, optional): A valid Bearer token. If not provided, the HF_API_TOKEN
+                              environment variable is used if available.
+
+    Returns:
+        Path: The saved image's file path.
+    """
+    headers = {}
+    # Use provided token; otherwise, fall back to environment variable.
+    api_token = token
+    if api_token:
+        headers["Authorization"] = f"Bearer {api_token}"
+    
+    response = requests.get(url, headers=headers)
+    response.raise_for_status()
+    pil_image = Image.open(BytesIO(response.content))
+    
+    parsed_url = urlparse(url)
+    original_filename = os.path.basename(parsed_url.path)  # e.g., "background.png"
+    base, ext = os.path.splitext(original_filename)
+    
+    # Use get_unique_file_path from file_utils.py to generate a unique file path.
+    unique_filepath_str = get_unique_file_path(str(dst_folder), base, ext)
+    dst = Path(unique_filepath_str)
+    dst_folder.mkdir(parents=True, exist_ok=True)
+    pil_image.save(dst)
+    return dst

modules/storage.md

@@ -4,6 +4,8 @@ The `storage.py` module provides helper functions for:
 - Generating permalinks for 3D viewer projects.
 - Uploading files in batches to a Hugging Face repository.
 - Managing URL shortening by storing (short URL, full URL) pairs in a JSON file on the repository.
+- Retrieving full URLs from short URL IDs and vice versa.
+- Handle specific file types for 3D models, images, video and audio.
 
 ## Key Functions
 
@@ -53,7 +55,7 @@ files_for_permalink = [
     "local/path/to/heightmap.png",
     "local/path/to/image.png"
 ]
-repo_id = "Surn/Storage" # Make sure this is defined, e.g., from constants
+repo_id = "Surn/Storage" # Make sure this is defined, e.g., from constants or environment variables
 folder_name = "my_new_model_with_permalink"
 
 upload_result = upload_files_to_repo(

modules/storage.py

@@ -1,5 +1,5 @@
 # modules/storage.py
-__version__ = "0.1.0" # Added version
+__version__ = "0.1.1" # Added version
 import os
 import urllib.parse
 import tempfile
@@ -8,7 +8,7 @@ import json
 import base64
 from huggingface_hub import login, upload_folder, hf_hub_download, HfApi
 from huggingface_hub.utils import RepositoryNotFoundError, EntryNotFoundError
-from modules.constants import HF_API_TOKEN, upload_file_types, model_extensions, image_extensions, HF_REPO_ID, SHORTENER_JSON_FILE
+from modules.constants import HF_API_TOKEN, upload_file_types, model_extensions, image_extensions, audio_extensions, video_extensions, HF_REPO_ID, SHORTENER_JSON_FILE
 from typing import Any, Dict, List, Tuple, Union
 
 # see storage.md for detailed information about the storage module and its functions.
@@ -21,6 +21,8 @@ def generate_permalink(valid_files, base_url_external, permalink_viewer_url="sur
     """
     model_link = None
     images_links = []
+    audio_links = []
+    video_links = []
     for f in valid_files:
         filename = os.path.basename(f)
         ext = os.path.splitext(filename)[1].lower()
@@ -29,6 +31,10 @@ def generate_permalink(valid_files, base_url_external, permalink_viewer_url="sur
                 model_link = f"{base_url_external}/{filename}"
         elif ext in image_extensions:
             images_links.append(f"{base_url_external}/{filename}")
+        elif ext in audio_extensions:
+            audio_links.append(f"{base_url_external}/{filename}")
+        elif ext in video_extensions:
+            video_links.append(f"{base_url_external}/{filename}")
     if model_link and len(images_links) == 2:
         # Construct a permalink to the viewer project with query parameters.
         permalink_viewer_url = f"https://{permalink_viewer_url}/"