music

app.py

@@ -357,36 +357,40 @@ def calculate_detailed_song_structure(audio_data):
         "syllables": syllables_info
     }
 
-def generate_lyrics(genre, duration, emotion_results, song_structure=None):
-    """Generate lyrics based on genre, duration, emotion, and detailed song structure."""
-    # If no song structure is provided, fall back to the original approach
-    if song_structure is None:
-        # Calculate appropriate lyrics length based on audio duration
-        lines_count = calculate_lyrics_length(duration)
-        
-        # Calculate approximate number of verses and chorus
-        if lines_count <= 6:
-            # Very short song - one verse and chorus
-            verse_lines = 2
-            chorus_lines = 2
-        elif lines_count <= 10:
-            # Medium song - two verses and chorus
-            verse_lines = 3
-            chorus_lines = 2
-        else:
-            # Longer song - two verses, chorus, and bridge
-            verse_lines = 3
-            chorus_lines = 2
-        
-        # Extract emotion and theme data from analysis results
-        primary_emotion = emotion_results["emotion_analysis"]["primary_emotion"]
-        primary_theme = emotion_results["theme_analysis"]["primary_theme"]
-        tempo = emotion_results["rhythm_analysis"]["tempo"]
-        key = emotion_results["tonal_analysis"]["key"]
-        mode = emotion_results["tonal_analysis"]["mode"]
+def generate_lyrics(genre, duration, emotion_results):
+    """Generate lyrics based on the genre and with appropriate length."""
+    # Calculate appropriate lyrics length based on audio duration
+    lines_count = calculate_lyrics_length(duration)
+    
+    # Calculate approximate number of verses and chorus
+    if lines_count <= 6:
+        # Very short song - one verse and chorus
+        verse_lines = 2
+        chorus_lines = 2
+    elif lines_count <= 10:
+        # Medium song - two verses and chorus
+        verse_lines = 3
+        chorus_lines = 2
+    else:
+        # Longer song - two verses, chorus, and bridge
+        verse_lines = 3
+        chorus_lines = 2
+    
+    # Extract emotion and theme data from analysis results
+    primary_emotion = emotion_results["emotion_analysis"]["primary_emotion"]
+    primary_theme = emotion_results["theme_analysis"]["primary_theme"]
+    
+    # Extract numeric values safely with fallbacks
+    try:
+        tempo = float(emotion_results["rhythm_analysis"]["tempo"])
+    except (KeyError, ValueError, TypeError):
+        tempo = 0.0
         
-        # Create prompt for the LLM
-        prompt = f"""
+    key = emotion_results["tonal_analysis"]["key"]
+    mode = emotion_results["tonal_analysis"]["mode"]
+    
+    # Create prompt for the LLM
+    prompt = f"""
 You are a talented songwriter who specializes in {genre} music.
 Write original {genre} song lyrics for a song that is {duration:.1f} seconds long.
 
@@ -409,60 +413,6 @@ The lyrics should:
 - Match the song duration of {duration:.1f} seconds
 - Keep each line concise and impactful
 
-Your lyrics:
-"""
-
-    else:
-        # Extract emotion and theme data from analysis results
-        primary_emotion = emotion_results["emotion_analysis"]["primary_emotion"]
-        primary_theme = emotion_results["theme_analysis"]["primary_theme"]
-        tempo = emotion_results["rhythm_analysis"]["tempo"]
-        key = emotion_results["tonal_analysis"]["key"]
-        mode = emotion_results["tonal_analysis"]["mode"]
-        
-        # Create detailed structure instructions for the LLM
-        structure_instructions = "Follow this exact song structure with specified syllable counts:\n"
-        
-        for section in song_structure["syllables"]:
-            section_type = section["type"].capitalize()
-            start_time = f"{section['start']:.1f}"
-            end_time = f"{section['end']:.1f}"
-            duration = f"{section['duration']:.1f}"
-            beat_count = section["beat_count"]
-            syllable_count = section["syllable_count"]
-            
-            structure_instructions += f"* {section_type} ({start_time}s - {end_time}s, {duration}s duration):\n"
-            structure_instructions += f"  - {beat_count} beats\n"
-            structure_instructions += f"  - Approximately {syllable_count} syllables\n"
-        
-        # Calculate approximate total number of lines based on syllables
-        total_syllables = sum(section["syllable_count"] for section in song_structure["syllables"])
-        estimated_lines = max(4, int(total_syllables / 8))  # Rough estimate: average 8 syllables per line
-        
-        # Create prompt for the LLM
-        prompt = f"""
-You are a talented songwriter who specializes in {genre} music.
-Write original {genre} song lyrics for a song that is {duration:.1f} seconds long.
-
-Music analysis has detected the following qualities in the music:
-- Tempo: {tempo:.1f} BPM
-- Key: {key} {mode}
-- Primary emotion: {primary_emotion}
-- Primary theme: {primary_theme}
-
-{structure_instructions}
-
-The lyrics should:
-- Perfectly capture the essence and style of {genre} music
-- Express the {primary_emotion} emotion and {primary_theme} theme
-- Have approximately {estimated_lines} lines total, distributed across sections
-- For each line, include a syllable count that matches the beats in that section
-- Include timestamps [MM:SS] at the beginning of each section
-- Be completely original
-- Match the exact song structure provided above
-
-Important: Each section should have lyrics with syllable counts matching the beats!
-
 Your lyrics:
 """
 
@@ -479,50 +429,21 @@ Your lyrics:
     # Extract and clean generated lyrics
     lyrics = response[0]["generated_text"].strip()
     
-    # Add section labels if they're not present (in fallback mode)
-    if song_structure is None and "Verse" not in lyrics and "Chorus" not in lyrics:
+    # Add section labels if they're not present
+    if "Verse" not in lyrics and "Chorus" not in lyrics:
         lines = lyrics.split('\n')
         formatted_lyrics = []
         current_section = "Verse"
-        verse_count = 0
-        
         for i, line in enumerate(lines):
             if i == 0:
                 formatted_lyrics.append("[Verse]")
-                verse_count = 1
             elif i == verse_lines:
                 formatted_lyrics.append("\n[Chorus]")
             elif i == verse_lines + chorus_lines and lines_count > 10:
                 formatted_lyrics.append("\n[Bridge]")
-            elif i == verse_lines + chorus_lines + (2 if lines_count > 10 else 0):
-                formatted_lyrics.append("\n[Verse]")
-                verse_count = 2
             formatted_lyrics.append(line)
-        
         lyrics = '\n'.join(formatted_lyrics)
     
-    # Add timestamps in detailed mode if needed
-    elif song_structure is not None:
-        # Ensure the lyrics have proper section headings with timestamps
-        for section in song_structure["syllables"]:
-            section_type = section["type"].capitalize()
-            start_time_str = f"{int(section['start']) // 60:02d}:{int(section['start']) % 60:02d}"
-            section_header = f"[{start_time_str}] {section_type}"
-            
-            # Check if this section header is missing and add it if needed
-            if section_header not in lyrics and section["type"] not in ["intro", "outro"]:
-                # Find where this section might be based on timestamp
-                time_matches = [
-                    idx for idx, line in enumerate(lyrics.split('\n'))
-                    if f"{int(section['start']) // 60:02d}:{int(section['start']) % 60:02d}" in line
-                ]
-                
-                if time_matches:
-                    lines = lyrics.split('\n')
-                    line_idx = time_matches[0]
-                    lines[line_idx] = section_header
-                    lyrics = '\n'.join(lines)
-    
     return lyrics
 
 def process_audio(audio_file):
@@ -563,7 +484,8 @@ def process_audio(audio_file):
                 "emotion_analysis": {"primary_emotion": "Unknown"},
                 "theme_analysis": {"primary_theme": "Unknown"},
                 "rhythm_analysis": {"tempo": 0},
-                "tonal_analysis": {"key": "Unknown", "mode": ""}
+                "tonal_analysis": {"key": "Unknown", "mode": ""},
+                "summary": {"tempo": 0, "key": "Unknown", "mode": "", "primary_emotion": "Unknown", "primary_theme": "Unknown"}
             }
         
         # Calculate detailed song structure for better lyrics alignment
@@ -574,10 +496,10 @@ def process_audio(audio_file):
             # Continue with a simpler approach if this fails
             song_structure = None
         
-        # Generate lyrics based on top genre, emotion analysis, and song structure
+        # Generate lyrics based on top genre and emotion analysis
         try:
             primary_genre, _ = top_genres[0]
-            lyrics = generate_lyrics(primary_genre, audio_data["duration"], emotion_results, song_structure)
+            lyrics = generate_lyrics(primary_genre, audio_data["duration"], emotion_results)
         except Exception as e:
             print(f"Error generating lyrics: {str(e)}")
             lyrics = f"Error generating lyrics: {str(e)}"