supervisely 6.73.238__py3-none-any.whl → 6.73.240__py3-none-any.whl

supervisely/nn/benchmark/utils/semantic_segmentation/loader.py

@@ -0,0 +1,65 @@
+import os
+
+import cv2
+
+
+def build_segmentation_loader(
+    pred_dir,
+    gt_dir,
+    num_workers=0,
+    pred_label_map=None,
+    gt_label_map=None,
+):
+    import torch  # pylint: disable=import-error
+
+    class SegmentationLoader(torch.utils.data.Dataset):
+        def __init__(
+            self,
+            pred_dir,
+            gt_dir,
+            pred_label_map=None,
+            gt_label_map=None,
+        ):
+            self.pred_dir = pred_dir
+            self.pred_files = sorted(os.listdir(self.pred_dir))
+            self.gt_dir = gt_dir
+            self.gt_files = sorted(os.listdir(self.gt_dir))
+            if len(self.pred_files) != len(self.gt_files):
+                raise RuntimeError(
+                    f"Number of predictions({len(self.pred_files)}) and ground-truth annotations ({len(self.gt_files)}) do not match!"
+                )
+            self.pred_label_map = pred_label_map
+            self.gt_label_map = gt_label_map
+
+        def __len__(self):
+            return len(self.pred_files)
+
+        def __getitem__(self, index):
+            pred_path = os.path.join(self.pred_dir, self.pred_files[index])
+            gt_path = os.path.join(self.gt_dir, self.gt_files[index])
+
+            if self.pred_label_map:
+                pred = self.pred_label_map(pred)
+            else:
+                pred = cv2.imread(pred_path, cv2.IMREAD_UNCHANGED)
+
+            if self.gt_label_map:
+                gt = self.gt_label_map(gt)
+            else:
+                gt = cv2.imread(gt_path, cv2.IMREAD_UNCHANGED)
+
+            img_name = self.gt_files[index]
+            return (pred, gt, img_name)
+
+    loader = SegmentationLoader(
+        pred_dir=pred_dir,
+        gt_dir=gt_dir,
+        pred_label_map=pred_label_map,
+        gt_label_map=gt_label_map,
+    )
+    return torch.utils.data.DataLoader(
+        loader,
+        batch_size=1,
+        num_workers=num_workers,
+        collate_fn=lambda l: (l[0][0], l[0][1], l[0][2]),
+    )

supervisely/nn/benchmark/utils/semantic_segmentation/utils.py

@@ -0,0 +1,109 @@
+import cv2
+import numpy as np
+import scipy
+
+
+def one_hot(segmentation, num_classes):
+    # TODO: this assumes that the classes start with 0
+    segmentation_copy = segmentation.copy()
+    eye = np.eye(num_classes + 1, dtype=np.bool_)
+    one_hot_seg = eye[segmentation_copy].transpose(2, 0, 1)
+    return one_hot_seg[:num_classes]
+
+
+def single_one_hot(segmentation, cls):
+    one_hot_seg = np.zeros_like(segmentation)
+    one_hot_seg[segmentation == cls] = 1
+    return one_hot_seg
+
+
+def get_single_contiguous_segment(one_hot_segmentation):
+    kernel = np.ones((3, 3), dtype=one_hot_segmentation.dtype)
+    seg = scipy.ndimage.label(one_hot_segmentation, structure=kernel)[0]
+    return [np.where(seg == l) for l in range(1, seg.max() + 1)]
+
+
+def get_contiguous_segments(one_hot_segmentation):
+    kernel = np.ones((3, 3), dtype=one_hot_segmentation.dtype)
+    segments_tensor = np.stack(
+        [scipy.ndimage.label(seg, structure=kernel)[0] for seg in one_hot_segmentation]
+    )
+
+    return {
+        c: [np.where(seg == l) for l in range(1, seg.max() + 1)]
+        for c, seg in enumerate(segments_tensor)
+    }
+
+
+def get_exact_kernel(width):
+    x = np.arange(-width, width + 1)
+    xx, yy = np.meshgrid(x, x)
+    d = np.sqrt(xx**2 + yy**2)
+    kernel = (np.round(d) <= width).astype(np.uint8)
+    return kernel
+
+
+def erode_mask(mask, width, implementation="fast"):
+    if mask.ndim == 2:
+        input_mask = mask.astype(np.uint8)
+    elif mask.ndim == 3:
+        input_mask = mask.astype(np.uint8).transpose(1, 2, 0)
+    else:
+        raise ValueError(f"Assume an array of shape (H,W) or (C,H,W), got {mask.shape}!")
+
+    if implementation == "fast":
+        kernel = np.ones((3, 3), dtype=np.uint8)
+        eroded_mask = cv2.erode(input_mask, kernel, iterations=width)
+    elif implementation == "exact":
+        kernel = get_exact_kernel(width)
+        eroded_mask = cv2.erode(input_mask, kernel, iterations=1)
+    else:
+        raise ValueError(
+            f'Implementation has to be one of "exact" and "fast", received: {implementation}!'
+        )
+
+    if input_mask.ndim == 2:
+        return eroded_mask
+    else:  # input_mask.ndim == 3
+        if mask.shape[0] == 1:  # in this case, the first axis gets removed by cv2
+            eroded_mask = np.expand_dims(eroded_mask, -1)
+        return eroded_mask.transpose(2, 0, 1)
+
+
+def dilate_mask(mask, width, implementation="fast"):
+    if mask.ndim == 2:
+        input_mask = mask.astype(np.uint8)
+    elif mask.ndim == 3:
+        input_mask = mask.astype(np.uint8).transpose(1, 2, 0)
+    else:
+        raise ValueError(f"Assume an array of shape (H,W) or (C,H,W), got {mask.shape}!")
+
+    if implementation == "fast":
+        kernel = np.ones((3, 3), dtype=np.uint8)
+        dilated_mask = cv2.dilate(input_mask, kernel, iterations=width)
+    elif implementation == "exact":
+        kernel = get_exact_kernel(width)
+        dilated_mask = cv2.dilate(input_mask, kernel, iterations=1)
+    else:
+        raise ValueError(
+            f'Implementation has to be one of "exact" and "fast", received: {implementation}!'
+        )
+
+    if input_mask.ndim == 2:
+        return dilated_mask
+    else:  # input_mask.ndim == 3
+        if mask.shape[0] == 1:  # in this case, the first axis gets removed by cv2
+            dilated_mask = np.expand_dims(dilated_mask, -1)
+        return dilated_mask.transpose(2, 0, 1)
+
+
+def get_interior_boundary(mask, width, implementation="fast"):
+    eroded_mask = erode_mask(mask, width, implementation)
+    boundary_mask = (mask - eroded_mask).astype(np.bool_)
+    return boundary_mask
+
+
+def get_exterior_boundary(mask, width, implementation="fast"):
+    dilated_mask = dilate_mask(mask, width, implementation)
+    boundary_mask = (dilated_mask - mask).astype(np.bool_)
+    return boundary_mask

supervisely/nn/benchmark/visualization/evaluation_result.py

@@ -6,18 +6,18 @@ import pandas as pd
 
 from supervisely.annotation.annotation import ProjectMeta
 from supervisely.api.api import Api
+from supervisely.api.module_api import ApiField
 from supervisely.api.dataset_api import DatasetInfo
 from supervisely.api.project_api import ProjectInfo
 from supervisely.app.widgets import SlyTqdm
 from supervisely.io.env import team_id
 from supervisely.io.fs import dir_empty, mkdir
 from supervisely.io.json import load_json_file
-from supervisely.nn.benchmark.evaluation.coco.metric_provider import MetricProvider
+from supervisely.nn.benchmark.utils.detection.metric_provider import MetricProvider
 from supervisely.nn.benchmark.visualization.vis_click_data import ClickData, IdMapper
 from supervisely.sly_logger import logger
 from supervisely.task.progress import tqdm_sly
 
-
 # class ImageComparisonData:
 #     def __init__(
 #         self,
@@ -86,6 +86,14 @@ class EvalResult:
         model_name = self.inference_info.get("model_name", self.eval_dir)
         return self.inference_info.get("deploy_params", {}).get("checkpoint_name", model_name)
 
+    @property
+    def model_name(self) -> str:
+        if not self.name:
+            return
+        if len(self.name) > 20:
+            return self.name[:9] + "..." + self.name[-6:]
+        return self.name
+
     @property
     def gt_project_id(self) -> int:
         return self.inference_info.get("gt_project_id")
@@ -114,7 +122,13 @@ class EvalResult:
         if self._gt_dataset_infos is None:
             filters = None
             if self.gt_dataset_ids is not None:
-                filters = [{"field": "id", "operator": "in", "value": self.gt_dataset_ids}]
+                filters = [
+                    {
+                        ApiField.FIELD: ApiField.ID,
+                        ApiField.OPERATOR: "in",
+                        ApiField.VALUE: self.gt_dataset_ids,
+                    }
+                ]
             self._gt_dataset_infos = self.api.dataset.get_list(
                 self.gt_project_id,
                 filters=filters,

supervisely/nn/benchmark/visualization/vis_click_data.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from collections import defaultdict
 
-from supervisely.nn.benchmark.evaluation.coco.metric_provider import (
+from supervisely.nn.benchmark.utils.detection.metric_provider import (
     MetricProvider,
 )
 

supervisely/nn/benchmark/visualization/widgets/__init__.py

@@ -12,6 +12,9 @@ from supervisely.nn.benchmark.visualization.widgets.markdown.markdown import (
 from supervisely.nn.benchmark.visualization.widgets.notification.notification import (
     NotificationWidget,
 )
+from supervisely.nn.benchmark.visualization.widgets.radio_group.radio_group import (
+    RadioGroupWidget,
+)
 from supervisely.nn.benchmark.visualization.widgets.sidebar.sidebar import SidebarWidget
 from supervisely.nn.benchmark.visualization.widgets.table.table import TableWidget
 from supervisely.nn.benchmark.visualization.widgets.widget import BaseWidget

supervisely/nn/benchmark/visualization/widgets/chart/chart.py

@@ -13,10 +13,14 @@ class ChartWidget(BaseWidget):
         self,
         name: str,
         figure,  # plotly figure
+        switchable: bool = False,
+        switch_key: str = "switch_key",
+        radiogroup_id: str = None,
     ) -> None:
         super().__init__(name)
-        self.radio_group = "radio_group"  # TODO: fix
-        self.switch_key = "switch_key"  # TODO: fix
+        self.switchable = switchable
+        self.switch_key = switch_key
+        self.radiogroup_id = radiogroup_id
 
         self.figure = figure
         self.click_data = None
@@ -47,7 +51,8 @@ class ChartWidget(BaseWidget):
     def _get_template_data(self):
         return {
             "widget_id": self.id,
-            "radio_group": self.radio_group,
+            "radio_group": self.radiogroup_id,
+            "switchable": self.switchable,
             "switch_key": self.switch_key,
             "init_data_source": self.data_source,
             "click_handled": self.click_data is not None,
@@ -69,4 +74,7 @@ class ChartWidget(BaseWidget):
         }
 
     def get_state(self) -> Dict:
-        return {}
+        res = {}
+        if self.switchable:
+            res[self.radiogroup_id] = self.switch_key
+        return res

supervisely/nn/benchmark/visualization/widgets/gallery/gallery.py

@@ -1,12 +1,11 @@
 import json
 from pathlib import Path
-from typing import List, Optional, Union
+from typing import Any, List, Optional, Union
 
 from jinja2 import Template
 
 from supervisely.api.annotation_api import AnnotationInfo
 from supervisely.api.image_api import ImageInfo
-from supervisely.app.widgets import GridGalleryV2
 from supervisely.io.fs import ensure_base_path
 from supervisely.nn.benchmark.visualization.widgets.widget import BaseWidget
 from supervisely.project.project_meta import ProjectMeta
@@ -19,23 +18,34 @@ class GalleryWidget(BaseWidget):
         filters: Optional[List] = None,
         is_modal: Optional[bool] = False,
         columns_number: int = 3,
+        click_gallery_id: Optional[str] = None,
+        opacity: Optional[float] = 0.4,
+        limit: Optional[int] = None,
     ):
         super().__init__(name)
         self.reference = self.id
         self.is_modal = is_modal
         self.click_handled = False
-        self.click_gallery_id = None
+        self.click_gallery_id = click_gallery_id
         self.click_data = None
-        self.click_gallery_items_limit = None
+        self.click_gallery_items_limit = limit or columns_number * 3
         self.image_left_header = False
         self._project_meta = None
         self.show_all_button = False
+        self.show_all_gallery_id = None
+        self.show_all_data = None
+        self.show_all_data_source = f"/data/{self.name}_{self.id}_show_all_data.json"
         self.columns_number = columns_number
+        self.get_key = None
+        self.opacity = opacity or 0.4
 
         filters = filters  # or [{"confidence": [0.6, 1]}]
+
+        from supervisely.app.widgets import GridGalleryV2
+
         self._gallery = GridGalleryV2(
             columns_number=columns_number,
-            annotations_opacity=0.4,
+            annotations_opacity=self.opacity,
             border_width=4,
             enable_zoom=False,
             default_tag_filters=filters,
@@ -94,6 +104,12 @@ class GalleryWidget(BaseWidget):
             with open(basepath + self.click_data_source, "w") as f:
                 json.dump(self.click_data, f)
 
+        # show all data
+        if self.show_all_data is not None:
+            ensure_base_path(basepath + self.show_all_data_source)
+            with open(basepath + self.show_all_data_source, "w") as f:
+                json.dump(self.show_all_data, f)
+
     def get_state(self) -> None:
         return {}
 
@@ -101,11 +117,19 @@ class GalleryWidget(BaseWidget):
         template_str = Path(__file__).parent / "template.html"
         return Template(template_str.read_text()).render(self._get_template_data())
 
-    def add_on_click(self, gallery_id, click_data, gallery_items_limit):
+    def set_click_data(
+        self, click_gallery_id: str, click_data: Any, get_key: Optional[str] = None
+    ) -> None:
         self.click_handled = True
-        self.click_gallery_id = gallery_id
         self.click_data = click_data
-        self.click_gallery_items_limit = gallery_items_limit
+        self.click_gallery_id = click_gallery_id
+        if get_key is not None:
+            self.get_key = get_key
+
+    def set_show_all_data(self, gallery_id: str, data: str) -> None:
+        self.show_all_button = True
+        self.show_all_gallery_id = gallery_id
+        self.show_all_data = data
 
     def add_image_left_header(self, html: str):
         self.image_left_header = html
@@ -118,8 +142,11 @@ class GalleryWidget(BaseWidget):
             "is_modal": str(self.is_modal).lower(),
             "click_handled": self.click_handled,
             "show_all_button": self.show_all_button,
+            "show_all_gallery_id": self.show_all_gallery_id,
+            "show_all_data_source": self.show_all_data_source,
             "click_data_source": self.click_data_source,
             "click_gallery_id": self.click_gallery_id,
             "click_gallery_items_limit": self.click_gallery_items_limit,
             "image_left_header": self.image_left_header,
+            "get_key": self.get_key,
         }

supervisely/nn/benchmark/visualization/widgets/gallery/template.html

@@ -1,4 +1,4 @@
-<div style="position: relative; max-height: 600px; overflow: hidden;">
+<div style="position: relative; max-height: 700px; overflow: hidden;">
     <sly-iw-gallery ref="{{ widget_id }}" iw-widget-id="{{ widget_id }}" :options="{'isModalWindow': {{ is_modal }}}"
         :actions="{
         'init': {
@@ -6,10 +6,14 @@
         },
         {% if click_handled %}
         'chart-click': {
-            'key': 'explore',
             'dataSource': '{{ click_data_source }}',
             'galleryId': '{{ click_gallery_id }}',
             'limit': {{ click_gallery_items_limit }},
+            {% if get_key %}
+            'getKey': {{ get_key }},
+            {% else %}
+             'key' : 'explore',
+            {% endif %}
         },
         {% endif %}
     }" :command="command" :data="data">
@@ -38,9 +42,9 @@
                     data: {
                       'key': 'explore',
                       'limit': {{ click_gallery_items_limit}},
-                      'dataSource': '{{ click_data_source }}',
+                      'dataSource': '{{ show_all_data_source }}',
                     },
-                    'galleryId': '{{ click_gallery_id }}',
+                    'galleryId': '{{ show_all_gallery_id }}',
                   },
                   internalCommand: true
                 })">Explore more</el-button>

supervisely/nn/benchmark/visualization/widgets/markdown/markdown.py

@@ -33,7 +33,7 @@ class MarkdownWidget(BaseWidget):
         if self.is_info_block:
             style_class += " overview-info-block"
         if self.width_fit_content:
-            style_class += " markdown-fit-content"
+            style_class += " width-fit-content"
 
         return f"""
             <div style="margin-top: 10px;">

supervisely/nn/benchmark/visualization/widgets/notification/notification.py

@@ -21,18 +21,22 @@ class NotificationWidget(BaseWidget):
         return {}
 
     def to_html(self) -> str:
-        return f"""
+        res = f"""
                     <div style="margin-top: 20px; margin-bottom: 20px;">
                         <sly-iw-notification              
                         iw-widget-id="{ self.id }"
-                        >
+                        >"""
+        if self.title:
+            res += f"""
                             <span slot="title">
                                 { self.title }
-                            </span>
-
+                            </span>"""
+        if self.desc:
+            res += f"""
                             <span slot="description">
                                 { self.desc }
-                            </span>
+                            </span>"""
+        res += """
                         </sly-iw-notification>
-                    </div>
-        """
+                    </div>"""
+        return res

supervisely/nn/benchmark/visualization/widgets/radio_group/radio_group.py

@@ -0,0 +1,34 @@
+from typing import Dict, List
+
+from supervisely.nn.benchmark.visualization.widgets.widget import BaseWidget
+
+
+class RadioGroupWidget(BaseWidget):
+
+    def __init__(
+        self,
+        name: str,
+        radio_group: str,
+        switch_keys: List[str],
+        default_key: str = None,
+    ) -> None:
+        super().__init__(name)
+        self.radio_group = radio_group
+        self.switch_keys = switch_keys
+        self.default_key = default_key or switch_keys[0]
+
+    def save_data(self, basepath: str) -> None:
+        return
+
+    def get_state(self) -> Dict:
+        return {self.radio_group: self.default_key}
+
+    def to_html(self) -> str:
+        res = ""
+        for switch_key in self.switch_keys:
+            res += f"""
+            <el-radio v-model="state.{self.radio_group}" label="{switch_key}" style="margin-top: 10px;">
+            {switch_key}
+            </el-radio>
+            """
+        return res

supervisely/nn/benchmark/visualization/widgets/table/table.py

@@ -13,7 +13,7 @@ class TableWidget(BaseWidget):
         name: str,
         data: Dict = None,
         click_data: Any = None,
-        click_gellery_id: str = "",
+        click_gallery_id: str = "",
         fix_columns: int = 0,
         show_header_controls: bool = True,
         main_column: Optional[str] = None,
@@ -26,7 +26,7 @@ class TableWidget(BaseWidget):
         self.show_header_controls = show_header_controls
         self.main_column = main_column
         self.click_data = click_data
-        self.click_gellery_id = click_gellery_id
+        self.click_gallery_id = click_gallery_id
 
         if isinstance(width, int):
             width = f"width: {width}px"
@@ -54,6 +54,12 @@ class TableWidget(BaseWidget):
     def get_state(self) -> Dict:
         return {}
 
+    def set_click_data(self, click_gallery_id: str, click_data: Any) -> None:
+        self.click_handled = True
+        self.click_data = click_data
+        self.clickable = True
+        self.click_gallery_id = click_gallery_id
+
     def get_render_data(self) -> Dict:
         return {
             "widget_id": self.id,
@@ -61,7 +67,7 @@ class TableWidget(BaseWidget):
             "showHeaderControls": self.show_header_controls,
             "init_data_source": self.data_source,
             "table_click_data": self.click_data_source,
-            "table_gallery_id": self.click_gellery_id,
+            "table_gallery_id": self.click_gallery_id,
             "mainColumn": self.main_column,
             "clickable": self.clickable,
             "width": self.width or "",

supervisely/nn/benchmark/visualization/widgets/widget.py

@@ -11,6 +11,7 @@ class BaseWidget:
         self.title = title
         self.data_source = f"/data/{self.name}_{self.id}.json"
         self.click_data_source = f"/data/{self.name}_{self.id}_click_data.json"
+        self.switchable = False
 
     def save_data(self, basepath: str) -> None:
         raise NotImplementedError
@@ -20,3 +21,6 @@ class BaseWidget:
 
     def to_html(self) -> str:
         raise NotImplementedError
+
+    def set_click_data(self, click_gallery_id, click_data) -> None:
+        return

supervisely/project/project.py

@@ -40,6 +40,7 @@ from supervisely.io.fs import (
     copy_file,
     copy_file_async,
     dir_empty,
+    file_exists,
     dir_exists,
     ensure_base_path,
     get_file_name_with_ext,
@@ -2281,6 +2282,8 @@ class Project:
         target_classes: Optional[List[str]] = None,
         progress_cb: Optional[Union[tqdm, Callable]] = None,
         segmentation_type: Optional[str] = "semantic",
+        bg_name: Optional[str] = "__bg__",
+        bg_color: Optional[List[int]] = None,
     ) -> None:
         """
         Makes a copy of the :class:`Project<Project>`, converts annotations to
@@ -2296,13 +2299,17 @@ class Project:
         :param inplace: Modifies source project If True. Must be False If dst_project_dir is specified.
         :type inplace: :class:`bool`, optional
         :param target_classes: Classes list to include to destination project. If segmentation_type="semantic",
-                               background class "__bg__" will be added automatically.
+                               background class will be added automatically (by default "__bg__").
         :type target_classes: :class:`list` [ :class:`str` ], optional
         :param progress_cb: Function for tracking download progress.
         :type progress_cb: tqdm or callable, optional
-        :param segmentation_type: One of: {"semantic", "instance"}. If segmentation_type="semantic", background class "__bg__"
-                                  will be added automatically and instances will be converted to non overlapping semantic segmentation mask.
+        :param segmentation_type: One of: {"semantic", "instance"}. If segmentation_type="semantic", background class
+                                  will be added automatically (by default "__bg__") and instances will be converted to non overlapping semantic segmentation mask.
         :type segmentation_type: :class:`str`
+        :param bg_name: Default background class name, used for semantic segmentation.
+        :type bg_name: :class:`str`, optional
+        :param bg_color: Default background class color, used for semantic segmentation.
+        :type bg_color: :class:`list`, optional. Default is [0, 0, 0]
         :return: None
         :rtype: NoneType
         :Usage example:
@@ -2319,8 +2326,9 @@ class Project:
             seg_project = sly.Project(seg_project_path, sly.OpenMode.READ)
         """
 
-        _bg_class_name = "__bg__"
-        _bg_obj_class = ObjClass(_bg_class_name, Bitmap, color=[0, 0, 0])
+        _bg_class_name = bg_name
+        bg_color = bg_color or [0, 0, 0]
+        _bg_obj_class = ObjClass(_bg_class_name, Bitmap, color=bg_color)
 
         if dst_project_dir is None and inplace is False:
             raise ValueError(
@@ -2388,7 +2396,11 @@ class Project:
 
                 seg_path = None
                 if inplace is False:
-                    dst_dataset.add_item_file(item_name, img_path, seg_ann)
+                    if file_exists(img_path):
+                        dst_dataset.add_item_file(item_name, img_path, seg_ann)
+                    else:
+                        # if local project has no images
+                        dst_dataset._add_ann_by_type(item_name, seg_ann)
                     seg_path = dst_dataset.get_seg_path(item_name)
                 else:
                     # replace existing annotation

{supervisely-6.73.238.dist-info → supervisely-6.73.240.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.238
+Version: 6.73.240
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely
@@ -105,6 +105,8 @@ Provides-Extra: model-benchmark
 Requires-Dist: pycocotools; extra == "model-benchmark"
 Requires-Dist: scikit-learn; extra == "model-benchmark"
 Requires-Dist: plotly==5.22.0; extra == "model-benchmark"
+Requires-Dist: torch==1.13.0; extra == "model-benchmark"
+Requires-Dist: torchvision==0.14.0; extra == "model-benchmark"
 Provides-Extra: plugins
 Requires-Dist: jsonschema<3.0.0,>=2.6.0; extra == "plugins"
 Provides-Extra: sdk-nn-plugins