supervisely 6.73.256__tar.gz → 6.73.258__tar.gz

{supervisely-6.73.256/supervisely.egg-info → supervisely-6.73.258}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.256
+Version: 6.73.258
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely

{supervisely-6.73.256 → supervisely-6.73.258}/supervisely/api/api.py

@@ -1631,11 +1631,14 @@ class Api:
         else:
             self._check_https_redirect()
             if self.server_address.startswith("https://"):
-                self._semaphore = asyncio.Semaphore(10)
-                logger.debug("Setting global API semaphore size to 10 for HTTPS")
+                size = 10
+                if "app.supervise" in self.server_address:
+                    size = 7
+                logger.debug(f"Setting global API semaphore size to {size} for HTTPS")
             else:
-                self._semaphore = asyncio.Semaphore(5)
-                logger.debug("Setting global API semaphore size to 5 for HTTP")
+                size = 5
+                logger.debug(f"Setting global API semaphore size to {size} for HTTP")
+            self._semaphore = asyncio.Semaphore(size)
 
     def set_semaphore_size(self, size: int = None):
         """

{supervisely-6.73.256 → supervisely-6.73.258}/supervisely/app/widgets/__init__.py

@@ -148,3 +148,4 @@ from supervisely.app.widgets.select_dataset_tree.select_dataset_tree import Sele
 from supervisely.app.widgets.grid_gallery_v2.grid_gallery_v2 import GridGalleryV2
 from supervisely.app.widgets.report_thumbnail.report_thumbnail import ReportThumbnail
 from supervisely.app.widgets.experiment_selector.experiment_selector import ExperimentSelector
+from supervisely.app.widgets.bokeh.bokeh import Bokeh

supervisely-6.73.258/supervisely/app/widgets/bokeh/bokeh.py

@@ -0,0 +1,278 @@
+from __future__ import annotations
+
+import re
+from abc import ABC, abstractmethod
+from datetime import datetime
+from typing import Any, Callable, Dict, List, Literal, Optional, Union
+
+from fastapi.responses import HTMLResponse
+from pydantic import BaseModel
+from supervisely.app.widgets import Widget
+from supervisely._utils import is_production
+from supervisely.io.env import task_id
+from supervisely.api.api import Api
+
+
+class SelectedIds(BaseModel):
+    selected_ids: List[Any]
+
+
+class Bokeh(Widget):
+    class Routes:
+        VALUE_CHANGED = "value_changed"
+        HTML_ROUTE = "bokeh.html"
+
+    class Plot(ABC):
+        @abstractmethod
+        def add(self, plot) -> None:
+            pass
+
+        @abstractmethod
+        def register(self, route_path: str) -> None:
+            pass
+
+    class Circle(Plot):
+        def __init__(
+            self,
+            x_coordinates: List[Union[int, float]],
+            y_coordinates: List[Union[int, float]],
+            radii: Optional[Union[Union[int, float], List[Union[int, float]]]] = None,
+            colors: Optional[Union[str, List[str]]] = None,
+            data: Optional[List[Any]] = None,
+            dynamic_selection: bool = False,
+            fill_alpha: float = 0.5,
+            line_color: Optional[str] = None,
+        ):
+            if not colors:
+                colors = Bokeh._generate_colors(x_coordinates, y_coordinates)
+            elif isinstance(colors, str):
+                colors = [colors] * len(x_coordinates)
+
+            if not radii:
+                radii = Bokeh._generate_radii(x_coordinates, y_coordinates)
+            elif isinstance(radii, (int, float)):
+                radii = [radii] * len(x_coordinates)
+
+            if not len(x_coordinates) == len(y_coordinates) == len(radii) == len(colors):
+                raise ValueError(
+                    "x_coordinates, y_coordinates, radii, and colors must have the same length"
+                )
+
+            if data is not None and len(data) != len(x_coordinates):
+                raise ValueError("data must have the same length as x_coordinates")
+
+            if data is None:
+                data = list(range(len(x_coordinates)))
+
+            self._x_coordinates = x_coordinates
+            self._y_coordinates = y_coordinates
+            self._radii = radii
+            self._colors = colors
+            self._data = data
+            self._source = None
+            self._dynamic_selection = dynamic_selection
+            self._fill_alpha = fill_alpha
+            self._line_color = line_color
+
+        def add(self, plot) -> None:
+            from bokeh.models import (  # pylint: disable=import-error
+                ColumnDataSource,
+                LassoSelectTool,
+            )
+
+            data = dict(
+                x=self._x_coordinates,
+                y=self._y_coordinates,
+                radius=self._radii,
+                colors=self._colors,
+                ids=self._data,
+            )
+            self._source = ColumnDataSource(data=data)
+
+            renderer = plot.circle(
+                "x",
+                "y",
+                radius="radius",
+                fill_color="colors",
+                fill_alpha=self._fill_alpha,
+                line_color=self._line_color,
+                source=self._source,
+            )
+            if not self._dynamic_selection:
+                for tool in plot.tools:
+                    if isinstance(tool, (LassoSelectTool)):
+                        tool.continuous = False
+
+            return renderer
+
+        def register(self, route_path: str) -> None:
+            from bokeh.models import CustomJS  # pylint: disable=import-error
+
+            if not hasattr(self, "_source"):
+                raise ValueError("Plot must be added to a Bokeh plot before registering")
+
+            if is_production():
+                api = Api()
+                task_info = api.task.get_info_by_id(task_id())
+                if task_info is not None:
+                    route_path = f"/net/{task_info['meta']['sessionToken']}{route_path}"
+            callback = CustomJS(
+                args=dict(source=self._source),
+                code="""
+                    var indices = source.selected.indices;
+                    var selected_ids = [];
+                    for (var i = 0; i < indices.length; i++) {{
+                        selected_ids.push(source.data['ids'][indices[i]]);
+                    }}
+                    var xhr = new XMLHttpRequest();
+                    xhr.open("POST", "{route_path}", true);
+                    xhr.setRequestHeader("Content-Type", "application/json");
+                    xhr.send(JSON.stringify({{selected_ids: selected_ids}}));
+                """.format(
+                    route_path=route_path
+                ),
+            )
+            self._source.selected.js_on_change("indices", callback)
+
+    def __init__(
+        self,
+        plots: List[Plot],
+        width: int = 1000,
+        height: int = 600,
+        tools: List[str] = [
+            "pan",
+            "wheel_zoom",
+            "box_zoom",
+            "reset",
+            "save",
+            "poly_select",
+            "tap",
+            "lasso_select",
+        ],
+        toolbar_location: Literal["above", "below", "left", "right"] = "above",
+        x_axis_visible: bool = False,
+        y_axis_visible: bool = False,
+        grid_visible: bool = False,
+        widget_id: Optional[str] = None,
+        **kwargs,
+    ):
+        from bokeh.plotting import figure  # pylint: disable=import-error
+
+        self.widget_id = widget_id
+        self._plots = plots
+        self._plot = figure(width=width, height=height, tools=tools, toolbar_location="above")
+        self._renderers = []
+
+        self._plot.xaxis.visible = x_axis_visible
+        self._plot.yaxis.visible = y_axis_visible
+        self._plot.grid.visible = grid_visible
+        super().__init__(widget_id=widget_id, file_path=__file__)
+
+        self._process_plots(plots)
+        self._update_html()
+
+        server = self._sly_app.get_server()
+
+        @server.get(self.html_route)
+        def _html_response() -> None:
+            return HTMLResponse(content=self.get_html())
+
+        # JinjaWidgets().context.pop(self.widget_id, None)  # remove the widget from index.html
+
+    @property
+    def route_path(self) -> str:
+        return self.get_route_path(Bokeh.Routes.VALUE_CHANGED)
+
+    @property
+    def html_route(self) -> str:
+        return self.get_route_path(Bokeh.Routes.HTML_ROUTE)
+
+    @property
+    def html_route_with_timestamp(self) -> str:
+        return f".{self.html_route}?t={datetime.now().timestamp()}"
+
+    def add_plots(self, plots: List[Plot]) -> None:
+        self._plots.extend(plots)
+        self._process_plots(plots)
+        self._update_html()
+
+    def clear(self) -> None:
+        self._plots = []
+        self._renderers = []
+        self._plot.renderers = []
+        self._update_html()
+
+    def remove_plot(self, idx: int) -> None:
+        renderer = self._renderers.pop(idx)
+        self._plot.renderers.remove(renderer)
+        self._update_html()
+
+    def _process_plots(self, plots: List[Plot]) -> None:
+        for plot in plots:
+            renderer = plot.add(self._plot)
+            plot.register(self.route_path)
+            self._renderers.append(renderer)
+
+    def _update_html(self) -> None:
+        from bokeh.embed import components  # pylint: disable=import-error
+
+        script, self._div = components(self._plot, wrap_script=False)
+        self._div_id = self._get_div_id(self._div)
+        self._script = self._update_script(script)
+
+    @staticmethod
+    def _generate_colors(x_coordinates: List[int], y_coordinates: List[int]) -> List[str]:
+        colors = [
+            "#%02x%02x%02x" % (int(r), int(g), 150)
+            for r, g in zip(
+                [50 + 2 * xi for xi in x_coordinates], [30 + 2 * yi for yi in y_coordinates]
+            )
+        ]
+        return colors
+
+    @staticmethod
+    def _generate_radii(x_coordinates: List[int], y_coordinates: List[int]) -> List[int]:
+        return [1] * len(x_coordinates)
+
+    def _get_div_id(self, div: str) -> str:
+        match = re.search(r'id="([^"]+)"', div)
+        if match:
+            return match.group(1)
+        raise ValueError(f"No div id found in {div}")
+
+    def _update_script(self, script: str) -> str:
+        # TODO: Reimplement using regex.
+        insert_after = "const fn = function() {"
+        updated_script = ""
+        for line in script.split("\n"):
+            if line.strip().startswith(insert_after):
+                line = line + f"\n    const el = document.querySelector('#{self._div_id}');"
+                line += "\n    if (el === null) {"
+                line += "\n      setTimeout(fn, 500);"
+                line += "\n      return;"
+                line += "\n    }"
+            updated_script += line + "\n"
+        return updated_script
+
+    def get_json_data(self):
+        return {}
+
+    def get_json_state(self):
+        return {}
+
+    def value_changed(self, func: Callable) -> Callable:
+        server = self._sly_app.get_server()
+        self._changes_handled = True
+
+        @server.post(self.route_path)
+        def _click(selected_ids: SelectedIds) -> None:
+            func(selected_ids.selected_ids)
+
+        return _click
+
+    def get_html(self) -> str:
+        return f"""<div>
+            <script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-3.1.1.min.js"></script>
+            <script type="text/javascript"> {self._script} </script>
+            {self._div}
+        </div>"""

supervisely-6.73.258/supervisely/app/widgets/bokeh/template.html

@@ -0,0 +1,2 @@
+<div>
+</div>

{supervisely-6.73.256 → supervisely-6.73.258}/supervisely/app/widgets/iframe/iframe.py

@@ -56,6 +56,8 @@ class IFrame(Widget):
         height: Optional[Union[int, str]] = None,
         width: Optional[Union[int, str]] = None,
     ):
+        height = height or self._height
+        width = width or self._width
         self._update(path_to_html=path_to_html, height=height, width=width)
 
     def clean_up(self):

{supervisely-6.73.256 → supervisely-6.73.258}/supervisely/app/widgets/select_dataset_tree/select_dataset_tree.py

@@ -120,6 +120,7 @@ class SelectDatasetTree(Widget):
 
         # Extract values from Enum to match the .type property of the ProjectInfo object.
 
+        self._project_types = None
         if allowed_project_types is not None:
             if all(allowed_project_types) is isinstance(allowed_project_types, ProjectType):
                 self._project_types = (
@@ -129,8 +130,6 @@ class SelectDatasetTree(Widget):
                 )
             elif all(allowed_project_types) is isinstance(allowed_project_types, str):
                 self._project_types = allowed_project_types
-            else:
-                self._project_types = None
 
         # Widget components.
         self._select_team = None

{supervisely-6.73.256 → supervisely-6.73.258}/supervisely/project/pointcloud_episode_project.py

@@ -31,6 +31,9 @@ from supervisely.video_annotation.frame import Frame
 from supervisely.video_annotation.key_id_map import KeyIdMap
 
 
+KITTI_ITEM_DIR_NAME = "velodyne"
+
+
 class EpisodeItemPaths(NamedTuple):
     #: :class:`str`: Full pointcloud file path of item
     pointcloud_path: str
@@ -153,9 +156,10 @@ class PointcloudEpisodeDataset(PointcloudDataset):
 
     def _read(self):
         if not dir_exists(self.item_dir):
-            raise NotADirectoryError(
-                f"Cannot read dataset {self.name}: {self.item_dir} directory not found"
-            )
+            message = f"Cannot read dataset '{self.name}': '{self.item_dir}' directory not found"
+            if dir_exists(os.path.join(self.directory, KITTI_ITEM_DIR_NAME)):
+                message = f"Cannot read dataset '{self.name}'. The item directory '{KITTI_ITEM_DIR_NAME}' was found. This appears to be a KITTI dataset and will be skipped."
+            raise NotADirectoryError(message)
 
         try:
             item_paths = sorted(list_files(self.item_dir, filter_fn=self._has_valid_ext))
@@ -504,6 +508,7 @@ class PointcloudEpisodeProject(PointcloudProject):
         batch_size: Optional[int] = 10,
         log_progress: bool = True,
         progress_cb: Optional[Union[tqdm, Callable]] = None,
+        **kwargs,
     ) -> None:
         """
         Download pointcloud episodes project from Supervisely to the given directory.
@@ -626,6 +631,12 @@ class PointcloudEpisodeProject(PointcloudProject):
             progress_cb=progress_cb,
         )
 
+    @staticmethod
+    async def download_async(*args, **kwargs):
+        raise NotImplementedError(
+            f"Static method 'download_async()' is not supported for PointcloudEpisodeProject class now."
+        )
+
 
 def download_pointcloud_episode_project(
     api: Api,

{supervisely-6.73.256 → supervisely-6.73.258}/supervisely/project/pointcloud_project.py

@@ -737,6 +737,7 @@ class PointcloudProject(VideoProject):
         batch_size: Optional[int] = 10,
         log_progress: bool = True,
         progress_cb: Optional[Union[tqdm, Callable]] = None,
+        **kwargs,
     ) -> PointcloudProject:
         """
         Download pointcloud project from Supervisely to the given directory.
@@ -858,6 +859,12 @@ class PointcloudProject(VideoProject):
             progress_cb=progress_cb,
         )
 
+    @staticmethod
+    async def download_async(*args, **kwargs):
+        raise NotImplementedError(
+            f"Static method 'download_async()' is not supported for PointcloudProject class now."
+        )
+
 
 def download_pointcloud_project(
     api: Api,

{supervisely-6.73.256 → supervisely-6.73.258}/supervisely/project/project.py

@@ -2091,7 +2091,12 @@ class Project:
                     OpenMode.READ,
                     parents=parents,
                 )
-                self._datasets = self._datasets.add(current_dataset)
+                if current_dataset.name not in self._datasets._collection:
+                    self._datasets = self._datasets.add(current_dataset)
+                else:
+                    logger.debug(
+                        f"Dataset '{current_dataset.name}' already exists in project '{self.name}'. Skip adding to collection."
+                    )
             except Exception as ex:
                 logger.warning(ex)
 

{supervisely-6.73.256 → supervisely-6.73.258}/supervisely/project/volume_project.py

@@ -33,7 +33,9 @@ VolumeItemPaths = namedtuple("VolumeItemPaths", ["volume_path", "ann_path"])
 class VolumeDataset(VideoDataset):
     item_dir_name = "volume"
     interpolation_dir = "interpolation"
+    interpolation_dir_name = interpolation_dir
     mask_dir = "mask"
+    mask_dir_name = mask_dir
     annotation_class = VolumeAnnotation
     item_module = sly_volume
     paths_tuple = VolumeItemPaths
@@ -147,6 +149,7 @@ class VolumeProject(VideoProject):
         download_volumes: Optional[bool] = True,
         log_progress: bool = False,
         progress_cb: Optional[Union[tqdm, Callable]] = None,
+        **kwargs,
     ) -> None:
         """
         Download volume project from Supervisely to the given directory.
@@ -297,6 +300,12 @@ class VolumeProject(VideoProject):
             f"Static method 'get_train_val_splits_by_tag()' is not supported for VolumeProject class now."
         )
 
+    @staticmethod
+    async def download_async(*args, **kwargs):
+        raise NotImplementedError(
+            f"Static method 'download_async()' is not supported for VolumeProject class now."
+        )
+
 
 def download_volume_project(
     api: Api,

{supervisely-6.73.256 → supervisely-6.73.258/supervisely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.256
+Version: 6.73.258
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely

{supervisely-6.73.256 → supervisely-6.73.258}/supervisely.egg-info/SOURCES.txt

@@ -138,6 +138,9 @@ supervisely/app/widgets/badge/template.html
 supervisely/app/widgets/binded_input_number/__init__.py
 supervisely/app/widgets/binded_input_number/binded_input_number.py
 supervisely/app/widgets/binded_input_number/template.html
+supervisely/app/widgets/bokeh/__init__.py
+supervisely/app/widgets/bokeh/bokeh.py
+supervisely/app/widgets/bokeh/template.html
 supervisely/app/widgets/button/__init__.py
 supervisely/app/widgets/button/button.py
 supervisely/app/widgets/button/style.css