Update app.py

app.py

@@ -10,9 +10,9 @@ mp_drawing = mp.solutions.drawing_utils
 
 # Function to calculate the angle between three points
 def calculate_angle(a, b, c):
-    a = np.array(a)  # First point
-    b = np.array(b)  # Mid point
-    c = np.array(c)  # End point
+    a = np.array([a.x, a.y])  # First point
+    b = np.array([b.x, b.y])  # Mid point
+    c = np.array([c.x, c.y])  # End point
     
     radians = np.arctan2(c[1] - b[1], c[0] - b[0]) - np.arctan2(a[1] - b[1], a[0] - b[0])
     angle = np.abs(radians * 180.0 / np.pi)
@@ -29,34 +29,34 @@ def classify_pose(landmarks, output_image, display=False):
 
     # Calculate the required angles
     left_elbow_angle = calculate_angle(
-        [landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value].x, landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value].y],
-        [landmarks[mp_pose.PoseLandmark.LEFT_ELBOW.value].x, landmarks[mp_pose.PoseLandmark.LEFT_ELBOW.value].y],
-        [landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].x, landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].y])
+        landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value],
+        landmarks[mp_pose.PoseLandmark.LEFT_ELBOW.value],
+        landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value])
 
     right_elbow_angle = calculate_angle(
-        [landmarks[mp_pose.PoseLandmark.RIGHT_SHOULDER.value].x, landmarks[mp_pose.PoseLandmark.RIGHT_SHOULDER.value].y],
-        [landmarks[mp_pose.PoseLandmark.RIGHT_ELBOW.value].x, landmarks[mp_pose.PoseLandmark.RIGHT_ELBOW.value].y],
-        [landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].x, landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].y])
+        landmarks[mp_pose.PoseLandmark.RIGHT_SHOULDER.value],
+        landmarks[mp_pose.PoseLandmark.RIGHT_ELBOW.value],
+        landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value])
 
     left_shoulder_angle = calculate_angle(
-        [landmarks[mp_pose.PoseLandmark.LEFT_ELBOW.value].x, landmarks[mp_pose.PoseLandmark.LEFT_ELBOW.value].y],
-        [landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value].x, landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value].y],
-        [landmarks[mp_pose.PoseLandmark.LEFT_HIP.value].x, landmarks[mp_pose.PoseLandmark.LEFT_HIP.value].y])
+        landmarks[mp_pose.PoseLandmark.LEFT_ELBOW.value],
+        landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value],
+        landmarks[mp_pose.PoseLandmark.LEFT_HIP.value])
 
     right_shoulder_angle = calculate_angle(
-        [landmarks[mp_pose.PoseLandmark.RIGHT_HIP.value].x, landmarks[mp_pose.PoseLandmark.RIGHT_HIP.value].y],
-        [landmarks[mp_pose.PoseLandmark.RIGHT_SHOULDER.value].x, landmarks[mp_pose.PoseLandmark.RIGHT_SHOULDER.value].y],
-        [landmarks[mp_pose.PoseLandmark.RIGHT_ELBOW.value].x, landmarks[mp_pose.PoseLandmark.RIGHT_ELBOW.value].y])
+        landmarks[mp_pose.PoseLandmark.RIGHT_HIP.value],
+        landmarks[mp_pose.PoseLandmark.RIGHT_SHOULDER.value],
+        landmarks[mp_pose.PoseLandmark.RIGHT_ELBOW.value])
 
     left_knee_angle = calculate_angle(
-        [landmarks[mp_pose.PoseLandmark.LEFT_HIP.value].x, landmarks[mp_pose.PoseLandmark.LEFT_HIP.value].y],
-        [landmarks[mp_pose.PoseLandmark.LEFT_KNEE.value].x, landmarks[mp_pose.PoseLandmark.LEFT_KNEE.value].y],
-        [landmarks[mp_pose.PoseLandmark.LEFT_ANKLE.value].x, landmarks[mp_pose.PoseLandmark.LEFT_ANKLE.value].y])
+        landmarks[mp_pose.PoseLandmark.LEFT_HIP.value],
+        landmarks[mp_pose.PoseLandmark.LEFT_KNEE.value],
+        landmarks[mp_pose.PoseLandmark.LEFT_ANKLE.value])
 
     right_knee_angle = calculate_angle(
-        [landmarks[mp_pose.PoseLandmark.RIGHT_HIP.value].x, landmarks[mp_pose.PoseLandmark.RIGHT_HIP.value].y],
-        [landmarks[mp_pose.PoseLandmark.RIGHT_KNEE.value].x, landmarks[mp_pose.PoseLandmark.RIGHT_KNEE.value].y],
-        [landmarks[mp_pose.PoseLandmark.RIGHT_ANKLE.value].x, landmarks[mp_pose.PoseLandmark.RIGHT_ANKLE.value].y])
+        landmarks[mp_pose.PoseLandmark.RIGHT_HIP.value],
+        landmarks[mp_pose.PoseLandmark.RIGHT_KNEE.value],
+        landmarks[mp_pose.PoseLandmark.RIGHT_ANKLE.value])
 
     # Check for Five-Pointed Star Pose
     if abs(landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].y - landmarks[mp_pose.PoseLandmark.LEFT_HIP.value].y) < 0.1 and \
@@ -98,16 +98,15 @@ def classify_pose(landmarks, output_image, display=False):
        abs(landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].x - landmarks[mp_pose.PoseLandmark.RIGHT_ANKLE.value].x) < 0.05:
         label = "Hands Under Feet Pose"
     
-    return label
+    return output_image, label
 
 def detect_and_classify_pose(input_image):
-    frame = cv2.cvtColor(input_image, cv2.COLOR_BGR2RGB)
-    results = pose.process(frame)
+    results = pose.process(input_image)
     pose_classification = "No pose detected"
     if results.pose_landmarks:
-        mp_drawing.draw_landmarks(frame, results.pose_landmarks, mp_pose.POSE_CONNECTIONS)
-        pose_classification = classify_pose(results.pose_landmarks.landmark, frame)
-    return frame, pose_classification
+        mp_drawing.draw_landmarks(input_image, results.pose_landmarks, mp_pose.POSE_CONNECTIONS)
+        input_image, pose_classification = classify_pose(results.pose_landmarks.landmark, input_image)
+    return input_image, pose_classification
 
 iface = gr.Interface(
     fn=detect_and_classify_pose,