Merge branch 'main' of https://huggingface.co/spaces/declare-lab/JAM

.gitattributes

@@ -1 +0,0 @@
-# No LFS configuration - all files stored as regular Git files

app.py

@@ -4,14 +4,10 @@ import os
 import json
 import tempfile
 from pathlib import Path
-import ast
+
 from model import Jamify
-<<<<<<< HEAD
-import json
-=======
 from utils import json_to_text, text_to_json
 
->>>>>>> working
 # Initialize the Jamify model once
 print("Initializing Jamify model...")
 jamify_model = Jamify()
@@ -19,51 +15,15 @@ print("Jamify model ready.")
 
 
 
-
-def parse(file):
-    parsed_data = []
-    with open(file, 'r') as f:
-        content = f.read()
-        for line in f:
-            line = line.strip()
-            if not line:
-                continue
-            start,end,word = line.split(' ')
-            data_point = {
-                    "word": word,
-                    "start": float(start),
-                    "end": float(end)
-                }
-            parsed_data.append(data_point)
-        
-    with open('temp.json','w') as f:
-        json.dump(parsed_data,f)
-
-    return content
+gr.set_static_paths(paths=[Path.cwd().absolute()])
 
 @spaces.GPU(duration=100)
 def generate_song(reference_audio, lyrics_text, style_prompt, duration):
     # We need to save the uploaded files to temporary paths to pass to the model
     reference_audio = reference_audio not in ("", None) and reference_audio or None
     
-<<<<<<< HEAD
-
-    # The model expects paths, so we write the prompt to a temp file if needed
-    # (This part of the model could be improved to accept the string directly)
-    #print(type(lyrics_file))
-    #parse(lyrics_file)
-    #parse(lyrics_file)
-    output_path = jamify_model.predict(
-        reference_audio_path=reference_audio,
-        lyrics_json_path='temp.json',
-        style_prompt=style_prompt,
-        duration_sec=duration
-
-    )
-=======
     # Convert text format to JSON and save to temporary file
     lyrics_json = text_to_json(lyrics_text)
->>>>>>> working
     
     # Create temporary file for lyrics JSON
     with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
@@ -136,16 +96,6 @@ def load_example(example_idx, examples):
 examples = load_examples()
 
 # Gradio interface
-def process_text_file(file_obj):
-    """
-    Reads the content of an uploaded text file.
-    """
-    if file_obj is not None:
-        with open(file_obj.name, 'r') as f:
-            content = f.read()
-        return content
-    return "No file uploaded."
-
 with gr.Blocks() as demo:
     gr.Markdown("# Jamify: Music Generation from Lyrics and Style")
     gr.Markdown("Provide your lyrics, a style reference (either an audio file or a text prompt), and a desired duration to generate a song.")
@@ -204,4 +154,4 @@ try:
 except Exception as e:
     print(f"Warning: Could not create temporary directories: {e}")
 
-demo.queue().launch()
+demo.queue().launch()

requirements.txt

@@ -1,4 +1,3 @@
-transformers<=4.49.0
 torchaudio
 diffusers
 accelerate
@@ -16,7 +15,6 @@ librosa
 jiwer
 demucs
 audiobox-aesthetics
-transformers==4.53.0
 
 # WebDataset
 webdataset