Update app.py

app.py

@@ -89,14 +89,19 @@ def generate_lyrics(prompt):
                                 output += "---\n\n"
                             
                             output += f"⏱️ Generated in about {(attempt + 1) * 5} seconds"
-                            yield output
+                            # Store lyrics for potential song generation
+                            lyrics_info = {
+                                "lyrics_list": lyrics_list,
+                                "original_prompt": prompt
+                            }
+                            yield output, lyrics_info
                         else:
-                            yield "✅ Completed but no lyrics found in response"
+                            yield "✅ Completed but no lyrics found in response", None
                         return
                     
                     elif status == "FAILED":
                         error = check_data["data"].get("errorMessage", "Unknown error")
-                        yield f"❌ Task failed: {error}"
+                        yield f"❌ Task failed: {error}", None
                         return
                     
                     else:
@@ -104,50 +109,239 @@ def generate_lyrics(prompt):
                         yield (f"⏳ Status: {status}\n"
                                f"Attempt: {attempt + 1}/30\n"
                                f"Task ID: `{task_id}`\n\n"
-                               f"Still processing... (Usually takes 30-90 seconds)")
+                               f"Still processing... (Usually takes 30-90 seconds)"), None
+                else:
+                    yield f"⚠️ Check error: HTTP {check.status_code}", None
+            
+            except Exception as e:
+                yield f"⚠️ Error checking status: {str(e)}", None
+        
+        yield "⏰ Timeout after 150 seconds. Try checking again later.", None
+    
+    except Exception as e:
+        yield f"❌ Error: {str(e)}", None
+
+def generate_song(lyrics_info, variant_choice, style, title, instrumental, model, custom_mode):
+    """Generate a song from lyrics"""
+    if not SUNO_KEY:
+        return "❌ Error: SunoKey not configured in environment variables"
+    
+    if lyrics_info is None:
+        return "❌ Error: No lyrics available. Please generate lyrics first."
+    
+    if not lyrics_info.get("lyrics_list"):
+        return "❌ Error: No lyrics found in the provided data."
+    
+    try:
+        # Get selected lyrics variant
+        variant_idx = int(variant_choice.split(":")[0]) - 1  # Convert "1: Title" to 0-index
+        lyrics_list = lyrics_info["lyrics_list"]
+        
+        if variant_idx >= len(lyrics_list):
+            return f"❌ Error: Invalid variant selection. Only {len(lyrics_list)} variants available."
+        
+        selected_lyric = lyrics_list[variant_idx]
+        lyrics_text = selected_lyric.get('text', '')
+        lyrics_title = selected_lyric.get('title', f'Variant {variant_idx + 1}')
+        
+        if not lyrics_text.strip():
+            return "❌ Error: Selected lyrics variant has no text content."
+        
+        # Prepare request data based on custom mode
+        request_data = {
+            "customMode": custom_mode,
+            "instrumental": instrumental,
+            "model": model,
+            "callBackUrl": "http://dummy.com/callback",  # Required but not used
+        }
+        
+        if custom_mode:
+            # Custom mode requires style and title
+            if not style.strip():
+                return "❌ Error: Style is required in Custom Mode"
+            if not title.strip():
+                return "❌ Error: Title is required in Custom Mode"
+            
+            request_data["style"] = style
+            request_data["title"] = title
+            
+            if not instrumental:
+                # Non-instrumental requires lyrics as prompt
+                if len(lyrics_text) > 5000 and model in ["V4_5", "V4_5PLUS", "V4_5ALL", "V5"]:
+                    lyrics_text = lyrics_text[:5000]
+                elif len(lyrics_text) > 3000 and model == "V4":
+                    lyrics_text = lyrics_text[:3000]
+                request_data["prompt"] = lyrics_text
+        else:
+            # Non-custom mode only requires prompt (max 500 chars)
+            if len(lyrics_text) > 500:
+                lyrics_text = lyrics_text[:497] + "..."
+            request_data["prompt"] = lyrics_text
+            # Clear other fields for non-custom mode
+            request_data["style"] = ""
+            request_data["title"] = ""
+        
+        # Submit generation request
+        resp = requests.post(
+            "https://api.sunoapi.org/api/v1/generate",
+            json=request_data,
+            headers={
+                "Authorization": f"Bearer {SUNO_KEY}",
+                "Content-Type": "application/json"
+            },
+            timeout=30
+        )
+        
+        if resp.status_code != 200:
+            return f"❌ Submission failed: HTTP {resp.status_code}"
+        
+        data = resp.json()
+        if data.get("code") != 200:
+            return f"❌ API error: {data.get('msg', 'Unknown')}"
+        
+        task_id = data["data"]["taskId"]
+        
+        # Poll for results
+        for attempt in range(60):  # 60 attempts * 5 seconds = 300 seconds max (5 minutes)
+            time.sleep(5)
+            
+            try:
+                check = requests.get(
+                    "https://api.sunoapi.org/api/v1/music-info",
+                    headers={"Authorization": f"Bearer {SUNO_KEY}"},
+                    params={"taskId": task_id},
+                    timeout=30
+                )
+                
+                if check.status_code == 200:
+                    check_data = check.json()
+                    status = check_data["data"].get("status", "PENDING")
+                    
+                    if status == "COMPLETE":
+                        # Success! Extract song URLs
+                        songs = check_data["data"].get("songs", [])
+                        if songs:
+                            output = "🎶 **Song Generation Complete!**\n\n"
+                            for i, song in enumerate(songs, 1):
+                                song_title = song.get('title', f'Song {i}')
+                                stream_url = song.get('streamUrl', 'No URL')
+                                download_url = song.get('downloadUrl', 'No URL')
+                                
+                                output += f"## Song {i}: {song_title}\n"
+                                output += f"**Stream URL:** {stream_url}\n\n"
+                                output += f"**Download URL:** {download_url}\n\n"
+                                output += f"**Listen Now:** [Click to Stream]({stream_url})\n\n"
+                                output += "---\n\n"
+                            
+                            output += f"⏱️ Generated in about {(attempt + 1) * 5} seconds\n\n"
+                            output += "⚠️ **Note:** Files are retained for 15 days"
+                            return output
+                        else:
+                            return "✅ Completed but no songs found in response"
+                    
+                    elif status == "FAILED":
+                        error = check_data["data"].get("errorMessage", "Unknown error")
+                        return f"❌ Task failed: {error}"
+                    
+                    else:
+                        # Still processing
+                        if attempt % 6 == 0:  # Update every 30 seconds
+                            yield f"⏳ Status: {status}\nAttempt: {attempt + 1}/60\nTask ID: `{task_id}`\n\nStill processing... (Usually takes 30-180 seconds)"
                 else:
                     yield f"⚠️ Check error: HTTP {check.status_code}"
             
             except Exception as e:
                 yield f"⚠️ Error checking status: {str(e)}"
         
-        yield "⏰ Timeout after 150 seconds. Try checking again later."
+        return "⏰ Timeout after 300 seconds. Try checking again later."
     
     except Exception as e:
-        yield f"❌ Error: {str(e)}"
+        return f"❌ Error: {str(e)}"
 
 # Create the app
-with gr.Blocks(title="Suno Lyrics Generator", theme="soft") as app:
-    gr.Markdown("# 🎵 Suno Lyrics Generator")
-    gr.Markdown("Generate song lyrics using Suno AI")
+with gr.Blocks(title="Suno Lyrics & Song Generator", theme="soft") as app:
+    gr.Markdown("# 🎵 Suno Lyrics & Song Generator")
+    gr.Markdown("Generate song lyrics and turn them into full songs using Suno AI")
+    
+    # Store lyrics between steps
+    lyrics_state = gr.State()
     
     with gr.Row():
         with gr.Column(scale=1):
+            # Lyrics Generation Section
+            gr.Markdown("### Step 1: Generate Lyrics")
             prompt = gr.Textbox(
                 label="Lyrics Prompt",
                 placeholder="Example: A happy song about sunshine and rainbows",
                 lines=3
             )
-            btn = gr.Button("🎵 Generate Lyrics", variant="primary", scale=1)
+            lyrics_btn = gr.Button("🎵 Generate Lyrics", variant="primary")
             
+            # Song Generation Section (initially hidden)
+            gr.Markdown("### Step 2: Create Song")
+            with gr.Group():
+                variant_choice = gr.Dropdown(
+                    label="Select Lyrics Variant",
+                    choices=[],
+                    interactive=True
+                )
+                
+                with gr.Row():
+                    custom_mode = gr.Checkbox(
+                        label="Custom Mode (Advanced Settings)",
+                        value=False,
+                        interactive=True
+                    )
+                    instrumental = gr.Checkbox(
+                        label="Instrumental (No Vocals)",
+                        value=False,
+                        interactive=True
+                    )
+                
+                with gr.Row():
+                    style = gr.Textbox(
+                        label="Music Style (Required for Custom Mode)",
+                        placeholder="Example: Pop, Rock, Jazz, Classical",
+                        interactive=True
+                    )
+                    title = gr.Textbox(
+                        label="Song Title (Required for Custom Mode)",
+                        placeholder="Example: My Awesome Song",
+                        interactive=True
+                    )
+                
+                model = gr.Dropdown(
+                    label="Model Version",
+                    choices=["V5", "V4_5PLUS", "V4_5ALL", "V4_5", "V4"],
+                    value="V4_5ALL",
+                    interactive=True
+                )
+                
+                song_btn = gr.Button("🎶 Generate Song", variant="secondary")
+            
+            # Instructions
             gr.Markdown("""
             **How it works:**
-            1. Enter your lyrics idea
-            2. Click Generate
-            3. Wait 30-90 seconds
-            4. Get 2 lyric variants
+            1. Enter your lyrics idea and generate
+            2. Select a lyrics variant from results
+            3. Choose song settings (or use defaults)
+            4. Generate a full song with music!
+            
+            **Custom Mode:** Enable for advanced control
+            **Instrumental:** Check for music only (no singing)
             
             **Status messages:**
             - ✅ Submitted = Task accepted
-            - ⏳ PENDING/PROCESSING = Generating
-            - 🎵 Success = Lyrics ready!
+            - ⏳ PROCESSING = Generating
+            - 🎶 Complete = Song ready!
             """)
         
         with gr.Column(scale=2):
             output = gr.Markdown(
                 label="Results",
-                value="Your generated lyrics will appear here..."
+                value="Your generated lyrics and songs will appear here..."
             )
+    
     gr.Markdown("---")
     gr.Markdown(
         """
@@ -155,15 +349,35 @@ with gr.Blocks(title="Suno Lyrics Generator", theme="soft") as app:
             <p>Powered by <a href="https://suno.ai" target="_blank">Suno AI</a> • 
             <a href="https://sunoapi.org" target="_blank">Suno API Docs</a> • 
             <a href="https://github.com" target="_blank">GitHub</a></p>
-            <p><small>This app uses the Suno API to generate AI-powered lyrics.</small></p>
+            <p><small>This app uses the Suno API to generate AI-powered lyrics and music.</small></p>
         </div>
         """,
         elem_id="footer"
     )
     
-    btn.click(generate_lyrics, prompt, output)
+    # Lyrics generation
+    lyrics_btn.click(
+        generate_lyrics,
+        inputs=prompt,
+        outputs=[output, lyrics_state]
+    ).then(
+        lambda lyrics_info: gr.Dropdown(
+            choices=[f"{i+1}: {lyric.get('title', f'Variant {i+1}')}" 
+                    for i, lyric in enumerate(lyrics_info.get("lyrics_list", []))] 
+            if lyrics_info and lyrics_info.get("lyrics_list") else []
+        ),
+        inputs=lyrics_state,
+        outputs=variant_choice
+    )
+    
+    # Song generation
+    song_btn.click(
+        generate_song,
+        inputs=[lyrics_state, variant_choice, style, title, instrumental, model, custom_mode],
+        outputs=output
+    )
 
 if __name__ == "__main__":
-    print("🚀 Starting Suno Lyrics Generator")
+    print("🚀 Starting Suno Lyrics & Song Generator")
     print(f"🔑 SunoKey: {'✅ Set' if SUNO_KEY else '❌ Not set'}")
     app.launch(server_name="0.0.0.0", server_port=7860, share=False)