remove enum

encord-team · Jan 2, 2025 · 5607bee · 5607bee
1 parent 42ffce9
commit 5607bee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/encord/objects/coordinates.py b/encord/objects/coordinates.py
@@ -273,21 +273,6 @@ def to_dict(self) -> dict:
         return {str(idx): {"x": value.x, "y": value.y} for idx, value in enumerate(self.values)}
 
 
-class Visibility(CamelStrEnum):
-    """
-    An enumeration to represent the visibility state of an item.
-
-    Attributes:
-        VISIBLE: The item is visible within the frame.
-        INVISIBLE: The item is outside the frame and thus invisible.
-        OCCLUDED: The item is within the frame but occluded by something else.
-    """
-
-    VISIBLE = auto()
-    INVISIBLE = auto()
-    OCCLUDED = auto()
-
-
 class SkeletonCoordinate(BaseDTO):
     """
     Represents a coordinate for a skeleton structure in an image.
@@ -299,7 +284,9 @@ class SkeletonCoordinate(BaseDTO):
         color (Optional[str]): The color associated with the skeleton point.
         feature_hash (Optional[str]): A unique hash for the feature.
         value (Optional[str]): An optional value associated with the skeleton point.
-        visibility (Optional[Visibility]): The visibility state of the skeleton point.
+        visible (Optional[bool]): `True` if the skeleton point is visible within the frame (default).
+        invisible (Optional[bool]): `True` if the skeleton point is outside the frame and thus invisible.
+        occluded (Optional[bool]): `True` if the skeleton point is within the frame but occluded by something else.
     """
 
     x: float
@@ -308,7 +295,10 @@ class SkeletonCoordinate(BaseDTO):
     color: Optional[str] = None
     feature_hash: Optional[str] = None
     value: Optional[str] = None
-    visibility: Optional[Visibility] = None
+
+    visible: Optional[bool] = None
+    invisible: Optional[bool] = None
+    occluded: Optional[bool] = None
 
 
 class SkeletonCoordinates(BaseDTO):

diff --git a/tests/objects/data/skeleton_coordinates.py b/tests/objects/data/skeleton_coordinates.py
@@ -1,4 +1,4 @@
-from encord.objects.coordinates import SkeletonCoordinate, SkeletonCoordinates, Visibility
+from encord.objects.coordinates import SkeletonCoordinate, SkeletonCoordinates
 
 ontology = {
     "objects": [
@@ -106,7 +106,7 @@
                                 "color": "#000000",
                                 "value": "point_0",
                                 "featureHash": "1wthOoHe",
-                                "visibility": "visible",
+                                "visible": True,
                             },
                             "1": {
                                 "x": 0.4649,
@@ -115,7 +115,7 @@
                                 "color": "#000000",
                                 "value": "point_1",
                                 "featureHash": "KGp1oToz",
-                                "visibility": "occluded",
+                                "occluded": True,
                             },
                             "2": {
                                 "x": 0.2356,
@@ -124,7 +124,7 @@
                                 "color": "#000000",
                                 "value": "point_2",
                                 "featureHash": "OqR+F4dN",
-                                "visibility": "invisible",
+                                "invisible": True,
                             },
                         },
                         "manualAnnotation": True,
@@ -152,7 +152,7 @@
             color="#000000",
             feature_hash="1wthOoHe",
             value="point_0",
-            visibility=Visibility.VISIBLE,
+            visible=True,
         ),
         SkeletonCoordinate(
             x=0.4649,
@@ -161,7 +161,7 @@
             color="#000000",
             feature_hash="KGp1oToz",
             value="point_1",
-            visibility=Visibility.OCCLUDED,
+            occluded=True,
         ),
         SkeletonCoordinate(
             x=0.2356,
@@ -170,7 +170,7 @@
             color="#000000",
             feature_hash="OqR+F4dN",
             value="point_2",
-            visibility=Visibility.INVISIBLE,
+            invisible=True,
         ),
     ],
     name="Triangle",