Skip to content

Commit e5ba398

Browse files
Visualization part 2 (#248)
* Add Overlay and Flatten Signed-off-by: Ashwin Vaidya <[email protected]> * Refactor result module: reorganize imports and move scene-related files to visualizer Signed-off-by: Ashwin Vaidya <[email protected]> * Enhance Flatten layout handling: update image computation to handle None outputs and add unit test for empty layout scenario. --------- Signed-off-by: Ashwin Vaidya <[email protected]>
1 parent 52219a8 commit e5ba398

29 files changed

+419
-127
lines changed

model_api/python/model_api/models/__init__.py

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,44 +56,47 @@
5656

5757
__all__ = [
5858
"ActionClassificationModel",
59+
"add_rotated_rects",
5960
"AnomalyDetection",
6061
"AnomalyResult",
62+
"classification_models",
6163
"ClassificationModel",
64+
"ClassificationResult",
6265
"Contour",
66+
"detection_models",
67+
"DetectedKeypoints",
6368
"DetectionModel",
69+
"DetectionResult",
70+
"get_contours",
6471
"ImageModel",
6572
"ImageResultWithSoftPrediction",
6673
"InstanceSegmentationResult",
67-
"VisualPromptingResult",
68-
"ZSLVisualPromptingResult",
69-
"PredictedMask",
70-
"SAMVisualPrompter",
71-
"SAMLearnableVisualPrompter",
7274
"KeypointDetectionModel",
73-
"TopDownKeypointDetectionPipeline",
75+
"Label",
7476
"MaskRCNNModel",
7577
"Model",
7678
"OutputTransform",
79+
"PredictedMask",
80+
"Prompt",
81+
"RotatedSegmentationResult",
82+
"SAMDecoder",
83+
"SAMImageEncoder",
84+
"SAMLearnableVisualPrompter",
85+
"SAMVisualPrompter",
7786
"SalientObjectDetectionModel",
87+
"segmentation_models",
7888
"SegmentationModel",
7989
"SSD",
90+
"TopDownKeypointDetectionPipeline",
91+
"VisualPromptingResult",
8092
"YOLO",
81-
"YoloV3ONNX",
82-
"YoloV4",
93+
"YOLOF",
94+
"YOLOv3ONNX",
95+
"YOLOv4",
8396
"YOLOv5",
8497
"YOLOv8",
85-
"YOLOF",
8698
"YOLOX",
87-
"SAMDecoder",
88-
"SAMImageEncoder",
89-
"ClassificationResult",
90-
"Prompt",
91-
"DetectionResult",
92-
"DetectedKeypoints",
93-
"classification_models",
94-
"detection_models",
95-
"segmentation_models",
96-
"RotatedSegmentationResult",
97-
"add_rotated_rects",
98-
"get_contours",
99+
"ZSLVisualPromptingResult",
100+
"YoloV3ONNX",
101+
"YoloV4",
99102
]

model_api/python/model_api/models/action_classification.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
import numpy as np
1111

1212
from model_api.adapters.utils import RESIZE_TYPES, InputTransform
13-
from model_api.models.result import Label
13+
from model_api.models.result import ClassificationResult, Label
1414

1515
from .model import Model
16-
from .result import ClassificationResult
1716
from .types import BooleanValue, ListValue, NumericalValue, StringValue
1817
from .utils import load_labels
1918

model_api/python/model_api/models/result/__init__.py

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,13 @@
33
# Copyright (C) 2024 Intel Corporation
44
# SPDX-License-Identifier: Apache-2.0
55

6-
from .types import (
7-
AnomalyResult,
8-
ClassificationResult,
9-
Contour,
10-
DetectedKeypoints,
11-
DetectionResult,
12-
ImageResultWithSoftPrediction,
13-
InstanceSegmentationResult,
14-
Label,
15-
PredictedMask,
16-
Result,
17-
RotatedSegmentationResult,
18-
VisualPromptingResult,
19-
ZSLVisualPromptingResult,
20-
)
6+
from .anomaly import AnomalyResult
7+
from .base import Result
8+
from .classification import ClassificationResult, Label
9+
from .detection import DetectionResult
10+
from .keypoint import DetectedKeypoints
11+
from .segmentation import Contour, ImageResultWithSoftPrediction, InstanceSegmentationResult, RotatedSegmentationResult
12+
from .visual_prompting import PredictedMask, VisualPromptingResult, ZSLVisualPromptingResult
2113

2214
__all__ = [
2315
"AnomalyResult",

model_api/python/model_api/models/result/types/__init__.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)