Update app.py

app.py

@@ -25,6 +25,7 @@ streaming = False
 
 def detect_and_classify(frame):
     faces = detector.detect_faces(frame)
+    detected_faces = []
     if faces:
         for face in faces:
             x, y, w, h = face['box']
@@ -46,12 +47,26 @@ def detect_and_classify(frame):
                 (text_width, text_height), _ = cv2.getTextSize(text, cv2.FONT_HERSHEY_SIMPLEX, 0.8, 2)
                 cv2.rectangle(frame, (x, y - text_height - 10), (x + text_width + 5, y), (0, 255, 0), -1)
                 cv2.putText(frame, text, (x, y-5), cv2.FONT_HERSHEY_SIMPLEX, 0.8, (0, 0, 0), 2)
-    return frame
+                detected_faces.append((top_emotion, top_percentage))
+    return frame, detected_faces
 
 @app.route('/')
 def index():
     return render_template('index.html', top_emotions=None, img_base64=None, show_upload=True, show_camera=False, initial_image=True)
 
+@app.route('/classify', methods=['POST'])
+def classify_image():
+    image = request.files['image']
+    img = Image.open(image)
+    img = np.array(img)
+    img = cv2.cvtColor(img, cv2.COLOR_RGB2BGR)
+    processed_frame, top_emotions = detect_and_classify(img)
+
+    _, buffer = cv2.imencode('.png', processed_frame)
+    img_base64 = base64.b64encode(buffer).decode('utf-8')
+
+    return render_template('index.html', top_emotions=top_emotions, img_base64=img_base64, show_upload=True, show_camera=False, initial_image=False)
+
 @app.route('/predict_video', methods=['POST'])
 def predict_video():
     data = request.json
@@ -66,11 +81,11 @@ def predict_video():
     frame = np.array(image)
     frame = cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
 
-    processed_frame = detect_and_classify(frame)
+    processed_frame, detected_faces = detect_and_classify(frame)
     _, buffer = cv2.imencode(".jpg", processed_frame)
     processed_image_base64 = base64.b64encode(buffer).decode("utf-8")
 
-    return jsonify({"processed_frame": processed_image_base64})
+    return jsonify({"processed_frame": processed_image_base64, "emotions": detected_faces})
 
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=7860)