diff --git a/giskard_vision/core/detectors/transformation_blurring_detector.py b/giskard_vision/core/detectors/blur_detector.py similarity index 82% rename from giskard_vision/core/detectors/transformation_blurring_detector.py rename to giskard_vision/core/detectors/blur_detector.py index c0e9a1d1..106df75c 100644 --- a/giskard_vision/core/detectors/transformation_blurring_detector.py +++ b/giskard_vision/core/detectors/blur_detector.py @@ -1,12 +1,13 @@ from giskard_vision.core.dataloaders.wrappers import BlurredDataLoader -from ...core.detectors.decorator import maybe_detector +from .decorator import maybe_detector from .perturbation import PerturbationBaseDetector @maybe_detector( - "blurring", + "blur", tags=[ + "blur", "vision", "robustness", "image_classification", @@ -14,7 +15,7 @@ "object_detection", ], ) -class TransformationBlurringDetector(PerturbationBaseDetector): +class BlurDetector(PerturbationBaseDetector): """ Detector that evaluates models performance on blurred images """ diff --git a/giskard_vision/core/detectors/transformation_color_detector.py b/giskard_vision/core/detectors/color_detector.py similarity index 77% rename from giskard_vision/core/detectors/transformation_color_detector.py rename to giskard_vision/core/detectors/color_detector.py index e694f724..169a64c2 100644 --- a/giskard_vision/core/detectors/transformation_color_detector.py +++ b/giskard_vision/core/detectors/color_detector.py @@ -1,21 +1,21 @@ from giskard_vision.core.dataloaders.wrappers import ColoredDataLoader -from ...core.detectors.decorator import maybe_detector +from .decorator import maybe_detector from .perturbation import PerturbationBaseDetector @maybe_detector( - "coloring", + "color", tags=[ "vision", "robustness", "image_classification", "landmark_detection", "object_detection", - "coloring", + "color", ], ) -class TransformationColorDetector(PerturbationBaseDetector): +class ColorDetector(PerturbationBaseDetector): """ Detector that evaluates models performance depending on images in grayscale """ diff --git a/giskard_vision/core/detectors/metadata_scan_detector.py b/giskard_vision/core/detectors/metadata_detector.py similarity index 99% rename from giskard_vision/core/detectors/metadata_scan_detector.py rename to giskard_vision/core/detectors/metadata_detector.py index 83fcab7e..17d26367 100644 --- a/giskard_vision/core/detectors/metadata_scan_detector.py +++ b/giskard_vision/core/detectors/metadata_detector.py @@ -16,7 +16,7 @@ class Surrogate: surrogate: Optional[Callable] = None -class MetaDataScanDetector(DetectorVisionBase): +class MetaDataDetector(DetectorVisionBase): """ Detector based on Giskard scan that looks for issues based on metadata diff --git a/giskard_vision/core/detectors/transformation_noise_detector.py b/giskard_vision/core/detectors/noise_detector.py similarity index 83% rename from giskard_vision/core/detectors/transformation_noise_detector.py rename to giskard_vision/core/detectors/noise_detector.py index 339567df..0480d234 100644 --- a/giskard_vision/core/detectors/transformation_noise_detector.py +++ b/giskard_vision/core/detectors/noise_detector.py @@ -1,6 +1,6 @@ from giskard_vision.core.dataloaders.wrappers import NoisyDataLoader -from ...core.detectors.decorator import maybe_detector +from .decorator import maybe_detector from .perturbation import PerturbationBaseDetector @@ -15,7 +15,7 @@ "noise", ], ) -class TransformationNoiseDetector(PerturbationBaseDetector): +class NoiseDetector(PerturbationBaseDetector): """ Detector that evaluates models performance on noisy images """ diff --git a/giskard_vision/image_classification/detectors/__init__.py b/giskard_vision/image_classification/detectors/__init__.py index a22cb31a..455a0286 100644 --- a/giskard_vision/image_classification/detectors/__init__.py +++ b/giskard_vision/image_classification/detectors/__init__.py @@ -1,5 +1,5 @@ -from .metadata_detector import MetaDataScanDetectorClassification +from .metadata_detector import MetaDataDetectorClassification __all__ = [ - "MetaDataScanDetectorClassification", + "MetaDataDetectorClassification", ] diff --git a/giskard_vision/image_classification/detectors/metadata_detector.py b/giskard_vision/image_classification/detectors/metadata_detector.py index 4e567b24..697620cb 100644 --- a/giskard_vision/image_classification/detectors/metadata_detector.py +++ b/giskard_vision/image_classification/detectors/metadata_detector.py @@ -1,9 +1,9 @@ -from giskard_vision.core.detectors.metadata_scan_detector import MetaDataScanDetector +from giskard_vision.core.detectors.metadata_detector import MetaDataDetector from ...core.detectors.decorator import maybe_detector from .specs import DetectorSpecs @maybe_detector("metadata_classification", tags=["vision", "image_classification", "metadata"]) -class MetaDataScanDetectorClassification(DetectorSpecs, MetaDataScanDetector): +class MetaDataDetectorClassification(DetectorSpecs, MetaDataDetector): pass diff --git a/giskard_vision/landmark_detection/detectors/__init__.py b/giskard_vision/landmark_detection/detectors/__init__.py index d90f809e..f2dec913 100644 --- a/giskard_vision/landmark_detection/detectors/__init__.py +++ b/giskard_vision/landmark_detection/detectors/__init__.py @@ -1,9 +1,9 @@ -from .cropping_detector import CroppingDetectorLandmark -from .metadata_detector import MetaDataScanDetectorLandmark -from .transformation_resize_detector import TransformationResizeDetectorLandmark +from .crop_detector import CropDetectorLandmarkDetection +from .metadata_detector import MetaDataDetectorLandmarkDetection +from .resize_detector import TransformationResizeDetectorLandmarkDetection __all__ = [ - "CroppingDetectorLandmark", - "TransformationResizeDetectorLandmark", - "MetaDataScanDetectorLandmark", + "CropDetectorLandmarkDetection", + "TransformationResizeDetectorLandmarkDetection", + "MetaDataDetectorLandmarkDetection", ] diff --git a/giskard_vision/landmark_detection/detectors/cropping_detector.py b/giskard_vision/landmark_detection/detectors/crop_detector.py similarity index 77% rename from giskard_vision/landmark_detection/detectors/cropping_detector.py rename to giskard_vision/landmark_detection/detectors/crop_detector.py index 8d51ef3e..c15a1809 100644 --- a/giskard_vision/landmark_detection/detectors/cropping_detector.py +++ b/giskard_vision/landmark_detection/detectors/crop_detector.py @@ -6,8 +6,8 @@ from .base import LandmarkDetectionBaseDetector -@maybe_detector("cropping_landmark", tags=["vision", "face", "landmark_detection", "transformed", "cropped"]) -class CroppingDetectorLandmark(LandmarkDetectionBaseDetector): +@maybe_detector("crop_landmark_detection", tags=["vision", "face", "landmark_detection", "transformed", "crop"]) +class CropDetectorLandmarkDetection(LandmarkDetectionBaseDetector): """ Detector that evaluates models performance relative to a facial part """ diff --git a/giskard_vision/landmark_detection/detectors/metadata_detector.py b/giskard_vision/landmark_detection/detectors/metadata_detector.py index 47ff13fa..3e9f82dc 100644 --- a/giskard_vision/landmark_detection/detectors/metadata_detector.py +++ b/giskard_vision/landmark_detection/detectors/metadata_detector.py @@ -1,4 +1,4 @@ -from giskard_vision.core.detectors.metadata_scan_detector import MetaDataScanDetector +from giskard_vision.core.detectors.metadata_detector import MetaDataDetector from giskard_vision.landmark_detection.detectors.surrogate_functions import ( SurrogateNME, SurrogateVolumeConvexHull, @@ -8,6 +8,6 @@ from .specs import DetectorSpecs -@maybe_detector("metadata_landmark", tags=["vision", "face", "landmark_detection", "metadata"]) -class MetaDataScanDetectorLandmark(DetectorSpecs, MetaDataScanDetector): +@maybe_detector("metadata_landmark_detection", tags=["vision", "face", "landmark_detection", "metadata"]) +class MetaDataDetectorLandmarkDetection(DetectorSpecs, MetaDataDetector): surrogates = [SurrogateVolumeConvexHull, SurrogateNME] diff --git a/giskard_vision/landmark_detection/detectors/transformation_resize_detector.py b/giskard_vision/landmark_detection/detectors/resize_detector.py similarity index 73% rename from giskard_vision/landmark_detection/detectors/transformation_resize_detector.py rename to giskard_vision/landmark_detection/detectors/resize_detector.py index 0123cfb7..3b0f2de5 100644 --- a/giskard_vision/landmark_detection/detectors/transformation_resize_detector.py +++ b/giskard_vision/landmark_detection/detectors/resize_detector.py @@ -5,8 +5,8 @@ from .base import LandmarkDetectionBaseDetector -@maybe_detector("resize_landmark", tags=["vision", "face", "landmark_detection", "transformed", "resized"]) -class TransformationResizeDetectorLandmark(LandmarkDetectionBaseDetector): +@maybe_detector("resize_landmark_detection", tags=["vision", "face", "landmark_detection", "transformed", "resize"]) +class TransformationResizeDetectorLandmarkDetection(LandmarkDetectionBaseDetector): """ Detector that evaluates models performance on resized images """ diff --git a/giskard_vision/landmark_detection/detectors/surrogate_functions.py b/giskard_vision/landmark_detection/detectors/surrogate_functions.py index 78228283..95d84dbf 100644 --- a/giskard_vision/landmark_detection/detectors/surrogate_functions.py +++ b/giskard_vision/landmark_detection/detectors/surrogate_functions.py @@ -1,7 +1,7 @@ import numpy as np from scipy.spatial import ConvexHull -from giskard_vision.core.detectors.metadata_scan_detector import Surrogate +from giskard_vision.core.detectors.metadata_detector import Surrogate from giskard_vision.landmark_detection.tests.performance import NMEMean from giskard_vision.landmark_detection.types import PredictionResult diff --git a/giskard_vision/object_detection/detectors/__init__.py b/giskard_vision/object_detection/detectors/__init__.py index 839efc64..f5605827 100644 --- a/giskard_vision/object_detection/detectors/__init__.py +++ b/giskard_vision/object_detection/detectors/__init__.py @@ -1,5 +1,5 @@ -from .metadata_detector import MetaDataScanDetectorObjectDetection +from .metadata_detector import MetaDataDetectorObjectDetection __all__ = [ - "MetaDataScanDetectorObjectDetection", + "MetaDataDetectorObjectDetection", ] diff --git a/giskard_vision/object_detection/detectors/metadata_detector.py b/giskard_vision/object_detection/detectors/metadata_detector.py index b1b740f2..6a5d8201 100644 --- a/giskard_vision/object_detection/detectors/metadata_detector.py +++ b/giskard_vision/object_detection/detectors/metadata_detector.py @@ -1,4 +1,4 @@ -from giskard_vision.core.detectors.metadata_scan_detector import MetaDataScanDetector +from giskard_vision.core.detectors.metadata_detector import MetaDataDetector from giskard_vision.object_detection.detectors.surrogate_functions import ( SurrogateArea, SurrogateAspectRatio, @@ -21,7 +21,7 @@ @maybe_detector("metadata_object_detection", tags=["vision", "object_detection", "metadata"]) -class MetaDataScanDetectorObjectDetection(DetectorSpecs, MetaDataScanDetector): +class MetaDataDetectorObjectDetection(DetectorSpecs, MetaDataDetector): surrogates = [ SurrogateCenterMassX, SurrogateCenterMassY, diff --git a/giskard_vision/object_detection/detectors/surrogate_functions.py b/giskard_vision/object_detection/detectors/surrogate_functions.py index 69732dab..71c5efbf 100644 --- a/giskard_vision/object_detection/detectors/surrogate_functions.py +++ b/giskard_vision/object_detection/detectors/surrogate_functions.py @@ -1,6 +1,6 @@ import numpy as np -from giskard_vision.core.detectors.metadata_scan_detector import Surrogate +from giskard_vision.core.detectors.metadata_detector import Surrogate @staticmethod diff --git a/tests/landmark_detection/detectors/test_detectors.py b/tests/landmark_detection/detectors/test_detectors.py index 1e893809..434f817c 100644 --- a/tests/landmark_detection/detectors/test_detectors.py +++ b/tests/landmark_detection/detectors/test_detectors.py @@ -1,19 +1,13 @@ from giskard.scanner.issues import Issue, IssueLevel from pytest import mark -from giskard_vision.core.detectors.transformation_blurring_detector import ( - TransformationBlurringDetector, -) -from giskard_vision.core.detectors.transformation_color_detector import ( - TransformationColorDetector, -) -from giskard_vision.core.detectors.transformation_noise_detector import ( - TransformationNoiseDetector, -) +from giskard_vision.core.detectors.blur_detector import BlurDetector +from giskard_vision.core.detectors.color_detector import ColorDetector +from giskard_vision.core.detectors.noise_detector import NoiseDetector from giskard_vision.landmark_detection.detectors import ( - CroppingDetectorLandmark, - MetaDataScanDetectorLandmark, - TransformationResizeDetectorLandmark, + CropDetectorLandmarkDetection, + MetaDataDetectorLandmarkDetection, + TransformationResizeDetectorLandmarkDetection, ) from giskard_vision.landmark_detection.detectors.base import ScanResult @@ -21,11 +15,11 @@ @mark.parametrize( "detector", [ - CroppingDetectorLandmark, - TransformationBlurringDetector, - TransformationColorDetector, - TransformationNoiseDetector, - TransformationResizeDetectorLandmark, + CropDetectorLandmarkDetection, + BlurDetector, + ColorDetector, + NoiseDetector, + TransformationResizeDetectorLandmarkDetection, ], ) def test_base_detector(opencv_model, dataset_300w, detector): @@ -43,10 +37,10 @@ def test_base_detector(opencv_model, dataset_300w, detector): def test_meta_detector(opencv_model, dataset_ffhq): - results = MetaDataScanDetectorLandmark().get_results(opencv_model, dataset_ffhq) + results = MetaDataDetectorLandmarkDetection().get_results(opencv_model, dataset_ffhq) assert isinstance(results, list) - issues = MetaDataScanDetectorLandmark().get_issues( + issues = MetaDataDetectorLandmarkDetection().get_issues( opencv_model, dataset_ffhq, results, (IssueLevel.MINOR, IssueLevel.MEDIUM, IssueLevel.MAJOR) ) assert isinstance(issues, list)