.

app.py

@@ -65,13 +65,20 @@ def create_lyrics_prompt(classification_results, song_structure):
     # Get additional musical elements
     additional_elements = [r['label'] for r in classification_results[1:3]]
     
-    # Create a structured prompt based on song length
-    prompt = f"""Write song lyrics in the style of {genre}.
+    # Create a more specific and structured prompt
+    prompt = f"""Write a song with the following structure:
+
+Style: {genre} music
 Theme: A {genre} song with elements of {' and '.join(additional_elements)}
-Structure: {song_structure['verses']} verses and {song_structure['choruses']} choruses
+Length: {song_structure['verses']} verses and {song_structure['choruses']} choruses
+
+Guidelines:
+- Each verse should be exactly 4 lines
+- Each chorus should be exactly 4 lines
+- Keep the lyrics matching the {genre} style
+- Use appropriate musical themes and imagery
 
-Format the lyrics with [Verse 1], [Chorus], [Verse 2], etc.
-Make each verse 4-6 lines and chorus 4 lines.
+Start with Verse 1:
 
 [Verse 1]"""
     return prompt
@@ -80,40 +87,71 @@ def format_lyrics(generated_text, song_structure):
     """Format the generated lyrics according to desired structure"""
     lines = generated_text.split('\n')
     cleaned_lines = []
-    current_section = "[Verse 1]"
+    current_section = None
     verse_count = 0
     chorus_count = 0
+    lines_in_section = 0
+    
+    # Add first verse marker
+    cleaned_lines.append("[Verse 1]")
+    current_section = "verse"
+    verse_count = 1
     
     for line in lines:
         line = line.strip()
         if not line or line.startswith('###') or line.startswith('```'):
             continue
             
-        # Handle section markers
-        if line.lower().startswith('[verse'):
-            if verse_count < song_structure['verses']:
-                verse_count += 1
-                current_section = f"[Verse {verse_count}]"
-                cleaned_lines.append(f"\n{current_section}")
-                continue
-        elif line.lower().startswith('[chorus'):
-            if chorus_count < song_structure['choruses']:
-                chorus_count += 1
-                current_section = f"[Chorus {chorus_count}]"
-                cleaned_lines.append(f"\n{current_section}")
-                continue
-        
-        # Add the line if we haven't exceeded our structure limits
-        if (current_section.startswith('[Verse') and verse_count <= song_structure['verses']) or \
-           (current_section.startswith('[Chorus') and chorus_count <= song_structure['choruses']):
+        # Skip section markers in the generated text
+        if line.lower().startswith('['):
+            continue
+            
+        # Add the line if it's not a marker
+        if len(line) > 0:
             cleaned_lines.append(line)
-        
-        # Add chorus after first verse if not present
-        if len(cleaned_lines) == 5 and chorus_count == 0:  # After 4 lines of verse + section header
-            chorus_count += 1
-            cleaned_lines.append(f"\n[Chorus 1]")
+            lines_in_section += 1
+            
+            # Check if we need to start a new section
+            if lines_in_section >= 4:  # After 4 lines in current section
+                lines_in_section = 0
+                
+                # Determine next section
+                if current_section == "verse" and chorus_count < song_structure['choruses']:
+                    # Add a chorus after verse
+                    chorus_count += 1
+                    cleaned_lines.append(f"\n[Chorus {chorus_count}]")
+                    current_section = "chorus"
+                elif current_section == "chorus" and verse_count < song_structure['verses']:
+                    # Add next verse after chorus
+                    verse_count += 1
+                    cleaned_lines.append(f"\n[Verse {verse_count}]")
+                    current_section = "verse"
+    
+    # Ensure we have complete sections
+    result = []
+    current_section = None
+    section_lines = []
+    
+    for line in cleaned_lines:
+        if line.startswith('['):
+            if current_section and section_lines:
+                # Pad section to 4 lines if needed
+                while len(section_lines) < 4:
+                    section_lines.append("...")
+                result.extend(section_lines)
+            current_section = line
+            result.append(f"\n{line}")
+            section_lines = []
+        else:
+            section_lines.append(line)
+    
+    # Add the last section
+    if section_lines:
+        while len(section_lines) < 4:
+            section_lines.append("...")
+        result.extend(section_lines)
     
-    return "\n".join(cleaned_lines)
+    return "\n".join(result)
 
 def generate_lyrics_with_retry(prompt, song_structure, max_retries=5, initial_wait=2):
     """Generate lyrics using GPT2-XL with retry logic"""
@@ -138,18 +176,25 @@ def generate_lyrics_with_retry(prompt, song_structure, max_retries=5, initial_wa
             )
             
             print(f"Response status: {response.status_code}")
-            print(f"Response content: {response.content.decode('utf-8', errors='ignore')}")
             
             if response.status_code == 200:
                 result = response.json()
                 if isinstance(result, list) and len(result) > 0:
                     generated_text = result[0].get("generated_text", "")
-                    return format_lyrics(generated_text, song_structure)
+                    formatted_lyrics = format_lyrics(generated_text, song_structure)
+                    
+                    # Verify the formatting worked correctly
+                    if formatted_lyrics.count('[Verse') < 1 or '>' in formatted_lyrics:
+                        # If formatting failed, try again
+                        if attempt < max_retries - 1:
+                            print("Malformed lyrics, retrying...")
+                            continue
+                    return formatted_lyrics
                 return "Error: No text generated"
             elif response.status_code == 503:
                 print(f"Model loading, attempt {attempt + 1}/{max_retries}. Waiting {wait_time} seconds...")
                 time.sleep(wait_time)
-                wait_time *= 1.5  # Increase wait time for next attempt
+                wait_time *= 1.5
                 continue
             else:
                 return f"Error generating lyrics: {response.text}"