mvp

ashwinvaidya17 · ashwinvaidya17 · commit d89e92797aa6 · 2024-12-13T11:43:04.000+01:00
Signed-off-by: Ashwin Vaidya &lt;ashwinnitinvaidya@gmail.com&gt;
diff --git a/model_api/python/model_api/models/__init__.py b/model_api/python/model_api/models/__init__.py
@@ -11,7 +11,7 @@
 from .instance_segmentation import MaskRCNNModel
 from .keypoint_detection import KeypointDetectionModel, TopDownKeypointDetectionPipeline
 from .model import Model
-from .result_types import (
+from .result import (
     AnomalyResult,
     ClassificationResult,
     Contour,
diff --git a/model_api/python/model_api/models/action_classification.py b/model_api/python/model_api/models/action_classification.py
@@ -12,7 +12,7 @@
 from model_api.adapters.utils import RESIZE_TYPES, InputTransform
 
 from .model import Model
-from .result_types import ClassificationResult
+from .result import ClassificationResult
 from .types import BooleanValue, ListValue, NumericalValue, StringValue
 from .utils import load_labels
 
diff --git a/model_api/python/model_api/models/anomaly.py b/model_api/python/model_api/models/anomaly.py
@@ -15,7 +15,7 @@
 import numpy as np
 
 from model_api.models.image_model import ImageModel
-from model_api.models.result_types import AnomalyResult
+from model_api.models.result import AnomalyResult
 from model_api.models.types import ListValue, NumericalValue, StringValue
 
 if TYPE_CHECKING:
diff --git a/model_api/python/model_api/models/classification.py b/model_api/python/model_api/models/classification.py
@@ -17,7 +17,7 @@
 from openvino.runtime import opset10 as opset
 
 from model_api.models.image_model import ImageModel
-from model_api.models.result_types import ClassificationResult
+from model_api.models.result import ClassificationResult
 from model_api.models.types import BooleanValue, ListValue, NumericalValue, StringValue
 from model_api.models.utils import softmax
 
diff --git a/model_api/python/model_api/models/detection_model.py b/model_api/python/model_api/models/detection_model.py
@@ -4,7 +4,7 @@
 #
 
 from .image_model import ImageModel
-from .result_types import Detection
+from .result import Detection
 from .types import ListValue, NumericalValue, StringValue
 from .utils import load_labels
 
diff --git a/model_api/python/model_api/models/instance_segmentation.py b/model_api/python/model_api/models/instance_segmentation.py
@@ -9,7 +9,7 @@
 from model_api.adapters.inference_adapter import InferenceAdapter
 
 from .image_model import ImageModel
-from .result_types import InstanceSegmentationResult, SegmentedObject
+from .result import InstanceSegmentationResult, SegmentedObject
 from .types import BooleanValue, ListValue, NumericalValue, StringValue
 from .utils import load_labels
 
diff --git a/model_api/python/model_api/models/keypoint_detection.py b/model_api/python/model_api/models/keypoint_detection.py
@@ -10,7 +10,7 @@
 import numpy as np
 
 from .image_model import ImageModel
-from .result_types import DetectedKeypoints, Detection
+from .result import DetectedKeypoints, Detection
 from .types import ListValue
 
 
diff --git a/model_api/python/model_api/models/result/__init__.py b/model_api/python/model_api/models/result/__init__.py
@@ -0,0 +1,36 @@
+"""Model results."""
+
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+from .types import (
+    AnomalyResult,
+    ClassificationResult,
+    Contour,
+    DetectedKeypoints,
+    Detection,
+    DetectionResult,
+    ImageResultWithSoftPrediction,
+    InstanceSegmentationResult,
+    PredictedMask,
+    SegmentedObject,
+    SegmentedObjectWithRects,
+    VisualPromptingResult,
+    ZSLVisualPromptingResult,
+)
+
+__all__ = [
+    "AnomalyResult",
+    "ClassificationResult",
+    "Contour",
+    "Detection",
+    "DetectionResult",
+    "DetectedKeypoints",
+    "SegmentedObject",
+    "SegmentedObjectWithRects",
+    "ImageResultWithSoftPrediction",
+    "InstanceSegmentationResult",
+    "PredictedMask",
+    "VisualPromptingResult",
+    "ZSLVisualPromptingResult",
+]
diff --git a/model_api/python/model_api/models/result/media/__init__.py b/model_api/python/model_api/models/result/media/__init__.py
@@ -0,0 +1,10 @@
+"""Result visualization media."""
+
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+from .anomaly import AnomalyMedia
+
+__all__ = [
+    "AnomalyMedia",
+]
diff --git a/model_api/python/model_api/models/result/media/anomaly.py b/model_api/python/model_api/models/result/media/anomaly.py
@@ -0,0 +1,23 @@
+"""Anomaly result media."""
+
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+import cv2
+
+from model_api.models.result.types import AnomalyResult
+from model_api.visualizer.layout import Flatten, Layout
+from model_api.visualizer.media import Media
+from model_api.visualizer.primitives import Overlay
+
+
+class AnomalyMedia(Media):
+    """Anomaly result media."""
+
+    def __init__(self, result: AnomalyResult) -> None:
+        anomaly_map = cv2.applyColorMap(result.anomaly_map, cv2.COLORMAP_JET)
+        super().__init__(Overlay(anomaly_map))
+
+    @property
+    def default_layout(self) -> Layout:
+        return Flatten(Overlay)
diff --git a/model_api/python/model_api/models/result/types/__init__.py b/model_api/python/model_api/models/result/types/__init__.py
@@ -1,4 +1,4 @@
-"""Result types."""
+"""Result containers."""
 
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
diff --git a/model_api/python/model_api/models/result/types/anomaly.py b/model_api/python/model_api/models/result/types/anomaly.py
@@ -9,7 +9,6 @@
 import numpy as np
 
 from model_api.visualizer.layout import Flatten, Layout
-from model_api.visualizer.primitives import BoundingBoxes, Label, Overlay, Polygon
 
 from .base import Result
 
@@ -47,22 +46,3 @@ def __str__(self) -> str:
             f"pred_label:{self.pred_label};"
             f"pred_mask min:{pred_mask_min} max:{pred_mask_max};"
         )
-
-    def _register_primitives(self) -> None:
-        """Converts the result to primitives."""
-        anomaly_map = cv2.applyColorMap(self.anomaly_map, cv2.COLORMAP_JET)
-        self._add_primitive(Overlay(anomaly_map))
-        for box in self.pred_boxes:
-            self._add_primitive(BoundingBoxes(*box))
-        if self.pred_label is not None:
-            self._add_primitive(Label(self.pred_label, bg_color="red" if self.pred_label == "Anomaly" else "green"))
-        self._add_primitive(Label(f"Score: {self.pred_score}"))
-        self._add_primitive(Polygon(mask=self.pred_mask))
-
-    @property
-    def default_layout(self) -> Layout:
-        return Flatten(
-            Overlay,
-            Polygon,
-            Label,
-        )
diff --git a/model_api/python/model_api/models/result/types/base.py b/model_api/python/model_api/models/result/types/base.py
@@ -5,8 +5,6 @@
 
 from abc import ABC
 
-from model_api.visualizer.visualize_mixin import VisualizeMixin
 
-
-class Result(VisualizeMixin, ABC):
+class Result(ABC):
     """Base result type."""
diff --git a/model_api/python/model_api/models/result/types/classification.py b/model_api/python/model_api/models/result/types/classification.py
@@ -7,8 +7,6 @@
 
 from typing import TYPE_CHECKING
 
-from model_api.visualizer.primitives import Label
-
 from .base import Result
 from .utils import array_shape_to_str
 
@@ -38,8 +36,3 @@ def __str__(self) -> str:
             f"{labels}, {array_shape_to_str(self.saliency_map)}, {array_shape_to_str(self.feature_vector)}, "
             f"{array_shape_to_str(self.raw_scores)}"
         )
-
-    def _register_primitives(self) -> None:
-        # TODO add saliency map
-        for idx, label, confidence in self.top_labels:
-            self._add_primitive(Label(f"Rank: {idx}, {label}: {confidence:.3f}"))
diff --git a/model_api/python/model_api/models/result/types/detection.py b/model_api/python/model_api/models/result/types/detection.py
diff --git a/model_api/python/model_api/models/result/types/keypoint.py b/model_api/python/model_api/models/result/types/keypoint.py
diff --git a/model_api/python/model_api/models/result/types/segmentation.py b/model_api/python/model_api/models/result/types/segmentation.py
diff --git a/model_api/python/model_api/models/result/types/utils.py b/model_api/python/model_api/models/result/types/utils.py
diff --git a/model_api/python/model_api/models/result/types/visual_prompting.py b/model_api/python/model_api/models/result/types/visual_prompting.py
diff --git a/model_api/python/model_api/models/segmentation.py b/model_api/python/model_api/models/segmentation.py
@@ -11,7 +11,7 @@
 import numpy as np
 
 from model_api.models.image_model import ImageModel
-from model_api.models.result_types import Contour, ImageResultWithSoftPrediction
+from model_api.models.result import Contour, ImageResultWithSoftPrediction
 from model_api.models.types import BooleanValue, ListValue, NumericalValue, StringValue
 from model_api.models.utils import load_labels
 
diff --git a/model_api/python/model_api/models/ssd.py b/model_api/python/model_api/models/ssd.py
@@ -6,7 +6,7 @@
 import numpy as np
 
 from .detection_model import DetectionModel
-from .result_types import Detection, DetectionResult
+from .result import Detection, DetectionResult
 
 
 class SSD(DetectionModel):
diff --git a/model_api/python/model_api/models/utils.py b/model_api/python/model_api/models/utils.py
@@ -10,7 +10,7 @@
 import cv2
 import numpy as np
 
-from model_api.models.result_types import Contour, Detection, SegmentedObject, SegmentedObjectWithRects
+from model_api.models.result import Contour, Detection, SegmentedObject, SegmentedObjectWithRects
 
 
 def add_rotated_rects(segmented_objects: list[SegmentedObject]) -> list[SegmentedObjectWithRects]:
diff --git a/model_api/python/model_api/models/yolo.py b/model_api/python/model_api/models/yolo.py
@@ -11,7 +11,7 @@
 from model_api.adapters.utils import INTERPOLATION_TYPES, resize_image_ocv
 
 from .detection_model import DetectionModel
-from .result_types import Detection, DetectionResult
+from .result import Detection, DetectionResult
 from .types import BooleanValue, ListValue, NumericalValue
 from .utils import clip_detections, multiclass_nms, nms
 
@@ -744,8 +744,7 @@ def parameters(cls):
             {
                 "agnostic_nms": BooleanValue(
                     description=(
-                        "If True, the model is agnostic to the number of classes, "
-                        "and all classes are considered as one"
+                        "If True, the model is agnostic to the number of classes, and all classes are considered as one"
                     ),
                     default_value=False,
                 ),
diff --git a/model_api/python/model_api/visualizer/__init__.py b/model_api/python/model_api/visualizer/__init__.py
@@ -3,6 +3,8 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
+from .media import Media
+from .primitives import Overlay
 from .visualizer import Visualizer
 
-__all__ = ["Visualizer"]
+__all__ = ["Media", "Visualizer"]
diff --git a/model_api/python/model_api/visualizer/layout.py b/model_api/python/model_api/visualizer/layout.py
@@ -7,79 +7,34 @@
 from abc import ABC
 from typing import TYPE_CHECKING, Type
 
-from PIL import Image
-
 if TYPE_CHECKING:
+    from PIL import Image
+
     from model_api.visualizer.primitives import Primitive
 
-    from .visualize_mixin import VisualizeMixin
+    from .media import Media
 
 
 class Layout(ABC):
     """Base class for layouts."""
 
-    def _compute_on_primitive(self, primitive: Primitive, image: Image, result: VisualizeMixin) -> Image | None:
-        if result.has_primitive(primitive):
-            primitives = result.get_primitive(primitive)
+    def _compute_on_primitive(self, primitive: Primitive, image: Image, media: Media) -> Image | None:
+        if media.has_primitive(primitive):
+            primitives = media.get_primitive(primitive)
             for primitive in primitives:
                 image = primitive.compute(image)
             return image
         return None
 
 
-class HStack(Layout):
-    """Horizontal stack layout."""
-
-    def __init__(self, *args: Layout | Type[Primitive]) -> None:
-        self.children = args
-
-    def __call__(self, image: Image, result: VisualizeMixin) -> Image:
-        images: list[Image] = []
-        for child in self.children:
-            if isinstance(child, Layout):
-                images.append(child(image, result))
-            else:
-                _image = image.copy()
-                _image = self._compute_on_primitive(child, _image, result)
-                if _image is not None:
-                    images.append(_image)
-        return self._stitch(*images)
-
-    def _stitch(self, *images: Image) -> Image:
-        """Stitch images together.
-
-        Args:
-            images (Image): Images to stitch.
-
-        Returns:
-            Image: Stitched image.
-        """
-        new_image = Image.new(
-            "RGB",
-            (
-                sum(image.width for image in images),
-                max(image.height for image in images),
-            ),
-        )
-        x_offset = 0
-        for image in images:
-            new_image.paste(image, (x_offset, 0))
-            x_offset += image.width
-        return new_image
-
-
-class VStack(Layout):
-    """Vertical stack layout."""
-
-
 class Flatten(Layout):
     """Put all primitives on top of each other"""
 
     def __init__(self, *args: Type[Primitive]) -> None:
         self.children = args
 
-    def __call__(self, image: Image, result: VisualizeMixin) -> Image:
+    def __call__(self, image: Image, media: Media) -> Image:
         _image: Image = image.copy()
         for child in self.children:
-            _image = self._compute_on_primitive(child, _image, result)
+            _image = self._compute_on_primitive(child, _image, media)
         return _image
diff --git a/model_api/python/model_api/visualizer/media.py b/model_api/python/model_api/visualizer/media.py
diff --git a/model_api/python/model_api/visualizer/primitives.py b/model_api/python/model_api/visualizer/primitives.py
diff --git a/model_api/python/model_api/visualizer/visualize_mixin.py b/model_api/python/model_api/visualizer/visualize_mixin.py
diff --git a/model_api/python/model_api/visualizer/visualizer.py b/model_api/python/model_api/visualizer/visualizer.py

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	`from .image_model import ImageModel`
`7`		`-from .result_types import Detection`
	`7`	`+from .result import Detection`
`8`	`8`	`from .types import ListValue, NumericalValue, StringValue`
`9`	`9`	`from .utils import load_labels`
`10`	`10`