ss

app.py

@@ -149,7 +149,7 @@ def generate_lyrics(music_analysis, genre, duration):
         text_generator = load_llm_pipeline()
         
         # Construct prompt for the LLM
-        prompt = f"""As a professional songwriter, write ONLY the lyrics for a {genre} song with these specifications:
+        prompt = f"""Write lyrics for a {genre} song with these specifications:
 - Key: {key} {mode}
 - Tempo: {tempo} BPM
 - Emotion: {emotion}
@@ -157,9 +157,16 @@ def generate_lyrics(music_analysis, genre, duration):
 - Duration: {duration:.1f} seconds
 - Time signature: {music_analysis["rhythm_analysis"]["estimated_time_signature"]}
 
-DO NOT include any explanations, thinking process, or commentary about the lyrics.
-DO NOT use bullet points or numbering.
-The output should ONLY contain the actual song lyrics, formatted as they would appear in a song.
+IMPORTANT INSTRUCTIONS:
+- The lyrics should be in English
+- Write ONLY the raw lyrics with no structural labels
+- DO NOT include [verse], [chorus], [bridge], or any other section markers
+- DO NOT include any explanations or thinking about the lyrics
+- DO NOT number the verses or lines
+- DO NOT use bullet points
+- Format as simple line-by-line lyrics only
+- Make sure the lyrics match the specified duration and tempo
+- Keep lyrics concise enough to fit the duration when sung at the given tempo
 """
 
         # Generate lyrics using the LLM pipeline
@@ -174,14 +181,25 @@ The output should ONLY contain the actual song lyrics, formatted as they would a
         
         lyrics = generation_result[0]["generated_text"]
         
-        # Additional post-processing to remove common thinking patterns
-        lyrics = re.sub(r'^(Here are|Here is|These are).*?:\s*', '', lyrics, flags=re.IGNORECASE)
+        # Enhanced post-processing to remove ALL structural elements and thinking
+        # Remove any lines with section labels using a more comprehensive pattern
+        lyrics = re.sub(r'^\[.*?\].*$', '', lyrics, flags=re.MULTILINE)
+        
+        # Remove common prefixes and thinking text
+        lyrics = re.sub(r'^(Here are|Here is|These are|This is|Let me|I will|I'll).*?:\s*', '', lyrics, flags=re.IGNORECASE)
         lyrics = re.sub(r'^Title:.*?$', '', lyrics, flags=re.MULTILINE).strip()
-        lyrics = re.sub(r'^Verse( \d+)?:.*?$', '', lyrics, flags=re.MULTILINE).strip()
-        lyrics = re.sub(r'^Chorus:.*?$', '', lyrics, flags=re.MULTILINE).strip()
-        lyrics = re.sub(r'^Bridge:.*?$', '', lyrics, flags=re.MULTILINE).strip()
-        lyrics = re.sub(r'^Intro:.*?$', '', lyrics, flags=re.MULTILINE).strip()
-        lyrics = re.sub(r'^Outro:.*?$', '', lyrics, flags=re.MULTILINE).strip()
+        
+        # Remove all section markers in any format
+        lyrics = re.sub(r'^\s*(Verse|Chorus|Bridge|Pre.?Chorus|Intro|Outro|Refrain|Hook|Breakdown)(\s*\d*|\s*[A-Z])?:?\s*$', '', lyrics, flags=re.MULTILINE|re.IGNORECASE)
+        lyrics = re.sub(r'\[(Verse|Chorus|Bridge|Pre.?Chorus|Intro|Outro|Refrain|Hook|Breakdown)(\s*\d*|\s*[A-Z])?\]', '', lyrics, flags=re.IGNORECASE)
+        
+        # Remove any "thinking" or explanatory parts that might be at the beginning
+        lyrics = re.sub(r'^.*?(Let\'s|Here\'s|I need|I want|I\'ll|First|The|This).*?:\s*', '', lyrics, flags=re.IGNORECASE)
+        
+        # Remove any empty lines at beginning, collapse multiple blank lines, and trim
+        lyrics = re.sub(r'^\s*\n', '', lyrics)
+        lyrics = re.sub(r'\n\s*\n\s*\n+', '\n\n', lyrics)
+        lyrics = lyrics.strip()
         
         return lyrics