Update app.py

app.py

@@ -1,13 +1,13 @@
-from fastapi import FastAPI, HTTPException, Body
-from pydantic import BaseModel, HttpUrl
+from fastapi import FastAPI, HTTPException, UploadFile, File, Form
+from pydantic import BaseModel
 import os
 import uuid
 import shutil
-import json
 import requests
 from process_interview import process_interview
 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import FileResponse
+from typing import Optional
 
 app = FastAPI()
 
@@ -22,103 +22,64 @@ os.makedirs(PDF_DIR, exist_ok=True)
 
 app.mount("/static", StaticFiles(directory="static"), name="static")
 
-VALID_EXTENSIONS = ('.wav', '.mp3', '.m4a', '.flac', '.webm', '.ogg', '.aac')
-MAX_FILE_SIZE_MB = 300
 BASE_URL = os.getenv("BASE_URL", "https://evalbot-audio-evalbot.hf.space")
 
-# --- المسارات الجديدة لحل مشكلة 404 والـ Healthcheck ---
-@app.get("/")
-def read_root():
-    return {"message": "EvalBot API is running successfully! 🚀"}
-
-@app.get("/health")
-def health_check():
-    return {"status": "healthy"}
-# -------------------------------------------------------
-
 class ProcessResponse(BaseModel):
+    user_id: str
     summary: str
     json_url: str
     pdf_url: str
 
-class ProcessAudioRequest(BaseModel):
-    file_url: HttpUrl
-    user_id: str
+@app.get("/")
+def read_root():
+    return {"message": "EvalBot API is running successfully! 🚀"}
 
 @app.post("/process-audio", response_model=ProcessResponse)
-async def process_audio(request: ProcessAudioRequest = Body(...)):
-    file_url = request.file_url
-    user_id = request.user_id
+async def process_audio(
+    user_id: str = Form(...),
+    file_url: Optional[str] = Form(None),
+    file: Optional[UploadFile] = File(None)
+):
+    local_filename = f"{user_id}_{uuid.uuid4().hex}"
+    local_path = os.path.join(TEMP_DIR, local_filename)
     
     try:
-        file_ext = os.path.splitext(str(file_url))[1].lower()
-        if file_ext not in VALID_EXTENSIONS:
-            raise HTTPException(status_code=400, detail=f"Invalid file extension: {file_ext}")
-            
-        local_filename = f"{user_id}_{uuid.uuid4().hex}{file_ext}"
-        local_path = os.path.join(TEMP_DIR, local_filename)
-        
-        resp = requests.get(str(file_url), stream=True, timeout=30)
-        if resp.status_code != 200:
-            raise HTTPException(status_code=400, detail="Could not download the file from URL")
-            
-        with open(local_path, "wb") as f:
-            for chunk in resp.iter_content(chunk_size=8192):
-                if chunk:
-                    f.write(chunk)
-                    
-        file_size_mb = os.path.getsize(local_path) / (1024 * 1024)
-        if file_size_mb > MAX_FILE_SIZE_MB:
-            os.remove(local_path)
-            raise HTTPException(status_code=400, detail=f"File too large: {file_size_mb:.2f} MB")
-            
+        if file_url:
+            resp = requests.get(file_url, stream=True, timeout=30)
+            if resp.status_code != 200:
+                raise HTTPException(status_code=400, detail="تعذر الوصول للرابط المقدم.")
+            with open(local_path, "wb") as f:
+                shutil.copyfileobj(resp.raw, f)
+        elif file:
+            with open(local_path, "wb") as buffer:
+                shutil.copyfileobj(file.file, buffer)
+        else:
+            raise HTTPException(status_code=400, detail="يجب توفير رابط صوتي أو رفع ملف.")
+
+        # 2. المعالجة
         result = process_interview(local_path)
-        if not result:
-            os.remove(local_path)
-            raise HTTPException(status_code=500, detail="Processing failed")
-            
-        json_dest_name = f"{user_id}_{uuid.uuid4().hex}.json"
-        pdf_dest_name = f"{user_id}_{uuid.uuid4().hex}.pdf"
-        json_dest = os.path.join(JSON_DIR, json_dest_name)
-        pdf_dest = os.path.join(PDF_DIR, pdf_dest_name)
-        
-        shutil.copyfile(result['json_path'], json_dest)
-        shutil.copyfile(result['pdf_path'], pdf_dest)
         
-        with open(result['json_path'], "r") as jf:
-            analysis_data = json.load(jf)
-            
-        voice = analysis_data.get('voice_analysis', {}).get('interpretation', {})
-        speakers = analysis_data.get('speakers', [])
-        total_duration = analysis_data.get('text_analysis', {}).get('total_duration', 0.0)
+        # 3. إعداد الروابط
+        json_filename = os.path.basename(result['json_path'])
+        pdf_filename = os.path.basename(result['pdf_path'])
         
-        summary = (
-            f"User ID: {user_id}\n"
-            f"Speakers: {', '.join(speakers)}\n"
-            f"Duration: {total_duration:.2f} sec\n"
-            f"Confidence: {voice.get('confidence_level', 'N/A')}\n"
-            f"Anxiety: {voice.get('anxiety_level', 'N/A')}"
+        return ProcessResponse(
+            user_id=user_id,
+            summary="تم تحليل المقابلة بنجاح.",
+            json_url=f"{BASE_URL}/static/outputs/json/{json_filename}",
+            pdf_url=f"{BASE_URL}/static/outputs/pdf/{pdf_filename}"
         )
-        
-        json_url = f"{BASE_URL}/static/outputs/json/{json_dest_name}"
-        pdf_url = f"{BASE_URL}/static/outputs/pdf/{pdf_dest_name}"
-        
-        os.remove(local_path)
-        return ProcessResponse(summary=summary, json_url=json_url, pdf_url=pdf_url)
-        
+
     except Exception as e:
-        raise HTTPException(status_code=500, detail=str(e))
+        if os.path.exists(local_path):
+            os.remove(local_path)
+        raise HTTPException(status_code=500, detail=f"حدث خطأ أثناء المعالجة: {str(e)}")
 
+# مسارات عرض الملفات
 @app.get("/static/outputs/json/{filename}")
 async def get_json_file(filename: str):
-    file_path = os.path.join(JSON_DIR, filename)
-    if not os.path.exists(file_path):
-        raise HTTPException(status_code=404, detail="JSON file not found")
-    return FileResponse(file_path, media_type="application/json", filename=filename)
+    return FileResponse(os.path.join(JSON_DIR, filename))
 
 @app.get("/static/outputs/pdf/{filename}")
 async def get_pdf_file(filename: str):
-    file_path = os.path.join(PDF_DIR, filename)
-    if not os.path.exists(file_path):
-        raise HTTPException(status_code=404, detail="PDF file not found")
-    return FileResponse(file_path, media_type="application/pdf", filename=filename)
+    return FileResponse(os.path.join(PDF_DIR, filename))