Update app.py

app.py

@@ -82,21 +82,29 @@ def submit_vocal_separation(task_id, audio_id):
             data = resp.json()
             print(f"Parsed data: {data}")
             
-            # Try to get separation task ID
+            # Get separation task ID from response
             separation_task_id = None
-            if "taskId" in data:
-                separation_task_id = data["taskId"]
-            elif data.get("code") == 200 and "data" in data and "taskId" in data["data"]:
+            
+            # Try different response formats
+            if data.get("taskId"):
+                separation_task_id = data.get("taskId")
+            elif data.get("data", {}).get("taskId"):
                 separation_task_id = data["data"]["taskId"]
-            elif data.get("data") and "taskId" in data.get("data", {}):
+            elif data.get("code") == 200 and data.get("data", {}).get("taskId"):
                 separation_task_id = data["data"]["taskId"]
             
             if separation_task_id:
-                return f"✅ **Task submitted!**\n\n**Separation Task ID:** `{separation_task_id}`\n\nCheck status below using this ID.", separation_task_id
+                # Also get musicId if available
+                music_id = data.get("musicId") or data.get("data", {}).get("musicId", "N/A")
+                
+                output = f"✅ **Task submitted!**\n\n"
+                output += f"**Separation Task ID:** `{separation_task_id}`\n"
+                output += f"**Music ID:** `{music_id}`\n\n"
+                output += "Check status below using the Separation Task ID."
+                return output, separation_task_id
             else:
-                # Try to extract error or show raw response
                 error_msg = data.get("msg", data.get("error", "Unknown error"))
-                return f"❌ No task ID in response: {error_msg}\n\nRaw: {json.dumps(data, indent=2)}", None
+                return f"❌ No task ID in response: {error_msg}\n\nRaw response:\n```json\n{json.dumps(data, indent=2)}\n```", None
         else:
             return f"❌ HTTP Error {resp.status_code}:\n{resp.text}", None
             
@@ -120,39 +128,89 @@ def check_separation_status(task_id):
         
         if resp.status_code == 200:
             data = resp.json()
-            print(f"Status data: {data}")
+            print(f"Status data: {json.dumps(data, indent=2)}")
+            
+            # Check API response code
+            if data.get("code") != 200:
+                error_msg = data.get("msg", "Unknown error")
+                return f"❌ API Error: {error_msg}\n\n**Task ID:** `{task_id}`"
+            
+            # Get the main data object
+            response_data = data.get("data", {})
             
-            # Check for success
-            if data.get("code") == 200:
-                # Get vocal removal info
-                vocal_info = data.get("data", {}).get("vocal_removal_info", {})
+            # Check success flag
+            success_flag = response_data.get("successFlag", "UNKNOWN")
+            
+            if success_flag == "SUCCESS":
+                # Get response with download URLs
+                result_response = response_data.get("response", {})
                 
-                if vocal_info:
+                if result_response:
                     # Format results
-                    output = "✅ **Separation Complete!**\n\n"
-                    output += f"**Task ID:** `{task_id}`\n\n"
+                    output = "✅ **Vocal Separation Complete!**\n\n"
+                    output += f"**Task ID:** `{task_id}`\n"
+                    output += f"**Music ID:** `{response_data.get('musicId', 'N/A')}`\n\n"
+                    output += "## 🎵 Download Links\n\n"
+                    
+                    # Check for URLs (case-insensitive)
+                    urls_found = False
+                    
+                    # Vocal URL
+                    vocal_url = (result_response.get("vocalUrl") or 
+                                result_response.get("vocal_url") or
+                                result_response.get("vocalURL"))
+                    if vocal_url:
+                        output += f"**🎤 Vocals:** [Download MP3]({vocal_url})\n"
+                        urls_found = True
+                    
+                    # Instrumental URL  
+                    instrumental_url = (result_response.get("instrumentalUrl") or 
+                                      result_response.get("instrumental_url") or
+                                      result_response.get("instrumentalURL"))
+                    if instrumental_url:
+                        output += f"**🎵 Instrumental:** [Download MP3]({instrumental_url})\n"
+                        urls_found = True
                     
-                    if vocal_info.get("vocal_url"):
-                        output += f"**🎤 Vocals:** [Download MP3]({vocal_info['vocal_url']})\n"
-                    if vocal_info.get("instrumental_url"):
-                        output += f"**🎵 Instrumental:** [Download MP3]({vocal_info['instrumental_url']})\n"
-                    if vocal_info.get("origin_url"):
-                        output += f"**📁 Original:** [Download MP3]({vocal_info['origin_url']})\n"
+                    # Original URL
+                    origin_url = (result_response.get("originUrl") or 
+                                 result_response.get("origin_url") or
+                                 result_response.get("originURL"))
+                    if origin_url:
+                        output += f"**📁 Original:** [Download MP3]({origin_url})\n"
+                        urls_found = True
+                    
+                    if not urls_found:
+                        output += "No download URLs found in response.\n"
+                        output += f"**Raw response:**\n```json\n{json.dumps(result_response, indent=2)}\n```\n"
                     
                     output += f"\n**🔗 Viewer:** [Open in Viewer](https://1hit.no/viewer.php?task_id={task_id})"
+                    
+                    # Add other fields if they exist
+                    other_fields = []
+                    for key, value in result_response.items():
+                        if value and key.endswith("Url") and key not in ["vocalUrl", "instrumentalUrl", "originUrl"]:
+                            field_name = key.replace("Url", "").replace("_", " ").title()
+                            other_fields.append(f"**{field_name}:** {value}")
+                    
+                    if other_fields:
+                        output += "\n\n**Other URLs:**\n" + "\n".join(other_fields)
+                    
                     return output
                 else:
-                    return f"✅ Processing complete but no URLs yet.\n\nCheck callback or try again later.\n\n**Task ID:** `{task_id}`"
+                    return f"✅ **Processing complete!**\n\n**Task ID:** `{task_id}`\n\nNo download URLs in response yet. Check your callback endpoint or try again in a moment."
+            
+            elif success_flag in ["PENDING", "PROCESSING", "RUNNING"]:
+                return f"⏳ **Status:** {success_flag}\n\n**Task ID:** `{task_id}`\n\nStill processing. Check again in 30 seconds."
+            
+            elif success_flag == "FAILED":
+                error_msg = response_data.get("errorMessage", "Unknown error")
+                return f"❌ **Failed:** {error_msg}\n\n**Task ID:** `{task_id}`"
             
-            # Check for other statuses
-            status = data.get("data", {}).get("status", "UNKNOWN")
-            if status in ["PENDING", "PROCESSING", "RUNNING"]:
-                return f"⏳ **Status:** {status}\n\n**Task ID:** `{task_id}`\n\nStill processing. Check again in 30 seconds."
-            elif status == "FAILED":
-                error = data.get("data", {}).get("errorMessage", "Unknown error")
-                return f"❌ **Failed:** {error}\n\n**Task ID:** `{task_id}`"
             else:
-                return f"🔄 **Status:** {status}\n\n**Task ID:** `{task_id}`\n\nRaw: {json.dumps(data, indent=2)}"
+                return f"🔄 **Status:** {success_flag}\n\n**Task ID:** `{task_id}`\n\n**Full response:**\n```json\n{json.dumps(data, indent=2)}\n```"
+        
+        elif resp.status_code == 404:
+            return f"❌ Task not found: `{task_id}`\n\nMake sure the Task ID is correct and the separation has started."
         else:
             return f"❌ HTTP Error {resp.status_code}:\n{resp.text}"
             
@@ -278,9 +336,4 @@ if __name__ == "__main__":
     print(f"🔑 SunoKey: {'✅ Set' if SUNO_KEY else '❌ Not set'}")
     print("🌐 Open your browser to: http://localhost:7860")
     
-    # Simple launch without extra parameters
-    app.launch(
-        server_name="0.0.0.0",
-        server_port=7860,
-        share=False
-    )
+    app.launch(server_name="0.0.0.0", server_port=7860, share=False)