Cleanup, renames and clarification

Author: dtronmans

luxonis_ml/data/datasets/luxonis_dataset.py

@@ -1544,7 +1544,7 @@ def export(
             DatasetType.CLSDIR: ExporterSpec(
                 ClassificationDirectoryExporter, {}
             ),
-            DatasetType.FIFTYONE_CLS: ExporterSpec(
+            DatasetType.FIFTYONECLS: ExporterSpec(
                 FiftyOneClassificationExporter, {}
             ),
             DatasetType.SEGMASK: ExporterSpec(

luxonis_ml/data/parsers/classification_directory_parser.py

@@ -88,7 +88,6 @@ def from_split(self, class_dir: Path) -> ParserOutput:
         @return: Annotation generator, list of classes names, skeleton
             dictionary for keypoints and list of added images.
         """
-
         class_names = [d.name for d in class_dir.iterdir() if d.is_dir()]
 
         def generator() -> DatasetIterator:

luxonis_ml/data/parsers/coco_parser.py

@@ -77,7 +77,7 @@ def _is_coco_json(json_path: Path) -> bool:
         try:
             with open(json_path) as f:
                 data = json.load(f)
-            # COCO format requires these three fields
+            # Distinguish between COCO and FiftyOne classification as they both have labels.json files
             return (
                 isinstance(data, dict)
                 and "images" in data

luxonis_ml/data/parsers/luxonis_parser.py

@@ -53,7 +53,7 @@ class LuxonisParser(Generic[T]):
         DatasetType.YOLOV8BOUNDINGBOX: YOLOv8Parser,
         DatasetType.YOLOV8INSTANCESEGMENTATION: YOLOv8Parser,
         DatasetType.YOLOV8KEYPOINTS: YOLOv8Parser,
-        DatasetType.FIFTYONE_CLS: FiftyOneClassificationParser,
+        DatasetType.FIFTYONECLS: FiftyOneClassificationParser,
     }
 
     def __init__(

luxonis_ml/enums/enums.py

@@ -16,4 +16,4 @@ class DatasetType(str, Enum):
     YOLOV8BOUNDINGBOX = "yolov8"
     YOLOV8INSTANCESEGMENTATION = "yolov8instancesegmentation"
     YOLOV8KEYPOINTS = "yolov8keypoints"
-    FIFTYONE_CLS = "fiftyone-classification"
+    FIFTYONECLS = "fiftyone-classification"

tests/test_data/test_parse_export_equivalence.py

@@ -346,7 +346,7 @@ def collect_segmentation_multiset(prepared_ldf: PreparedLDF):
     "classification": [
         (DatasetType.NATIVE, collect_classification_multiset),
         (DatasetType.CLSDIR, collect_classification_multiset),
-        (DatasetType.FIFTYONE_CLS, collect_classification_multiset),
+        (DatasetType.FIFTYONECLS, collect_classification_multiset),
     ],
     "segmentation": [
         (DatasetType.SEGMASK, collect_segmentation_multiset),