Update app.py

app.py

@@ -11,7 +11,7 @@ if not SUNO_KEY:
     print("⚠️ SunoKey not set!")
 
 def generate_lyrics(prompt):
-    """Final working lyrics generator"""
+    """Final working lyrics generator - UNCHANGED"""
     if not SUNO_KEY:
         yield "❌ Error: SunoKey not configured in environment variables"
         return
@@ -89,23 +89,19 @@ def generate_lyrics(prompt):
                                 output += "\n```\n"
                                 output += "---\n\n"
                             
-                            output += f"⏱️ Generated in about {(attempt + 1) * 5} seconds\n\n"
-                            output += "📝 **Now you can:**\n"
-                            output += "1. Select a variant below\n"
-                            output += "2. Edit the text if needed\n"
-                            output += "3. Generate a song!"
+                            output += f"⏱️ Generated in about {(attempt + 1) * 5} seconds"
                             
-                            # Prepare data for state
+                            # NEW: Store lyrics for later use
                             lyrics_data = {
                                 "variants": lyrics_list,
                                 "original_prompt": prompt
                             }
                             
-                            # Update dropdown with variants
+                            # NEW: Prepare variant choices for dropdown
                             variant_choices = [f"{i+1}: {lyric.get('title', f'Variant {i+1}')}" 
                                             for i, lyric in enumerate(lyrics_list)]
                             
-                            # Get first variant text for editing
+                            # NEW: Get first variant text
                             first_text = lyrics_list[0].get('text', '') if lyrics_list else ""
                             
                             yield output, lyrics_data, variant_choices, first_text
@@ -133,10 +129,10 @@ def generate_lyrics(prompt):
         yield "⏰ Timeout after 150 seconds. Try checking again later.", None, [], ""
     
     except Exception as e:
-        yield f"❌ Error: {str(e)}", None, [], []
+        yield f"❌ Error: {str(e)}", None, [], ""
 
 def generate_song_from_text(lyrics_text, style, title, instrumental, model, custom_mode):
-    """Generate a song from text"""
+    """NEW: Generate a song from lyrics text"""
     if not SUNO_KEY:
         return "❌ Error: SunoKey not configured in environment variables"
     
@@ -255,11 +251,11 @@ def generate_song_from_text(lyrics_text, style, title, instrumental, model, cust
     except Exception as e:
         return f"❌ Error: {str(e)}"
 
+# NEW: Helper functions for text handling
 def update_text_from_variant(lyrics_data, variant_choice):
-    """Update the text area when a variant is selected"""
+    """Update text area when variant is selected"""
     if lyrics_data and lyrics_data.get("variants") and variant_choice:
         try:
-            # Extract variant index from choice (e.g., "1: Title" -> 0)
             variant_idx = int(variant_choice.split(":")[0].strip()) - 1
             variants = lyrics_data["variants"]
             
@@ -271,11 +267,10 @@ def update_text_from_variant(lyrics_data, variant_choice):
     return ""
 
 def download_text_file(text):
-    """Create a downloadable text file"""
+    """Create downloadable text file"""
     if not text.strip():
         return None
     
-    # Create a temporary file
     with tempfile.NamedTemporaryFile(mode='w', suffix='.txt', delete=False) as f:
         f.write(text)
         temp_path = f.name
@@ -304,47 +299,45 @@ with gr.Blocks(title="Suno Lyrics Generator", theme="soft") as app:
     gr.Markdown("# 🎵 Suno Lyrics Generator")
     gr.Markdown("Generate song lyrics and turn them into full songs using Suno AI")
     
-    # Store lyrics data between steps
+    # Store lyrics data
     lyrics_state = gr.State()
     
     with gr.Row():
         with gr.Column(scale=1):
-            # Lyrics Generation Section
-            gr.Markdown("### Step 1: Generate or Upload Lyrics")
+            # Step 1: Generate Lyrics (original layout preserved)
+            gr.Markdown("### Step 1: Generate Lyrics")
             
-            with gr.Tab("Generate Lyrics"):
-                prompt = gr.Textbox(
-                    label="Lyrics Prompt",
-                    placeholder="Example: A happy song about sunshine and rainbows",
-                    lines=3
-                )
-                lyrics_btn = gr.Button("🎵 Generate Lyrics", variant="primary")
+            prompt = gr.Textbox(
+                label="Lyrics Prompt",
+                placeholder="Example: A happy song about sunshine and rainbows",
+                lines=3
+            )
+            lyrics_btn = gr.Button("🎵 Generate Lyrics", variant="primary")
+            
+            # NEW: Text Management Section
+            gr.Markdown("### Text Management")
             
-            with gr.Tab("Upload Lyrics"):
+            with gr.Tab("Upload Text"):
                 file_upload = gr.File(
-                    label="Upload Text File",
+                    label="Upload Text File (.txt)",
                     file_types=[".txt"],
                     type="filepath"
                 )
-                upload_btn = gr.Button("📁 Load from File", variant="secondary")
-                upload_text = gr.Textbox(
-                    label="Uploaded Text",
-                    lines=10,
-                    interactive=False
+                upload_btn = gr.Button("📁 Load Text", variant="secondary")
+            
+            with gr.Tab("Select from Generated"):
+                variant_choice = gr.Dropdown(
+                    label="Select Generated Variant",
+                    choices=[],
+                    interactive=True
                 )
             
-            # Lyrics Selection & Editing Section
-            gr.Markdown("### Step 2: Select & Edit Lyrics")
-            
-            variant_choice = gr.Dropdown(
-                label="Select Lyrics Variant",
-                choices=[],
-                interactive=True
-            )
+            # Step 2: Edit Lyrics
+            gr.Markdown("### Step 2: Edit Lyrics (Optional)")
             
             lyrics_text = gr.Textbox(
-                label="Lyrics Text (Editable)",
-                placeholder="Your lyrics will appear here...",
+                label="Lyrics Text",
+                placeholder="Your lyrics will appear here. You can edit them or paste your own.",
                 lines=15,
                 interactive=True
             )
@@ -353,33 +346,33 @@ with gr.Blocks(title="Suno Lyrics Generator", theme="soft") as app:
                 download_btn = gr.Button("💾 Download Text", variant="secondary")
                 clear_btn = gr.Button("🗑️ Clear", variant="secondary")
             
-            # Song Generation Section
-            gr.Markdown("### Step 3: Create Song")
+            # Step 3: Generate Song (NEW)
+            gr.Markdown("### Step 3: Generate Song")
             
             with gr.Row():
                 custom_mode = gr.Checkbox(
                     label="Custom Mode",
                     value=False,
-                    interactive=True
+                    info="Enable for advanced settings"
                 )
                 instrumental = gr.Checkbox(
                     label="Instrumental",
                     value=False,
-                    interactive=True
+                    info="No vocals"
                 )
             
             with gr.Row():
                 style = gr.Textbox(
                     label="Music Style",
-                    placeholder="Pop, Rock, Jazz, Classical",
-                    interactive=True,
-                    value="Pop"
+                    placeholder="Pop, Rock, Jazz",
+                    value="Pop",
+                    interactive=True
                 )
                 title = gr.Textbox(
                     label="Song Title",
-                    placeholder="My Awesome Song",
-                    interactive=True,
-                    value="Generated Song"
+                    placeholder="My Song",
+                    value="Generated Song",
+                    interactive=True
                 )
             
             model = gr.Dropdown(
@@ -390,14 +383,29 @@ with gr.Blocks(title="Suno Lyrics Generator", theme="soft") as app:
             )
             
             song_btn = gr.Button("🎶 Generate Song", variant="primary")
+            
+            # Instructions
+            gr.Markdown("""
+            **How it works:**
+            1. Generate lyrics or upload your own
+            2. Edit the text if needed
+            3. Set song parameters
+            4. Generate music!
+            
+            **Song Generation:**
+            - Custom Mode: Requires style & title
+            - Non-custom: Simple mode with prompt only
+            - Instrumental: Music only, no singing
+            """)
         
         with gr.Column(scale=2):
+            # Main output (unchanged)
             output = gr.Markdown(
                 label="Results",
                 value="Your generated lyrics and songs will appear here..."
             )
             
-            # Hidden file download component
+            # NEW: Hidden download component
             file_output = gr.File(label="Download Lyrics", visible=False)
     
     gr.Markdown("---")
@@ -415,47 +423,47 @@ with gr.Blocks(title="Suno Lyrics Generator", theme="soft") as app:
     
     # Event handlers
     
-    # Generate lyrics from prompt
+    # Original lyrics generation (unchanged except outputs)
     lyrics_btn.click(
         generate_lyrics,
         inputs=prompt,
         outputs=[output, lyrics_state, variant_choice, lyrics_text]
     )
     
-    # Upload text from file
+    # NEW: Upload text
     upload_btn.click(
         upload_text_file,
         inputs=file_upload,
         outputs=lyrics_text
     ).then(
-        lambda: "📁 **Text loaded from file!**\n\nYou can now edit the text above and generate a song.",
+        lambda: "📁 **Text loaded from file!**\n\nYou can now edit the text and generate a song.",
         outputs=output
     )
     
-    # Update text when variant is selected
+    # NEW: Update text when variant selected
     variant_choice.change(
         update_text_from_variant,
         inputs=[lyrics_state, variant_choice],
         outputs=lyrics_text
     )
     
-    # Download text as file
+    # NEW: Download text
     download_btn.click(
         download_text_file,
         inputs=lyrics_text,
         outputs=file_output
     ).then(
-        lambda: "💾 **Text ready for download!**\n\nCheck the download button below.",
+        lambda: "💾 **Text ready for download!**",
         outputs=output
     )
     
-    # Clear text
+    # NEW: Clear text
     clear_btn.click(
-        lambda: ("", ""),
+        lambda: ("", "Text cleared."),
         outputs=[lyrics_text, output]
     )
     
-    # Generate song from text
+    # NEW: Generate song
     song_btn.click(
         generate_song_from_text,
         inputs=[lyrics_text, style, title, instrumental, model, custom_mode],