fix

src/mediapipe_pose/get_landmarks_and_connections.py

@@ -1,9 +1,44 @@
 from typing import Mapping, Tuple
-from mediapipe.python.solutions.hands import HandLandmark
-from mediapipe.python.solutions.drawing_utils import DrawingSpec
+from dataclasses import dataclass
+from enum import IntEnum
 import yaml
 import os
 
+# Try to import from mediapipe, fall back to local definitions
+try:
+    from mediapipe.python.solutions.hands import HandLandmark
+    from mediapipe.python.solutions.drawing_utils import DrawingSpec
+except ImportError:
+    # Fallback HandLandmark enum for environments without mediapipe.python.solutions
+    class HandLandmark(IntEnum):
+        WRIST = 0
+        THUMB_CMC = 1
+        THUMB_MCP = 2
+        THUMB_IP = 3
+        THUMB_TIP = 4
+        INDEX_FINGER_MCP = 5
+        INDEX_FINGER_PIP = 6
+        INDEX_FINGER_DIP = 7
+        INDEX_FINGER_TIP = 8
+        MIDDLE_FINGER_MCP = 9
+        MIDDLE_FINGER_PIP = 10
+        MIDDLE_FINGER_DIP = 11
+        MIDDLE_FINGER_TIP = 12
+        RING_FINGER_MCP = 13
+        RING_FINGER_PIP = 14
+        RING_FINGER_DIP = 15
+        RING_FINGER_TIP = 16
+        PINKY_MCP = 17
+        PINKY_PIP = 18
+        PINKY_DIP = 19
+        PINKY_TIP = 20
+    
+    @dataclass
+    class DrawingSpec:
+        color: tuple = (0, 0, 255)
+        thickness: int = 2
+        circle_radius: int = 2
+
 
 # Load hand drawing config from config.yaml
 def load_hand_drawing_config():

src/mediapipe_pose/utils.py

@@ -3,15 +3,26 @@ try:
     from mediapipe.framework.formats import landmark_pb2
 except ImportError:
     # Fallback for environments where mediapipe.framework is not available
-    import mediapipe as mp
-    landmark_pb2 = mp.solutions.hands.HandLandmark.__class__.__module__
-    # Use mp.solutions protobuf types instead
-    from google.protobuf import descriptor_pb2
-    class _LandmarkListProxy:
+    class _Landmark:
+        """Proxy class that wraps a single landmark."""
+        def __init__(self, x=0, y=0, z=0, visibility=1.0, presence=1.0):
+            self.x = x
+            self.y = y
+            self.z = z
+            self.visibility = visibility
+            self.presence = presence
+        
+        def HasField(self, field_name):
+            return hasattr(self, field_name)
+    
+    class _NormalizedLandmarkList:
         """Proxy class that wraps mediapipe landmark data."""
         def __init__(self, landmarks=None):
             self.landmark = landmarks if landmarks else []
-    landmark_pb2 = type('landmark_pb2', (), {'NormalizedLandmarkList': _LandmarkListProxy})()
+    
+    class landmark_pb2:
+        NormalizedLandmarkList = _NormalizedLandmarkList
+        NormalizedLandmark = _Landmark
 
 try:
     from mediapipe.python.solutions.drawing_utils import (

src/utils.py

@@ -1,4 +1,3 @@
-import mediapipe as mp
 import os
 from moviepy import ImageSequenceClip
 from natsort import natsorted
@@ -20,6 +19,24 @@ from transformers import (
 )
 from src.body_pose.vertex_annotator_heart import VertexAnnotatorHeart
 
+# Import mediapipe with fallback
+try:
+    import mediapipe as mp
+    mp_hands = mp.solutions.hands
+    HAND_CONNECTIONS = mp_hands.HAND_CONNECTIONS
+except (ImportError, AttributeError):
+    # Fallback for newer mediapipe versions without solutions module
+    mp_hands = None
+    # Define hand connections manually
+    HAND_CONNECTIONS = frozenset([
+        (0, 1), (1, 2), (2, 3), (3, 4),  # Thumb
+        (0, 5), (5, 6), (6, 7), (7, 8),  # Index
+        (0, 9), (9, 10), (10, 11), (11, 12),  # Middle
+        (0, 13), (13, 14), (14, 15), (15, 16),  # Ring
+        (0, 17), (17, 18), (18, 19), (19, 20),  # Pinky
+        (5, 9), (9, 13), (13, 17),  # Palm
+    ])
+
 
 def create_video_from_images(folder_path, output_video_file, fps):
     """
@@ -67,7 +84,8 @@ def create_video_from_images(folder_path, output_video_file, fps):
 
 
 def process_hand_pose_estimation(path_video, output_folder, drawing_settings):
-    mp_hands = mp.solutions.hands
+    if mp_hands is None:
+        raise RuntimeError("Hand pose estimation requires mediapipe with solutions module. Please install mediapipe<0.10.8")
 
     landmark_annotations = get_default_hand_landmark_style(drawing_settings.get("color_landmarks"), drawing_settings.get("radius"))
     connections_annotations = get_default_hand_connection_style(drawing_settings.get("color_connections"), drawing_settings.get("thickness"))
@@ -98,7 +116,7 @@ def process_hand_pose_estimation(path_video, output_folder, drawing_settings):
                     draw_landmarks(
                         frame,
                         lm,
-                        mp_hands.HAND_CONNECTIONS,
+                        HAND_CONNECTIONS,
                         landmark_drawing_spec=landmark_annotations,
                         connection_drawing_spec=connections_annotations,
                     )