Update backend/app/main.py

backend/app/main.py

@@ -430,6 +430,8 @@ async def upload_asset(
         file_suffix = Path(safe_filename).suffix
         unique_filename = f"{file_stem}_{datetime.utcnow().strftime('%Y%m%d_%H%M%S')}_{uuid.uuid4().hex[:8]}{file_suffix}"
         file_path = upload_dir / unique_filename
+        # Convert to absolute path before storing
+        file_path = file_path.resolve()
         with open(file_path, "wb") as buffer:
             buffer.write(content)
         
@@ -441,7 +443,7 @@ async def upload_asset(
             
             db_asset = Asset(
                 name=file.filename,  # Keep original filename for display
-                file_path=str(file_path),  # Store unique filename on disk
+                file_path=str(file_path),  # Store absolute path
                 file_type=file_type,
                 product_category=product_category or "ocr",
                 sub_category=sub_category if sub_category and sub_category != "none" else None,
@@ -466,7 +468,7 @@ async def upload_asset(
                                     SELECT id, created_at FROM assets 
                                     WHERE name = %s AND file_path = %s 
                                     ORDER BY id DESC LIMIT 1
-                                """, (file.filename, str(file_path)))
+                                """, (file.filename, str(file_path.resolve())))
                                 row = cursor.fetchone()
                                 cursor.close()
                                 conn.close()
@@ -500,7 +502,7 @@ async def upload_asset(
                                 RETURNING id, created_at
                             """, (
                                 file.filename,
-                                str(file_path),
+                                str(file_path.resolve()),  # Store absolute path
                                 file_type,
                                 product_category or "ocr",
                                 sub_category if sub_category and sub_category != "none" else None,
@@ -837,6 +839,47 @@ async def get_pdf_pages(asset_id, db: Session = Depends(get_db)):
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 
+def _get_media_type(file_path: Path, file_type: str) -> str:
+    """Determine media type from file path and type"""
+    media_type = "application/octet-stream"
+    suffix = file_path.suffix.lower()
+    
+    if file_type == "image" or suffix in [".jpg", ".jpeg", ".png", ".gif", ".webp", ".svg"]:
+        if suffix in [".jpg", ".jpeg"]:
+            media_type = "image/jpeg"
+        elif suffix == ".png":
+            media_type = "image/png"
+        elif suffix == ".gif":
+            media_type = "image/gif"
+        elif suffix == ".webp":
+            media_type = "image/webp"
+        elif suffix == ".svg":
+            media_type = "image/svg+xml"
+    elif file_type == "video" or suffix in [".mp4", ".webm", ".mov", ".avi"]:
+        if suffix == ".mp4":
+            media_type = "video/mp4"
+        elif suffix == ".webm":
+            media_type = "video/webm"
+        elif suffix == ".mov":
+            media_type = "video/quicktime"
+    elif file_type == "document" or suffix in [".pdf", ".doc", ".docx"]:
+        if suffix == ".pdf":
+            media_type = "application/pdf"
+        elif suffix in [".doc", ".docx"]:
+            media_type = "application/msword"
+    return media_type
+
+def _resolve_file_path(path_str: str) -> Path:
+    """Resolve file path (handle both absolute and relative paths)"""
+    file_path = Path(path_str)
+    if not file_path.is_absolute():
+        # If relative, assume it's relative to uploads directory
+        upload_dir = Path("uploads")
+        file_path = (upload_dir / file_path).resolve()
+    else:
+        file_path = file_path.resolve()
+    return file_path
+
 @app.get("/api/assets/{asset_id}/download")
 async def download_asset(asset_id, db: Session = Depends(get_db)):
     """Download or preview an asset file"""
@@ -850,6 +893,11 @@ async def download_asset(asset_id, db: Session = Depends(get_db)):
             raise HTTPException(status_code=400, detail=f"Invalid asset ID: {asset_id}")
         
         # Try to get asset from database
+        db_asset = None
+        file_path = None
+        file_name = None
+        file_type = None
+        
         try:
             db_asset = db.query(Asset).filter(Asset.id == asset_id_int).first()
         except Exception as orm_error:
@@ -868,62 +916,52 @@ async def download_asset(asset_id, db: Session = Depends(get_db)):
                         cursor.close()
                         conn.close()
                         if row:
-                            file_path = Path(row[2])
-                            if file_path.exists():
-                                return FileResponse(
-                                    path=str(file_path),
-                                    filename=row[1],
-                                    media_type="application/octet-stream"
-                                )
-                            else:
-                                raise HTTPException(status_code=404, detail="File not found on disk")
+                            file_path = _resolve_file_path(row[2])
+                            file_name = row[1]
+                            file_type = row[3]
                         else:
-                            raise HTTPException(status_code=404, detail="Asset not found")
+                            raise HTTPException(status_code=404, detail=f"Asset not found: {asset_id}")
+                    except HTTPException:
+                        raise
                     except Exception as psycopg2_error:
                         if conn:
                             conn.close()
-                        raise HTTPException(status_code=500, detail=str(psycopg2_error))
+                        raise HTTPException(status_code=500, detail=f"Database error: {str(psycopg2_error)}")
             else:
-                raise HTTPException(status_code=500, detail=str(orm_error))
+                raise HTTPException(status_code=500, detail=f"ORM error: {str(orm_error)}")
         
-        if not db_asset:
-            raise HTTPException(status_code=404, detail="Asset not found")
+        if db_asset:
+            file_path = _resolve_file_path(db_asset.file_path)
+            file_name = db_asset.name
+            file_type = db_asset.file_type
         
-        file_path = Path(db_asset.file_path)
+        if not file_path:
+            raise HTTPException(status_code=404, detail=f"Asset not found: {asset_id}")
+        
+        # Check if file exists
         if not file_path.exists():
-            raise HTTPException(status_code=404, detail="File not found on disk")
+            raise HTTPException(
+                status_code=404, 
+                detail=f"File not found on disk. Expected path: {file_path.absolute()}"
+            )
         
         # Determine media type
-        media_type = "application/octet-stream"
-        if db_asset.file_type == "image":
-            if file_path.suffix.lower() in [".jpg", ".jpeg"]:
-                media_type = "image/jpeg"
-            elif file_path.suffix.lower() == ".png":
-                media_type = "image/png"
-            elif file_path.suffix.lower() == ".gif":
-                media_type = "image/gif"
-            elif file_path.suffix.lower() == ".webp":
-                media_type = "image/webp"
-        elif db_asset.file_type == "video":
-            if file_path.suffix.lower() == ".mp4":
-                media_type = "video/mp4"
-            elif file_path.suffix.lower() == ".webm":
-                media_type = "video/webm"
-        elif db_asset.file_type == "document":
-            if file_path.suffix.lower() == ".pdf":
-                media_type = "application/pdf"
-            elif file_path.suffix.lower() in [".doc", ".docx"]:
-                media_type = "application/msword"
+        media_type = _get_media_type(file_path, file_type)
         
         return FileResponse(
-            path=str(file_path),
-            filename=db_asset.name,
-            media_type=media_type
+            path=str(file_path.absolute()),
+            filename=file_name,
+            media_type=media_type,
+            headers={
+                "Content-Disposition": f'inline; filename="{file_name}"'  # Use 'inline' for preview
+            }
         )
     except HTTPException:
         raise
     except Exception as e:
-        raise HTTPException(status_code=500, detail=str(e))
+        import traceback
+        print(f"Download error for asset {asset_id}: {traceback.format_exc()}")
+        raise HTTPException(status_code=500, detail=f"Download failed: {str(e)}")
 
 # ---- Post Management ----