minio fix forthe streaming

main.py

@@ -242,17 +242,29 @@ async def create_song(
     await track_analytics_event("song_created", {"song_id": song["id"], "title": title})
 
     # Determine the public base URL for the hosted environment
-    # Use environment variable or derive from request headers
+    # Priority: 1) Env var, 2) HF Space detection, 3) Origin header, 4) Forwarded headers, 5) Fallback
     public_base = os.getenv("PUBLIC_BASE_URL")
+    
     if not public_base:
-        # Try to derive from request headers (works with proxies like HF Spaces)
-        forwarded_proto = request.headers.get("x-forwarded-proto")
-        forwarded_host = request.headers.get("x-forwarded-host")
-        if forwarded_proto and forwarded_host:
-            public_base = f"{forwarded_proto}://{forwarded_host}"
+        # Check if running on Hugging Face Spaces
+        hf_space = os.getenv("SPACE_ID")
+        if hf_space:
+            # Extract space name from SPACE_ID (e.g., "username/space-name")
+            public_base = f"https://{hf_space.replace('/', '-')}.hf.space"
         else:
-            # Fallback to request base URL
-            public_base = str(request.base_url).rstrip("/")
+            # Try Origin header (usually present in browser requests)
+            origin = request.headers.get("origin")
+            if origin:
+                public_base = origin.rstrip("/")
+            else:
+                # Try to derive from request headers (works with proxies like HF Spaces)
+                forwarded_proto = request.headers.get("x-forwarded-proto")
+                forwarded_host = request.headers.get("x-forwarded-host")
+                if forwarded_proto and forwarded_host:
+                    public_base = f"{forwarded_proto}://{forwarded_host}"
+                else:
+                    # Fallback to request base URL
+                    public_base = str(request.base_url).rstrip("/")
     
     response = {"status": "success", "song": song}
     if minio_info:
@@ -295,11 +307,20 @@ async def stream_song(song_id: int):
     NOTE: Redirecting to a MinIO presigned URL may point at an internal hostname (e.g. 127.0.0.1)
     in hosted environments like Hugging Face Spaces, which browsers cannot reach.
     """
-    file_data = download_mp3_file(song_id)
+    # Get song info to find the audio file path
+    song = get_song_by_id(song_id)
+    if not song:
+        raise HTTPException(status_code=404, detail="Song not found")
+    
+    # Get the stored audio file path from the database
+    object_name = song.get("audio_file_path")
+    if not object_name:
+        raise HTTPException(status_code=404, detail="Audio file not found")
+    
+    file_data = download_mp3_file(song_id, object_name=object_name)
     if not file_data:
         raise HTTPException(status_code=404, detail="Audio file not found")
 
-    song = get_song_by_id(song_id)
     filename = f"{song.get('title', 'song')}_{song_id}.mp3" if song else f"song_{song_id}.mp3"
 
     return StreamingResponse(
@@ -312,13 +333,22 @@ async def stream_song(song_id: int):
 @app.get("/songs/{song_id}/download")
 async def download_song(song_id: int):
     """Download an MP3 file from MinIO."""
-    file_data = download_mp3_file(song_id)
-    if not file_data:
+    # Get song info to find the audio file path
+    song = get_song_by_id(song_id)
+    if not song:
+        raise HTTPException(status_code=404, detail="Song not found")
+    
+    # Get the stored audio file path from the database
+    object_name = song.get("audio_file_path")
+    if not object_name:
         raise HTTPException(status_code=404, detail="Audio file not found")
     
-    song = get_song_by_id(song_id)
+    file_data = download_mp3_file(song_id, object_name=object_name)
+    if not file_data:
+        raise HTTPException(status_code=404, detail="Audio file not found")
+
     filename = f"{song.get('title', 'song')}_{song_id}.mp3" if song else f"song_{song_id}.mp3"
-    
+
     return StreamingResponse(
         io.BytesIO(file_data),
         media_type="audio/mpeg",
@@ -360,14 +390,23 @@ async def upload_audio(request: Request, song_id: int, audio_file: UploadFile =
     await invalidate_list_cache("all_songs")
 
     # Determine the public base URL for the hosted environment
+    # Priority: 1) Env var, 2) HF Space detection, 3) Origin header, 4) Forwarded headers, 5) Fallback
     public_base = os.getenv("PUBLIC_BASE_URL")
     if not public_base:
-        forwarded_proto = request.headers.get("x-forwarded-proto")
-        forwarded_host = request.headers.get("x-forwarded-host")
-        if forwarded_proto and forwarded_host:
-            public_base = f"{forwarded_proto}://{forwarded_host}"
+        hf_space = os.getenv("SPACE_ID")
+        if hf_space:
+            public_base = f"https://{hf_space.replace('/', '-')}.hf.space"
         else:
-            public_base = str(request.base_url).rstrip("/")
+            origin = request.headers.get("origin")
+            if origin:
+                public_base = origin.rstrip("/")
+            else:
+                forwarded_proto = request.headers.get("x-forwarded-proto")
+                forwarded_host = request.headers.get("x-forwarded-host")
+                if forwarded_proto and forwarded_host:
+                    public_base = f"{forwarded_proto}://{forwarded_host}"
+                else:
+                    public_base = str(request.base_url).rstrip("/")
 
     return {
         "status": "success",

minio_client.py

@@ -98,14 +98,16 @@ def upload_mp3_file(
         return None
 
 
-def download_mp3_file(song_id: int, filename: str = None) -> Optional[bytes]:
+def download_mp3_file(song_id: int, filename: str = None, object_name: str = None) -> Optional[bytes]:
     """Download an MP3 file from MinIO."""
     client = get_minio_client()
     if client is None:
         return None
-    
-    object_name = f"songs/{song_id}/{filename or f'song_{song_id}.mp3'}"
-    
+
+    # Use provided object_name, or construct it from song_id and filename
+    if object_name is None:
+        object_name = f"songs/{song_id}/{filename or f'song_{song_id}.mp3'}"
+
     try:
         response = client.get_object(MINIO_BUCKET, object_name)
         return response.read()