Update app.py

app.py

@@ -59,13 +59,6 @@ def getTranscription(path):
     return transcription[0]
 
 def video_processing(video_file, encoded_video):
-    angry = 0
-    disgust = 0
-    fear = 0
-    happy = 0
-    sad = 0
-    surprise = 0
-    neutral = 0
     emotion_count = 0
     video_emotions = {
         'angry': 0,
@@ -116,7 +109,6 @@ def video_processing(video_file, encoded_video):
         
         # Find all the faces in the frame using a pre-trained convolutional neural network.
         face_locations = face_recognition.face_locations(gray)
-        #face_locations = face_recognition.face_locations(gray, number_of_times_to_upsample=0, model="cnn")
 
         if len(face_locations) > 0:
             # Show the original frame with face rectangles drawn around the faces
@@ -146,23 +138,14 @@ def video_processing(video_file, encoded_video):
                 elif result[0] == 'off_camera':
                     off_camera += 1
                 total += 1
-                
-                # angry += emotion[0]['emotion']['angry']
-                # disgust += emotion[0]['emotion']['disgust']
-                # fear += emotion[0]['emotion']['fear']
-                # happy += emotion[0]['emotion']['happy']
-                # sad += emotion[0]['emotion']['sad']
-                # surprise += emotion[0]['emotion']['surprise']
-                # neutral += emotion[0]['emotion']['neutral']
 
     try:
         # your processing code here
         gaze_percentage = on_camera / total * 100
     except Exception as e:
         print(f"An error occurred while processing the video: {e}")
-        gaze_percentage = f'no face detected Total = {total},on_camera = {on_camera},off_camera = {off_camera}'
+        gaze_percentage = 'ERROR : no face detected'
     print(f'Total = {total},on_camera = {on_camera},off_camera = {off_camera}')
-    # print(f'focus perfectage = {on_camera/total*100}')
     # Release the video capture object and close all windows
     video_capture.release()
     cv2.destroyAllWindows()
@@ -172,37 +155,18 @@ def video_processing(video_file, encoded_video):
         os.remove("temp_video.mp4")
     print(gaze_percentage)
 
-    angry = angry / emotion_count
-    disgust = disgust / emotion_count
-    fear = fear / emotion_count
-    happy = happy / emotion_count
-    sad = sad / emotion_count
-    surprise = surprise / emotion_count
-    neutral = neutral / emotion_count
-    # emotion = {
-    #     'angry': angry, 
-    #     'disgust': disgust, 
-    #     'fear': fear, 
-    #     'happy': happy, 
-    #     'sad': sad, 
-    #     'surprise': surprise, 
-    #     'neutral': neutral
-    #  },
+    # Divide all emotion values by emotion count
+    if emotion_count > 0:
+        for key in video_emotions.keys():
+            video_emotions[key] /= emotion_count
     final_result_dict = {
         "gaze_percentage" : gaze_percentage,
         "face_emotion" : video_emotions,
-        "text_emotion" : text_emotion,
+        "text_emotion" : text_emotion[0][0],
         "transcription" : transcription,
         "text_sentiment" : text_sentiment
     }
     
-    # angry = 'total anger percentage' + str(angry) 
-    # disgust = 'total disgust percentage' + str(disgust) 
-    # fear = 'total fear percentage' + str(fear) 
-    # happy = 'total happy percentage' + str(happy) 
-    # sad = 'total sad percentage' + str(sad) 
-    # surprise = 'total surprise percentage' + str(surprise)
-    # neutral = 'total neutral percentage' + str(neutral) 
     print(f'total anger percentage = {angry}')
     print(f'total disgust percentage = {disgust}')
     print(f'total fear percentage = {fear}')