Ensure shapely coordinate consistency across Python versions

Author: paulnoirel

libs/labelbox/src/labelbox/data/annotation_types/geometry/mask.py

@@ -37,6 +37,7 @@ class Mask(Geometry):
 
     @property
     def geometry(self) -> Dict[str, Tuple[int, int, int]]:
+        # Extract mask contours and build geometry
         mask = self.draw(color=1)
         contours, hierarchy = cv2.findContours(
             image=mask, mode=cv2.RETR_TREE, method=cv2.CHAIN_APPROX_NONE
@@ -62,7 +63,44 @@ def geometry(self) -> Dict[str, Tuple[int, int, int]]:
         if not holes.is_valid:
             holes = holes.buffer(0)
 
-        return external_polygons.difference(holes).__geo_interface__
+        # Get geometry result
+        result_geometry = external_polygons.difference(holes)
+
+        # Ensure consistent MultiPolygon format across shapely versions
+        if (
+            hasattr(result_geometry, "geom_type")
+            and result_geometry.geom_type == "Polygon"
+        ):
+            from shapely.geometry import MultiPolygon
+
+            result_geometry = MultiPolygon([result_geometry])
+
+        geometry_dict = result_geometry.__geo_interface__
+        return self._normalize_coordinates(geometry_dict)
+
+    def _normalize_coordinates(self, geometry_dict):
+        """Normalize coordinates to ensure consistent tuple format across shapely versions"""
+
+        def ensure_tuple_coords(obj):
+            """Recursively ensure coordinate pairs are tuples"""
+            if isinstance(obj, (list, tuple)):
+                # Check if this is a coordinate pair [x, y]
+                if len(obj) == 2 and all(
+                    isinstance(x, (int, float)) for x in obj
+                ):
+                    return (float(obj[0]), float(obj[1]))
+                else:
+                    # Recursively process nested structures, preserving list/tuple types
+                    if isinstance(obj, list):
+                        return [ensure_tuple_coords(item) for item in obj]
+                    else:
+                        return tuple(ensure_tuple_coords(item) for item in obj)
+            return obj
+
+        result = geometry_dict.copy()
+        if "coordinates" in result:
+            result["coordinates"] = ensure_tuple_coords(result["coordinates"])
+        return result
 
     def draw(
         self,