Merge branch 'main' into feat/all-exporters

Author: dtronmans

luxonis_ml/data/augmentations/albumentations_engine.py

@@ -241,36 +241,23 @@ def apply_to_array(
                 ...
     """
 
-    def _should_skip_augmentation(
+    def _check_augmentation_warnings(
         self, config_item: dict[str, Any], available_target_types: set
-    ) -> bool:
-        skip_rules = {
-            "keypoints": [
-                "HorizontalFlip",
-                "VerticalFlip",
-                "Flip",
-            ],
-        }
+    ) -> None:
         augmentation_name = config_item["name"]
-        skipped_for = [
-            target_type
-            for target_type, skip_list in skip_rules.items()
-            if target_type in available_target_types
-            and augmentation_name in skip_list
-        ]
-        if skipped_for:
-            extra_msg = ""
-            if "keypoints" in skipped_for and augmentation_name in [
-                "HorizontalFlip",
-                "VerticalFlip",
-                "Flip",
-            ]:
-                extra_msg = " For keypoints, please use 'HorizontalSymetricKeypointsFlip' or 'VerticalSymetricKeypointsFlip'."
+
+        if "keypoints" in available_target_types and augmentation_name in [
+            "HorizontalFlip",
+            "VerticalFlip",
+            "Transpose",
+        ]:
             logger.warning(
-                f"Skipping augmentation '{augmentation_name}' due to known issues for {skipped_for} target types. {extra_msg}"
+                f"Using '{augmentation_name}' with keypoints."
+                "If your dataset contains symmetric keypoints (e.g. left/right arms),"
+                "you should use our custom HorizontalSymetricKeypointsFlip,"
+                "VerticalSymetricKeypointsFlip, or TransposeSymmetricKeypoints"
+                "to ensure keypoints are correctly reordered."
             )
-            return True
-        return False
 
     @override
     def __init__(
@@ -372,13 +359,10 @@ def __init__(
         available_target_types = set(self.targets.values())
 
         for config_item in config:
-            if self._should_skip_augmentation(
+            self._check_augmentation_warnings(
                 config_item, available_target_types
-            ):
-                continue
-
+            )
             cfg = AlbumentationConfigItem(**config_item)  # type: ignore
-
             transform = self.create_transformation(cfg)
 
             if cfg.use_for_resizing:
@@ -431,9 +415,11 @@ def get_params(is_custom: bool = False) -> dict[str, Any]:
                 "keypoint_params": A.KeypointParams(
                     format="xy", remove_invisible=False
                 ),
-                "additional_targets": self.targets
-                if is_custom
-                else targets_without_instance_mask,
+                "additional_targets": (
+                    self.targets
+                    if is_custom
+                    else targets_without_instance_mask
+                ),
                 "seed": seed,
             }
 

luxonis_ml/data/datasets/annotation.py

@@ -23,8 +23,7 @@
 from typing_extensions import Self, override
 
 from luxonis_ml.data.utils.parquet import ParquetRecord
-from luxonis_ml.typing import PathType, check_type
-from luxonis_ml.utils import BaseModelExtraForbid
+from luxonis_ml.typing import BaseModelExtraForbid, PathType, check_type
 from luxonis_ml.utils.logging import log_once
 
 KeypointVisibility: TypeAlias = Literal[0, 1, 2]

luxonis_ml/data/datasets/metadata.py

@@ -4,7 +4,7 @@
 from typing_extensions import TypedDict
 
 from luxonis_ml.data.utils.constants import LDF_VERSION
-from luxonis_ml.utils.pydantic_utils import BaseModelExtraForbid
+from luxonis_ml.typing import BaseModelExtraForbid
 
 from .source import LuxonisSource
 

luxonis_ml/data/datasets/source.py

@@ -3,7 +3,7 @@
 from pydantic import Field, field_validator
 
 from luxonis_ml.data.utils import ImageType, MediaType
-from luxonis_ml.utils import BaseModelExtraForbid
+from luxonis_ml.typing import BaseModelExtraForbid
 
 
 class LuxonisComponent(BaseModelExtraForbid):

luxonis_ml/data/parsers/classification_directory_parser.py

@@ -65,7 +65,7 @@ def from_split(self, class_dir: Path) -> ParserOutput:
 
         def generator() -> DatasetIterator:
             for class_name in class_names:
-                for img_path in (class_dir / class_name).iterdir():
+                for img_path in self._list_images(class_dir / class_name):
                     yield {
                         "file": str(img_path.absolute().resolve()),
                         "annotation": {"class": class_name},

luxonis_ml/nn_archive/config.py

@@ -2,7 +2,7 @@
 
 from pydantic import Field, field_validator
 
-from luxonis_ml.utils import BaseModelExtraForbid
+from luxonis_ml.typing import BaseModelExtraForbid
 
 from .model import Model
 

luxonis_ml/nn_archive/config_building_blocks/base_models/input.py

@@ -9,7 +9,7 @@
     InputType,
 )
 from luxonis_ml.nn_archive.utils import infer_layout
-from luxonis_ml.utils import BaseModelExtraForbid
+from luxonis_ml.typing import BaseModelExtraForbid
 
 
 class PreprocessingBlock(BaseModelExtraForbid):

luxonis_ml/nn_archive/config_building_blocks/base_models/output.py

@@ -5,7 +5,7 @@
 
 from luxonis_ml.nn_archive.config_building_blocks.enums import DataType
 from luxonis_ml.nn_archive.utils import infer_layout
-from luxonis_ml.utils import BaseModelExtraForbid
+from luxonis_ml.typing import BaseModelExtraForbid
 
 
 class Output(BaseModelExtraForbid):

luxonis_ml/nn_archive/model.py

@@ -1,6 +1,6 @@
 from pydantic import Field
 
-from luxonis_ml.utils import BaseModelExtraForbid
+from luxonis_ml.typing import BaseModelExtraForbid
 
 from .config_building_blocks import HeadType, Input, Metadata, Output
 

luxonis_ml/typing.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING, Any, Literal, TypeAlias, TypeGuard, TypeVar
 
 import typeguard
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 # When used without installed dependencies
 if TYPE_CHECKING:  # pragma: no cover
@@ -83,7 +83,13 @@
 """A keyword dictionary of arbitrary parameters."""
 
 
-class ConfigItem(BaseModel):
+class BaseModelExtraForbid(BaseModel):
+    """BaseModel with extra fields forbidden."""
+
+    model_config: ConfigDict = ConfigDict(extra="forbid")
+
+
+class ConfigItem(BaseModelExtraForbid):
     """Configuration schema for dynamic object instantiation. Typically
     used to instantiate objects stored in registries.