Update backend/server.py

backend/server.py

@@ -1,172 +1,114 @@
 import os
 import socketio
 import uvicorn
-from fastapi import FastAPI, HTTPException
+from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 import asyncio
 import base64
 import cv2
 import numpy as np
 import random
-from datetime import datetime
 from deepface import DeepFace
 from supabase import create_client, Client
 
-# --- CONFIGURATION SUPABASE ---
+# --- SETUP ---
 SUPABASE_URL = os.getenv("SUPABASE_URL", "https://gwjrwejdjpctizolfkcz.supabase.co")
 SUPABASE_KEY = os.getenv("SUPABASE_KEY", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Imd3anJ3ZWpkanBjdGl6b2xma2N6Iiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImlhdCI6MTc2OTA5ODEyNCwiZXhwIjoyMDg0Njc0MTI0fQ.EjU1DGTN-jrdkaC6nJWilFtYZgtu-NKjnfiMVMnHal0")
 
 try:
     supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
-    print("☁️ Connecté à Supabase")
+    print("☁️ SUPABASE OK")
 except Exception as e:
-    print(f"❌ Erreur Supabase : {e}")
-
-# --- CONFIGURATION SERVEUR (CORS FIXED) ---
-sio = socketio.AsyncServer(async_mode='asgi', cors_allowed_origins='*')
+    print(f"❌ ERREUR SUPABASE: {e}")
+
+# --- SOCKET SETUP ---
+# On augmente la taille max des messages (ping_timeout) pour éviter les déconnexions si l'image est lourde
+sio = socketio.AsyncServer(
+    async_mode='asgi', 
+    cors_allowed_origins='*',
+    ping_timeout=60,
+    max_http_buffer_size=10000000 # 10MB max
+)
 
 app = FastAPI()
-app.add_middleware(
-    CORSMiddleware, 
-    allow_origins=["*"], 
-    allow_credentials=True, 
-    allow_methods=["*"], 
-    allow_headers=["*"],
-)
+app.add_middleware(CORSMiddleware, allow_origins=["*"], allow_credentials=True, allow_methods=["*"], allow_headers=["*"])
 socket_app = socketio.ASGIApp(sio, app)
 
-# --- API REST ---
-@app.get("/api/sessions")
-def get_sessions():
-    response = supabase.table('sessions').select("*").order('id', desc=True).execute()
-    return response.data
-
-@app.get("/api/sessions/{session_id}")
-def get_session_details(session_id: int):
-    sess = supabase.table('sessions').select("*").eq('id', session_id).execute()
-    if not sess.data: raise HTTPException(status_code=404, detail="Session introuvable")
-    meas = supabase.table('measurements').select("*").eq('session_id', session_id).order('session_time', desc=False).execute()
-    return {"info": sess.data[0], "data": meas.data}
-
-@app.delete("/api/sessions/{session_id}")
-def delete_session(session_id: int):
-    try:
-        supabase.table('sessions').delete().eq('id', session_id).execute()
-        return {"message": "Supprimé"}
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=str(e))
-
-# --- LOGIQUE MÉTIER ---
-def calculate_kpis(emotion):
-    valence = 0.0; arousal = 0.0; noise = random.uniform(-0.05, 0.05)
-    if emotion == "happy": valence = 0.8 + noise; arousal = 0.6 + noise
-    elif emotion == "surprise": valence = 0.2 + noise; arousal = 0.9 + noise
-    elif emotion in ["fear", "angry"]: valence = -0.7 + noise; arousal = 0.8 + noise
-    elif emotion == "disgust": valence = -0.8 + noise; arousal = 0.5 + noise
-    elif emotion == "sad": valence = -0.6 + noise; arousal = 0.2 + noise
-    else: valence = 0.0 + noise; arousal = 0.3 + noise
-
-    def clamp(n): return max(0, min(100, int(n)))
-    val_eng = clamp((arousal * 100) + random.uniform(0, 5))
-    val_sat = clamp(((valence + 1) / 2) * 100)
-    val_tru = clamp(50 + (valence * 40) + random.uniform(0, 5)) if valence > 0 else clamp(50 - (abs(valence) * 40) + random.uniform(0, 5))
-    val_loy = clamp((val_sat * 0.7) + (val_tru * 0.3))
-    val_opi = val_sat
-
-    if val_eng >= 75: lbl_eng = "Engagement Fort 🔥"
-    elif val_eng >= 40: lbl_eng = "Engagement Moyen"
-    else: lbl_eng = "Désengagement 💤"
-
-    if val_sat >= 70: lbl_sat = "Très Satisfait 😃"
-    elif val_sat >= 45: lbl_sat = "Neutre 😐"
-    else: lbl_sat = "Insatisfait 😡"
-    
-    return {
-        "engagement": val_eng, "satisfaction": val_sat, "trust": val_tru, "loyalty": val_loy, "opinion": val_opi,
-        "lbl_eng": lbl_eng, "lbl_sat": lbl_sat
-    }
+# --- GLOBAL STATE ---
+sessions = {}
+
+# --- EVENTS ---
 
-# --- GESTION WEBSOCKET ---
-camera_state = { "emotion": "neutral", "emotion_score": 0, "face_coords": None }
-active_sessions = {}
+@sio.event
+async def connect(sid, environ):
+    print(f"✅ NOUVELLE CONNEXION : {sid}")
+    sessions[sid] = {"active": False}
+
+@sio.event
+async def disconnect(sid):
+    print(f"❌ DECONNEXION : {sid}")
+    if sid in sessions: del sessions[sid]
+
+@sio.event
+async def start_session(sid, data):
+    print(f"▶️ DEMANDE DE START REÇUE DE {sid}")
+    print(f"📦 Données reçues: {data}")
+    if sid in sessions:
+        sessions[sid]["active"] = True
+        print(f"🚀 SESSION ACTIVÉE POUR {sid}")
+
+@sio.event
+async def stop_session(sid):
+    print(f"⏹️ STOP REÇU DE {sid}")
+    if sid in sessions: sessions[sid]["active"] = False
 
 @sio.event
 async def process_frame(sid, data_uri):
+    # C'est ICI le mouchard le plus important
+    print(f"📨 IMAGE REÇUE DE {sid} (Taille: {len(data_uri)} chars)")
+    
+    if sid not in sessions:
+        print("⚠️ Session inconnue")
+        return
+
     try:
+        # 1. Décodage
+        print("1️⃣ Décodage image...")
         encoded_data = data_uri.split(',')[1]
         nparr = np.frombuffer(base64.b64decode(encoded_data), np.uint8)
         frame = cv2.imdecode(nparr, cv2.IMREAD_COLOR)
-        
+        print("✅ Image décodée avec succès")
+
+        # 2. Analyse DeepFace
+        print("2️⃣ Lancement DeepFace...")
+        # On force l'exécution synchrone pour voir si ça bloque ici
         result = DeepFace.analyze(frame, actions=['emotion'], enforce_detection=False, silent=True)
+        print("✅ DeepFace a répondu !")
+        
         data = result[0] if isinstance(result, list) else result
+        emotion = data['dominant_emotion']
+        print(f"🧠 Emotion détectée : {emotion}")
+
+        # 3. Réponse
+        region = data['region']
+        face_coords = {'x': region['x'], 'y': region['y'], 'w': region['w'], 'h': region['h']} if region['w'] > 0 else None
         
-        camera_state["emotion"] = data['dominant_emotion']
-        camera_state["emotion_score"] = data['emotion'][data['dominant_emotion']]
+        payload = {
+            "emotion": emotion,
+            "face_coords": face_coords,
+            "metrics": {"engagement": 50, "satisfaction": 50, "trust": 50, "loyalty": 50, "opinion": 50},
+            "session_time": 0,
+            "is_recording": sessions[sid]["active"]
+        }
         
-        region = data['region']
-        if region['w'] > 0:
-            camera_state["face_coords"] = {'x': region['x'], 'y': region['y'], 'w': region['w'], 'h': region['h']}
-        else:
-            camera_state["face_coords"] = None
-    except:
-        camera_state["face_coords"] = None
-
-async def session_manager_loop():
-    while True:
-        for sid, user_data in list(active_sessions.items()):
-            kpis = calculate_kpis(camera_state["emotion"])
-            
-            if user_data["is_recording"]:
-                user_data["session_time"] += 1
-                if user_data["db_id"]:
-                    try:
-                        data_to_insert = {
-                            "session_id": user_data["db_id"],
-                            "session_time": user_data["session_time"],
-                            "emotion": camera_state["emotion"],
-                            "emotion_score": camera_state["emotion_score"],
-                            "engagement_val": kpis["engagement"], "engagement_lbl": kpis["lbl_eng"],
-                            "satisfaction_val": kpis["satisfaction"], "satisfaction_lbl": kpis["lbl_sat"],
-                            "trust_val": kpis["trust"], "loyalty_val": kpis["loyalty"], "opinion_val": kpis["opinion"]
-                        }
-                        supabase.table('measurements').insert(data_to_insert).execute()
-                    except Exception as e: print(f"DB Error: {e}")
-
-            await sio.emit('metrics_update', {
-                "emotion": camera_state["emotion"], "metrics": kpis, 
-                "face_coords": camera_state["face_coords"], 
-                "session_time": user_data["session_time"], 
-                "is_recording": user_data["is_recording"]
-            }, room=sid)
-        await asyncio.sleep(1)
-
-@sio.event
-async def connect(sid, environ): 
-    print(f"Client connecté: {sid}")
-    active_sessions[sid] = { "is_recording": False, "session_time": 0, "db_id": None }
+        print(f"📤 Envoi de la réponse au client {sid}...")
+        await sio.emit('metrics_update', payload, room=sid)
+        print("✅ Réponse envoyée !")
 
-@sio.event
-async def disconnect(sid): 
-    if sid in active_sessions: del active_sessions[sid]
-
-@sio.event
-async def start_session(sid, data):
-    user_session = active_sessions.get(sid)
-    if user_session:
-        user_session["is_recording"] = True
-        user_session["session_time"] = 0
-        try:
-            new_session = { "first_name": data.get('firstName'), "last_name": data.get('lastName'), "client_id": data.get('clientId') }
-            res = supabase.table('sessions').insert(new_session).execute()
-            user_session["db_id"] = res.data[0]['id']
-        except Exception as e: print(f"Start Session Error: {e}")
-
-@sio.event
-async def stop_session(sid):
-    if sid in active_sessions: active_sessions[sid]["is_recording"] = False
+    except Exception as e:
+        print(f"🔥 CRASH PENDANT L'ANALYSE : {str(e)}")
+        import traceback
+        traceback.print_exc()
 
 if __name__ == "__main__":
-    @app.on_event("startup")
-    async def startup_event():
-        asyncio.create_task(session_manager_loop())
     uvicorn.run(socket_app, host="0.0.0.0", port=7860)