Update app.py

app.py

@@ -97,7 +97,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, show_raw=False):
+def check_song_status(task_id):
     """Check song generation status - RETURNS DOWNLOAD LINKS"""
     if not task_id:
         return "❌ Please enter a Task ID", ""
@@ -115,7 +115,7 @@ def check_song_status(task_id, show_raw=False):
         
         data = resp.json()
         
-        # RAW JSON for debugging (always stored, shown if requested)
+        # RAW JSON for debugging
         raw_json = f"```json\n{json.dumps(data, indent=2)}\n```"
         
         if data.get("code") != 200:
@@ -129,7 +129,6 @@ def check_song_status(task_id, show_raw=False):
         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", [])
             
@@ -146,19 +145,14 @@ def check_song_status(task_id, show_raw=False):
                 
                 # Get all possible URLs
                 audio_url = song.get('audioUrl')
-                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')
+                stream_url = song.get('streamAudioUrl') or song.get('stream_url')
                 
                 # Best URL for listening
-                best_url = audio_url or stream_url or source_stream or source_audio
+                best_url = audio_url or stream_url
                 
                 if best_url:
                     output += f"**🎧 Listen Now:** [Click to Play]({best_url})\n"
-                    # Audio player
+                    # Audio player for HTML
                     output += f"""<audio controls style="width: 100%; margin: 10px 0;">
                         <source src="{best_url}" type="audio/mpeg">
                         Your browser does not support audio.
@@ -170,33 +164,17 @@ def check_song_status(task_id, show_raw=False):
                     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"
@@ -210,10 +188,7 @@ def check_song_status(task_id, show_raw=False):
             output += f"\n**⚠️ Unknown status:** {status}\n"
             output += "Check raw data below\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"
+        output += f"\n**🔗 Viewer:** [https://1hit.no/viewer.php?task_id={task_id}](https://1hit.no/viewer.php?task_id={task_id})\n"
         
         return output, raw_json
         
@@ -327,46 +302,21 @@ with gr.Blocks() as app:
                 - Default: "Gnomes remember" track
                 - Volume control
                 - Play/pause/seek
-                - Works with your generated songs!
                 """)
             
             with gr.Column(scale=2):
-                # Audio player display
-                gr.Markdown("### 🔊 Player")
-                audio_player = gr.HTML(
-                    value="""<audio id="musicPlayer" controls style="width: 100%; height: 100px; 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 playback.
-                    </audio>
-                    <div style="margin-top: 10px; padding: 10px; background: #f5f5f5; border-radius: 5px;">
-                        <strong>Now Playing:</strong> Gnomes remember.mp3 (Default track)
+                # 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>"""
                 )
-                
-                # Quick player controls
-                with gr.Row():
-                    volume_slider = gr.Slider(
-                        minimum=0,
-                        maximum=100,
-                        value=80,
-                        label="Volume",
-                        interactive=True
-                    )
-                
-                # Quick links to generated songs
-                gr.Markdown("### 🎵 Quick Play")
-                gr.Markdown("Paste URLs from generated songs:")
-                
-                quick_url_1 = gr.Textbox(
-                    label="Song URL 1",
-                    placeholder="Paste audio URL here",
-                    lines=1
-                )
-                quick_url_2 = gr.Textbox(
-                    label="Song URL 2", 
-                    placeholder="Paste another URL here",
-                    lines=1
-                )
     
     with gr.Tab("📋 Instructions"):
         gr.Markdown("""
@@ -384,81 +334,19 @@ with gr.Blocks() as app:
         - Click **Check Status Now**
         - Wait for **TEXT_SUCCESS** status
         
-        ### 3. Play & Download
-        - When ready, use **Music Player** tab:
-          - Play generated songs
-          - Download MP3 files
-          - Volume control
-          - Quick URLs
+        ### 3. Play Music
+        - Use **Music Player** tab:
+          - Default track plays automatically
+          - Paste any MP3 URL to play
+          - Works with your generated songs!
         
         ### 4. Player Features
         - **Default track**: Gnomes remember.mp3
         - **Any MP3 URL**: Paste and play
         - **From Suno**: Use streamAudioUrl
-        - **Volume control**: Adjust as needed
-        
-        ### 5. Status Meanings
-        - **TEXT_SUCCESS**: ✅ Songs ready!
-        - **PENDING/PROCESSING**: ⏳ Still working
-        - **SUCCESS**: Check raw data
-        - **FAILED**: Try again
+        - **Volume control**: Use player controls
         """)
     
-    # JavaScript for music player
-    app.load(
-        None,
-        None,
-        None,
-        js="""
-        function updateAudioPlayer(url, title) {
-            const player = document.getElementById('musicPlayer');
-            if (player) {
-                // Update audio source
-                const source = player.querySelector('source');
-                if (source) {
-                    source.src = url;
-                }
-                
-                // Update player src
-                player.src = url;
-                
-                // Update label
-                const label = document.querySelector('#musicPlayer + div');
-                if (label) {
-                    label.innerHTML = '<strong>Now Playing:</strong> ' + (title || url);
-                }
-                
-                // Load new audio
-                player.load();
-                
-                // Try to play
-                player.play().catch(e => console.log("Auto-play prevented:", e));
-            }
-        }
-        
-        // Volume control
-        function updateVolume(volume) {
-            const player = document.getElementById('musicPlayer');
-            if (player) {
-                player.volume = volume / 100;
-            }
-        }
-        
-        // Quick play functions
-        function playQuickUrl1(url) {
-            if (url && url.includes('://')) {
-                updateAudioPlayer(url, 'Quick Song 1');
-            }
-        }
-        
-        function playQuickUrl2(url) {
-            if (url && url.includes('://')) {
-                updateAudioPlayer(url, 'Quick Song 2');
-            }
-        }
-        """
-    )
-    
     # Auto-fill status tab with task ID
     def update_status_field(task_id):
         return task_id
@@ -473,9 +361,70 @@ 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  # Also updates status_task_id
-        return output, "", ""  # Clear if error
+            return output, task_id, task_id
+        return output, "", ""
     
     submit_btn.click(
         fn=on_generate,
-        inputs=[lyrics](streamdown:incomplete-link)
+        inputs=[lyrics_text, style, title, instrumental, model],
+        outputs=[submission_output, current_task_id, status_task_id]
+    )
+    
+    # Check status
+    def on_check(task_id):
+        output, raw = check_song_status(task_id)
+        return output, raw
+    
+    check_btn.click(
+        fn=on_check,
+        inputs=[status_task_id],
+        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)