Update app.py

app.py

@@ -12,9 +12,10 @@ import torch
 from torch import nn
 from PIL import Image
 from feat import Detector
-from feat.utils import FEAT_EMOTION_COLUMNS
 from feat.utils.io import get_resource_path
 
+CLASS_LABELS = ['angry', 'disgust', 'fear', 'happy', 'neutral', 'sad', 'surprise']
+
 def _get_resource_path():
     return "/home/user/app/resources"
 
@@ -114,7 +115,7 @@ def proc_image(img, detector):
         (x0, y0, x1, y1, p) = face
         res_scale = img.shape[0]/704
         cv.rectangle(img, (int(x0), int(y0)), (int(x1), int(y1)), color = (0, 0, 255), thickness = 3)
-        cv.putText(img, FEAT_EMOTION_COLUMNS[label], (int(x0)-10, int(y1+25*res_scale*1.5)), fontFace = 0, color = (0, 255, 0), thickness = 2, fontScale = res_scale)
+        cv.putText(img, CLASS_LABELS[label], (int(x0)-10, int(y1+25*res_scale*1.5)), fontFace = 0, color = (0, 255, 0), thickness = 2, fontScale = res_scale)
         cv.putText(img, f"{faces_detected } face(s) found", (0, int(25*res_scale*1.5)), fontFace = 0, color = (0, 255, 0), thickness = 2, fontScale = res_scale)
         cv.putText(img, has_open_eyes, (int(x0)-10, int(y0)-10), fontFace = 0, color = (0, 255, 0), thickness = 2, fontScale = res_scale)
     return img
@@ -124,7 +125,8 @@ def extract_features(landmarks, face):
     return features
     
 def image_processing(img):
-    return proc_image(img, detector) if recog else img
+    ann = proc_image(img, detector) if recog else img
+    return ann
 
 def video_frame_callback(frame):
     img = frame.to_ndarray(format="bgr24")
@@ -170,6 +172,7 @@ with stream:
             media_stream_constraints={"video": True, "audio": False},
             async_processing=True,
         )
+        recog = st.toggle(":green[Emotion recogntion]", key = "stream", value = True)
     else:
         pic = st.container()
         frame = image_select(
@@ -183,8 +186,4 @@ with stream:
         use_container_width= False
         )
         img = np.array(Image.open(frame))
-        pic.image(image_processing(img), use_column_width = "always")
-
-
-recog = st.toggle(":green[Emotion recogntion]", key = "stream", value = True)
-
+        pic.image(image_processing(img), use_column_width = "always")