Update app.py

app.py

@@ -101,12 +101,13 @@ def generate_song_from_text(lyrics_text, style, title, instrumental, model, cust
         task_id = data["data"]["taskId"]
         yield f"✅ **Request submitted!**\nTask ID: `{task_id}`\n\n⏳ Waiting for song generation...\n"
         
-        # Poll for results - FIXED ENDPOINT
-        for attempt in range(60):  # 60 attempts * 5 seconds = 300 seconds max (5 minutes)
-            time.sleep(5)
+        # Poll for results
+        max_attempts = 90  # 90 attempts * 10 seconds = 900 seconds (15 minutes)
+        for attempt in range(max_attempts):
+            time.sleep(10)  # Check every 10 seconds
             
             try:
-                # FIX: Use the correct endpoint from the API docs
+                # Check task status
                 check = requests.get(
                     f"https://api.sunoapi.org/api/v1/generate/record-info?taskId={task_id}",
                     headers={"Authorization": f"Bearer {SUNO_KEY}"},
@@ -116,53 +117,96 @@ def generate_song_from_text(lyrics_text, style, title, instrumental, model, cust
                 if check.status_code == 200:
                     check_data = check.json()
                     
-                    # Check if the response structure is valid
                     if check_data.get("code") != 200:
-                        yield f"⚠️ API returned error: {check_data.get('msg', 'Unknown')}"
-                        continue
+                        # If we get an error, check if task might still be processing
+                        if attempt < max_attempts - 1:
+                            continue
+                        else:
+                            yield f"⚠️ API returned error: {check_data.get('msg', 'Unknown')}"
+                            continue
                     
                     data_info = check_data.get("data", {})
                     status = data_info.get("status", "PENDING")
                     
                     if status == "COMPLETE":
-                        # Success! Extract song URLs
+                        # Try to get the response data
                         response_data = data_info.get("response", {})
                         
-                        # Try to parse response if it's a string
+                        # The response might be a JSON string or already parsed
                         if isinstance(response_data, str):
                             try:
                                 response_data = json.loads(response_data)
                             except:
-                                response_data = {}
+                                # Try to extract URLs directly if it's not JSON
+                                yield f"🎵 **Generation Complete!**\n\n"
+                                yield f"Task ID: `{task_id}`\nStatus: {status}\n\n"
+                                yield "However, we couldn't parse the song URLs from the response.\n\n"
+                                yield "**Try this:**\n"
+                                yield "1. Go to https://sunoapi.org\n"
+                                yield "2. Log in to your account\n"
+                                yield f"3. Check your generation history for task ID: {task_id}\n"
+                                yield "4. You should find your songs there with download links\n"
+                                return
                         
+                        # Extract songs from response
                         songs = response_data.get("data", [])
                         
+                        if not songs:
+                            # Try alternative structure
+                            songs = response_data.get("songs", [])
+                        
                         if songs:
                             output = "🎶 **Song Generation Complete!**\n\n"
+                            output += f"Generated {len(songs)} song(s)\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')
+                                stream_url = song.get('streamUrl') or song.get('stream_url')
+                                download_url = song.get('downloadUrl') or song.get('download_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"
                                 
-                                # Add audio player for streaming
-                                if stream_url and stream_url != 'No URL':
+                                if stream_url:
+                                    output += f"**Stream URL:** {stream_url}\n\n"
+                                    output += f"**Listen Now:** [Click to Stream]({stream_url})\n\n"
+                                    
+                                    # Add audio player for streaming
                                     output += f"""<audio controls style="width: 100%; margin: 10px 0;">
                                         <source src="{stream_url}" type="audio/mpeg">
                                         Your browser does not support the audio element.
                                     </audio>\n\n"""
+                                else:
+                                    output += "⚠️ Stream URL not available yet\n\n"
+                                
+                                if download_url:
+                                    output += f"**Download URL:** {download_url}\n\n"
+                                    output += f"**Download:** [Click to Download]({download_url})\n\n"
+                                else:
+                                    output += "⚠️ Download URL not available yet (check back in 2-3 minutes)\n\n"
                                 
                                 output += "---\n\n"
                             
-                            output += f"⏱️ Generated in about {(attempt + 1) * 5} seconds\n\n"
-                            output += "⚠️ **Note:** Files are retained for 15 days"
+                            output += f"⏱️ Generated in about {(attempt + 1) * 10} seconds\n\n"
+                            output += "**Tips:**\n"
+                            output += "- Stream URLs work immediately\n"
+                            output += "- Download URLs may take 2-3 minutes to become available\n"
+                            output += "- Files are retained for 15 days\n\n"
+                            output += "**If URLs don't work:**\n"
+                            output += f"1. Visit https://sunoapi.org\n"
+                            output += f"2. Log in and check your generation history\n"
+                            output += f"3. Look for task ID: `{task_id}`\n"
+                            
                             yield output
                         else:
-                            yield "✅ Completed but no songs found in response"
+                            # No songs found in response
+                            yield f"🎵 **Generation Complete!**\n\n"
+                            yield f"Task ID: `{task_id}`\nStatus: {status}\n\n"
+                            yield "**To access your songs:**\n"
+                            yield "1. Go to https://sunoapi.org\n"
+                            yield "2. Log in to your account\n"
+                            yield "3. Check your generation history\n"
+                            yield f"4. Look for task ID: `{task_id}`\n"
+                            yield "\nThe songs should be available there with download links."
                         return
                     
                     elif status == "FAILED":
@@ -172,15 +216,22 @@ def generate_song_from_text(lyrics_text, style, title, instrumental, model, cust
                     
                     else:
                         # Still processing (PENDING or 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)\n\nTypical timing:\n- 30-40s: Stream URL ready\n- 2-3 min: Download URL ready"
+                        if attempt % 3 == 0:  # Update every 30 seconds
+                            yield f"⏳ Status: {status}\n"
+                            yield f"Attempt: {attempt + 1}/{max_attempts}\n"
+                            yield f"Task ID: `{task_id}`\n\n"
+                            yield "Still processing...\n\n"
+                            yield "**Typical timing:**\n"
+                            yield "- 30-40 seconds: Stream URL ready\n"
+                            yield "- 2-3 minutes: Download URL ready\n"
+                            yield "- Up to 5 minutes for longer songs\n"
                 else:
-                    yield f"⚠️ Check error: HTTP {check.status_code}"
+                    yield f"⚠️ Check error: HTTP {check.status_code} - Task might still be processing"
             
             except Exception as e:
-                yield f"⚠️ Error checking status: {str(e)}"
+                yield f"⚠️ Error checking status: {str(e)} - Will try again..."
         
-        yield "⏰ Timeout after 300 seconds. Try checking again later."
+        yield "⏰ Timeout after 15 minutes. Try checking your Suno API dashboard for results."
     
     except Exception as e:
         yield f"❌ Error: {str(e)}"
@@ -304,6 +355,7 @@ with gr.Blocks(title="Suno Song Generator", theme="soft") as app:
             **Generation time:**
             - 30-40s: Stream URL ready
             - 2-3 min: Download URL ready
+            - Up to 5 min for longer songs
             """)
         
         with gr.Column(scale=2):