Update app.py

app.py

@@ -1,44 +1,150 @@
 import gradio as gr
 import requests
 import os
+
 import json
 
 # Suno API key
-SUNO_KEY = os.environ.get("SunoKey", "")
 if not SUNO_KEY:
     print("⚠️ SunoKey not set!")
 
 def submit_song_generation(lyrics_text, style, title, instrumental, model):
     """Submit song generation request - IMMEDIATE RESPONSE WITH TASK ID"""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     if not SUNO_KEY:
         return "❌ Error: SunoKey not configured", ""
+
     
     if not lyrics_text.strip() and not instrumental:
         return "❌ Error: Please provide lyrics or select instrumental", ""
+
     
     if not style.strip():
         return "❌ Error: Please provide a music style", ""
+
     
     if not title.strip():
         return "❌ Error: Please provide a song title", ""
+
     
     try:
         # Prepare request data
-        request_data = {
-            "customMode": True,
-            "instrumental": instrumental,
-            "model": model,
-            "callBackUrl": "https://1hit.no/callback.php",
-            "style": style,
-            "title": title,
-        }
-        
-        if not instrumental:
             # Apply character limits
             if model == "V4" and len(lyrics_text) > 3000:
                 lyrics_text = lyrics_text[:3000]
+
             elif model in ["V4_5", "V4_5PLUS", "V4_5ALL", "V5"] and len(lyrics_text) > 5000:
                 lyrics_text = lyrics_text[:5000]
+
             
             request_data["prompt"] = lyrics_text
         else:
@@ -57,11 +163,23 @@ def submit_song_generation(lyrics_text, style, title, instrumental, model):
         
         if resp.status_code != 200:
             return f"❌ Submission failed: HTTP {resp.status_code}\n\n{resp.text}", ""
+
+
+
+
+
         
         data = resp.json()
+
         
         # Extract task ID - IMMEDIATELY
         task_id = None
+
+
+
+
+
+
         
         # Try different response formats
         if "taskId" in data:
@@ -97,7 +215,7 @@ def submit_song_generation(lyrics_text, style, title, instrumental, model):
     except Exception as e:
         return f"❌ Error: {str(e)}", ""
 
-def check_song_status(task_id):
+def check_song_status(task_id, show_raw=False):
     """Check song generation status - RETURNS DOWNLOAD LINKS"""
     if not task_id:
         return "❌ Please enter a Task ID", ""
@@ -115,7 +233,7 @@ def check_song_status(task_id):
         
         data = resp.json()
         
-        # RAW JSON for debugging
+        # RAW JSON for debugging (always stored, shown if requested)
         raw_json = f"```json\n{json.dumps(data, indent=2)}\n```"
         
         if data.get("code") != 200:
@@ -129,6 +247,7 @@ def check_song_status(task_id):
         output += f"**Status:** {status}\n"
         
         if status == "TEXT_SUCCESS":
+            # This is the key status! Songs are ready!
             response_data = task_data.get("response", {})
             songs = response_data.get("sunoData", [])
             
@@ -138,6 +257,8 @@ def check_song_status(task_id):
                 return output, raw_json
             
             output += f"## 🎵 SONGS READY! ({len(songs)} tracks)\n\n"
+
+
             
             for i, song in enumerate(songs, 1):
                 output += f"### Track {i}\n"
@@ -145,14 +266,19 @@ def check_song_status(task_id):
                 
                 # Get all possible URLs
                 audio_url = song.get('audioUrl')
-                stream_url = song.get('streamAudioUrl') or song.get('stream_url')
+                stream_url = song.get('streamAudioUrl') or song.get('streamAudioURL') or song.get('stream_url')
+                source_stream = song.get('sourceStreamAudioUrl')
+                source_audio = song.get('sourceAudioUrl')
+                
+                # Image URL
+                image_url = song.get('imageUrl') or song.get('sourceImageUrl')
                 
                 # Best URL for listening
-                best_url = audio_url or stream_url
+                best_url = audio_url or stream_url or source_stream or source_audio
                 
                 if best_url:
                     output += f"**🎧 Listen Now:** [Click to Play]({best_url})\n"
-                    # Audio player for HTML
+                    # Audio player
                     output += f"""<audio controls style="width: 100%; margin: 10px 0;">
                         <source src="{best_url}" type="audio/mpeg">
                         Your browser does not support audio.
@@ -164,17 +290,48 @@ def check_song_status(task_id):
                     elif stream_url:
                         output += f"**💾 Download:** [Stream MP3]({stream_url})\n"
                 
+                if image_url:
+                    output += f"**🖼️ Cover Art:** [View Image]({image_url})\n"
+                
                 output += f"**ID:** `{song.get('id', 'N/A')}`\n"
                 output += f"**Model:** {song.get('modelName', 'N/A')}\n"
                 output += f"**Tags:** {song.get('tags', 'N/A')}\n"
+                if song.get('duration'):
+                    output += f"**Duration:** {song.get('duration')}s\n"
+                
+                # Show first 200 chars of prompt
+                prompt = song.get('prompt', '')
+                if prompt:
+                    output += f"**Preview:** {prompt[:200]}...\n"
                 
                 output += "\n---\n\n"
             
+            # Summary
             output += f"**✅ Generation complete!**\n\n"
+            output += "**To save your songs:**\n"
+            output += "1. Right-click 'Listen Now' links → 'Save link as...'\n"
+            output += "2. Or use the download links above\n"
+            output += "3. Note the Track IDs for reference\n"
             
         elif status in ["PENDING", "PROCESSING", "RUNNING"]:
             output += f"\n**⏳ Song is still being generated...**\n"
             output += "Check again in 30-60 seconds\n"
+            output += f"This usually takes 1-3 minutes total\n"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             
         elif status == "SUCCESS":
             output += f"\n**✅ Generation succeeded!**\n"
@@ -183,12 +340,16 @@ def check_song_status(task_id):
         elif status == "FAILED":
             error_msg = task_data.get("errorMessage", "Unknown error")
             output += f"\n**❌ Generation failed:** {error_msg}\n"
+
             
         else:
             output += f"\n**⚠️ Unknown status:** {status}\n"
             output += "Check raw data below\n"
         
-        output += f"\n**🔗 Viewer:** [https://1hit.no/viewer.php?task_id={task_id}](https://1hit.no/viewer.php?task_id={task_id})\n"
+        # Always show premium info
+        output += f"\n**💡 Tip:** Songs may take 2-3 minutes to fully process\n"
+        output += f"**📞 Callback sent to:** https://1hit.no/callback.php\n"
+        output += f"**🔗 Viewer:** [https://1hit.no/viewer.php?task_id={task_id}](https://1hit.no/viewer.php?task_id={task_id})\n"
         
         return output, raw_json
         
@@ -197,7 +358,7 @@ def check_song_status(task_id):
 
 # Create the app
 with gr.Blocks() as app:
-    gr.Markdown("# 🎵 Suno Song Generator + Player")
+    gr.Markdown("# 🎵 Suno Song Generator")
     
     # Store current task ID
     current_task_id = gr.State(value="")
@@ -206,14 +367,21 @@ with gr.Blocks() as app:
         with gr.Row():
             with gr.Column(scale=1):
                 # Inputs
+
+
                 lyrics_text = gr.Textbox(
                     label="Lyrics (leave empty for instrumental)",
                     placeholder="[Verse 1]\nType your lyrics here...",
                     lines=8
+
                 )
                 
+
+
+
                 style = gr.Textbox(
                     label="Music Style",
+
                     value="Pop",
                     placeholder="e.g., Rock, Jazz, Electronic"
                 )
@@ -221,18 +389,28 @@ with gr.Blocks() as app:
                 title = gr.Textbox(
                     label="Song Title",
                     value="My Song"
+
+
                 )
                 
                 with gr.Row():
                     instrumental = gr.Checkbox(label="Instrumental Only")
+
+
+
+
                     model = gr.Dropdown(
+
                         choices=["V5", "V4_5PLUS", "V4_5ALL", "V4_5", "V4"],
                         value="V4_5ALL",
                         label="Model"
                     )
                 
                 submit_btn = gr.Button("🚀 Generate Song", variant="primary")
+
+
                 
+
                 gr.Markdown("""
                 **Instructions:**
                 1. Enter lyrics (or blank for instrumental)
@@ -240,6 +418,11 @@ with gr.Blocks() as app:
                 3. Click Generate
                 4. **Copy the Task ID**
                 5. Check status in next tab
+
+
+
+
+
                 """)
             
             with gr.Column(scale=2):
@@ -252,6 +435,7 @@ with gr.Blocks() as app:
         with gr.Row():
             with gr.Column(scale=1):
                 gr.Markdown("### Check Song Status")
+
                 
                 # Task ID input (auto-fills from generation)
                 status_task_id = gr.Textbox(
@@ -261,6 +445,7 @@ with gr.Blocks() as app:
                 )
                 
                 check_btn = gr.Button("🔍 Check Status Now", variant="primary")
+                auto_check = gr.Checkbox(label="Auto-check every 30s", value=False)
                 
                 gr.Markdown("""
                 **What to expect:**
@@ -281,46 +466,29 @@ with gr.Blocks() as app:
                         value="*Raw JSON will appear here when you check status*"
                     )
     
-    with gr.Tab("🎧 Music Player"):
-        with gr.Row():
-            with gr.Column(scale=1):
-                gr.Markdown("### Music Player")
-                gr.Markdown("Play any MP3 URL or use the default track")
-                
-                music_url = gr.Textbox(
-                    label="MP3 URL",
-                    value="https://huggingface.co/spaces/MySafeCode/SUNO-API-V5/resolve/main/Gnomes%20remember.mp3",
-                    info="Enter any direct MP3 URL"
-                )
-                
-                play_btn = gr.Button("▶️ Play This URL", variant="primary")
-                reset_btn = gr.Button("🔄 Reset to Default", variant="secondary")
-                
-                gr.Markdown("""
-                **Features:**
-                - Play any public MP3 URL
-                - Default: "Gnomes remember" track
-                - Volume control
-                - Play/pause/seek
-                """)
-            
-            with gr.Column(scale=2):
-                # Audio player HTML
-                audio_display = gr.HTML(
-                    value="""<div>
-                        <audio id="mainPlayer" controls style="width: 100%; height: 60px; margin: 20px 0;">
-                            <source src="https://huggingface.co/spaces/MySafeCode/SUNO-API-V5/resolve/main/Gnomes%20remember.mp3" type="audio/mpeg">
-                            Your browser does not support audio.
-                        </audio>
-                        <div style="margin: 10px 0; padding: 10px; background: #f5f5f5; border-radius: 5px;">
-                            <strong>Now Playing:</strong> Gnomes remember.mp3
-                        </div>
-                    </div>"""
-                )
-    
     with gr.Tab("📋 Instructions"):
         gr.Markdown("""
         ## 🎵 Complete Workflow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         
         ### 1. Generate Song
         - Enter lyrics & settings
@@ -328,28 +496,52 @@ with gr.Blocks() as app:
         - **IMMEDIATELY get a Task ID**
         - Copy the Task ID
         
-        ### 2. Check Status  
+        ### 2. Check Status
         - Switch to **Check Status** tab
         - Task ID auto-fills
         - Click **Check Status Now**
         - Wait for **TEXT_SUCCESS** status
         
-        ### 3. Play Music
-        - Use **Music Player** tab:
-          - Default track plays automatically
-          - Paste any MP3 URL to play
-          - Works with your generated songs!
+        ### 3. Download Songs
+        - When **TEXT_SUCCESS** appears:
+          - **Listen Now** links with audio players
+          - **Download** links for MP3 files
+          - Cover art images
+          - Track IDs for reference
+        
+        ### 4. Tips
+        - Processing: **1-3 minutes**
+        - Check every **30 seconds**
+        - Use **Auto-check** for convenience
+        - Raw data available for debugging
         
-        ### 4. Player Features
-        - **Default track**: Gnomes remember.mp3
-        - **Any MP3 URL**: Paste and play
-        - **From Suno**: Use streamAudioUrl
-        - **Volume control**: Use player controls
+        ### 5. Status Meanings
+        - **TEXT_SUCCESS**: ✅ Songs ready!
+        - **PENDING/PROCESSING**: ⏳ Still working
+        - **SUCCESS**: Check raw data
+        - **FAILED**: Try again
+        
+        ### 6. Callback System
+        - Results also sent to: https://1hit.no/callback.php
+        - View all results: https://1hit.no/viewer.php
+
         """)
     
     # Auto-fill status tab with task ID
     def update_status_field(task_id):
         return task_id
+
+
+
+
+
+
+
+
+
+
+
+
     
     current_task_id.change(
         fn=update_status_field,
@@ -361,8 +553,8 @@ with gr.Blocks() as app:
     def on_generate(lyrics, style, title, instrumental, model):
         output, task_id = submit_song_generation(lyrics, style, title, instrumental, model)
         if task_id:
-            return output, task_id, task_id
-        return output, "", ""
+            return output, task_id, task_id  # Also updates status_task_id
+        return output, "", ""  # Clear if error
     
     submit_btn.click(
         fn=on_generate,
@@ -371,60 +563,24 @@ with gr.Blocks() as app:
     )
     
     # Check status
-    def on_check(task_id):
-        output, raw = check_song_status(task_id)
+    def on_check(task_id, show_raw):
+        output, raw = check_song_status(task_id, show_raw)
         return output, raw
+
+
+
+
     
     check_btn.click(
         fn=on_check,
-        inputs=[status_task_id],
+        inputs=[status_task_id, gr.State(True)],  # Always show raw
         outputs=[status_output, raw_output]
     )
-    
-    # Music player controls
-    def play_music(url):
-        if not url.strip():
-            url = "https://huggingface.co/spaces/MySafeCode/SUNO-API-V5/resolve/main/Gnomes%20remember.mp3"
-        
-        # Create HTML with the new URL
-        html = f"""<div>
-            <audio id="mainPlayer" controls style="width: 100%; height: 60px; margin: 20px 0;">
-                <source src="{url}" type="audio/mpeg">
-                Your browser does not support audio.
-            </audio>
-            <div style="margin: 10px 0; padding: 10px; background: #f5f5f5; border-radius: 5px;">
-                <strong>Now Playing:</strong> {url.split('/')[-1].replace('%20', ' ')}
-            </div>
-        </div>"""
-        return html
-    
-    play_btn.click(
-        fn=play_music,
-        inputs=[music_url],
-        outputs=[audio_display]
-    )
-    
-    def reset_music():
-        url = "https://huggingface.co/spaces/MySafeCode/SUNO-API-V5/resolve/main/Gnomes%20remember.mp3"
-        html = f"""<div>
-            <audio id="mainPlayer" controls style="width: 100%; height: 60px; margin: 20px 0;">
-                <source src="{url}" type="audio/mpeg">
-                Your browser does not support audio.
-            </audio>
-            <div style="margin: 10px 0; padding: 10px; background: #f5f5f5; border-radius: 5px;">
-                <strong>Now Playing:</strong> Gnomes remember.mp3
-            </div>
-        </div>"""
-        return html, url
-    
-    reset_btn.click(
-        fn=reset_music,
-        outputs=[audio_display, music_url]
-    )
 
-# Launch the app
+
 if __name__ == "__main__":
     print("🚀 Starting Suno Song Generator")
     print(f"🔑 SunoKey: {'✅ Set' if SUNO_KEY else '❌ Not set'}")
     print("🌐 Open your browser to: http://localhost:7860")
+
     app.launch(server_name="0.0.0.0", server_port=7860, share=False)