supervisely 6.73.257__py3-none-any.whl → 6.73.258__py3-none-any.whl

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/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/app/widgets/bokeh/template.html

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

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/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.257.dist-info → supervisely-6.73.258.dist-info}/METADATA

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

{supervisely-6.73.257.dist-info → supervisely-6.73.258.dist-info}/RECORD

@@ -110,7 +110,7 @@ supervisely/app/v1/widgets/grid_gallery.py,sha256=hEMC0MNfZ4xG2N118Mou_hptLhrikg
 supervisely/app/v1/widgets/predictions_dynamics_gallery.py,sha256=l6Ee8-c14yeSnlu4qFsLbmZ5Su63zacO3wmdtH86TMM,8079
 supervisely/app/v1/widgets/progress_bar.py,sha256=8gvQbAUHXPU8_JgC0JZkEBSRCccvg2l4Gtg8DeBCgC8,3184
 supervisely/app/v1/widgets/single_image_gallery.py,sha256=fyuC4jfCHC5rNL1JrHJCE8NaneH0nv0k-0iVkOnY0Wc,2958
-supervisely/app/widgets/__init__.py,sha256=4ft5Y3zM1_Uu5bbS-Jkj9PguuufYgcCx-2_RRY8tEXI,10048
+supervisely/app/widgets/__init__.py,sha256=ilrM0pr7RVbw05cvke4dnXYXsDAKSod9ZcUb7lc-2Ps,10101
 supervisely/app/widgets/select_sly_utils.py,sha256=gBenYkJyCl3Fa4u2GI6BKXul-AqnzvGK32Y6hxXKccA,288
 supervisely/app/widgets/widget.py,sha256=e9tyZj7XhqDWiN5Wwk2xScXOmf__vRCoHflpGtv1RS0,9820
 supervisely/app/widgets/agent_selector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,6 +128,9 @@ supervisely/app/widgets/badge/template.html,sha256=B77SyKHTaoIPrvjJtAxQfBzCs7Y8v
 supervisely/app/widgets/binded_input_number/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/binded_input_number/binded_input_number.py,sha256=RXTAGaMXtGOl4pprVLyQosr61t2rI_U_U8VNHhSyBhA,6251
 supervisely/app/widgets/binded_input_number/template.html,sha256=uCEZ54BNC2itr39wxxThXw62WlJ9659cuz8osCm0WZE,162
+supervisely/app/widgets/bokeh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+supervisely/app/widgets/bokeh/bokeh.py,sha256=9s9Vx8f-NI-2hr9xjuYapFMsZkFF_n65WAWeMXgqTWY,9563
+supervisely/app/widgets/bokeh/template.html,sha256=ntsh7xx4q9OHG62sa_r3INDxsXgvdPFIWTtYaWn_0t8,12
 supervisely/app/widgets/button/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/button/button.py,sha256=zDQinhOOjNNxdP2GIFrwTmVfGAeJJoKV6CT6C8KzQNI,10405
 supervisely/app/widgets/button/style.css,sha256=ya4kKrQGwVhVtBydftudgjPpDdN3rcUvKSlrY-2h1Kw,93
@@ -299,7 +302,7 @@ supervisely/app/widgets/identity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 supervisely/app/widgets/identity/identity.py,sha256=a_JihO_iXGILBfB4WVKvMPqywS9kmheO6c_f2YtaKok,328
 supervisely/app/widgets/identity/template.html,sha256=stmCHZRUnUMu1b6ocPHtRsJ48JmX5yCZIuROPISvlJM,33
 supervisely/app/widgets/iframe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/app/widgets/iframe/iframe.py,sha256=uP5A-rZ66v8hz4P72iavbWjBJWDwAK_NLyEoUe80cew,2729
+supervisely/app/widgets/iframe/iframe.py,sha256=9D18tg2DpTix7ZBG6uS8Qff_1i-ArRFsLYvesICVYSo,2806
 supervisely/app/widgets/iframe/template.html,sha256=5JFK7OY2zfvd9MxLRqBVq1RjWlQ9vHud_Ylk2tG_0yk,268
 supervisely/app/widgets/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/image/image.py,sha256=PJYzWfFAfMSnfuoAxJZ51n1blWLsimBwRT3UWDnkKFc,2592
@@ -433,7 +436,7 @@ supervisely/app/widgets/select_dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 supervisely/app/widgets/select_dataset/select_dataset.py,sha256=2bltbJ70plGFoF8mpLxAU2huVBce8D6CsCcX9wxO5KU,9713
 supervisely/app/widgets/select_dataset/template.html,sha256=7O_ZgmRs0vOL8tng6QvYbI_0o6A4yMAPB2MlfzWHeHQ,984
 supervisely/app/widgets/select_dataset_tree/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/app/widgets/select_dataset_tree/select_dataset_tree.py,sha256=Q1uuzLkX68zXaO4QIMHYNQc_Egqp2_DL8_ZprXnc3rc,22345
+supervisely/app/widgets/select_dataset_tree/select_dataset_tree.py,sha256=abFPT8MJv6a7oPZzwCvak6q4HB72ijpW7axJHjoJvH0,22319
 supervisely/app/widgets/select_dataset_tree/template.html,sha256=_uvKCMP0nkpSl3FiTUxqy10JZw3q8-9hXCv22W3BDF0,38
 supervisely/app/widgets/select_item/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/select_item/select_item.py,sha256=dcB0UN46rn3nFQybgrGpLRfwB6xnPo-GGrv9rsMeCbA,3833
@@ -1054,9 +1057,9 @@ supervisely/worker_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 supervisely/worker_proto/worker_api_pb2.py,sha256=VQfi5JRBHs2pFCK1snec3JECgGnua3Xjqw_-b3aFxuM,59142
 supervisely/worker_proto/worker_api_pb2_grpc.py,sha256=3BwQXOaP9qpdi0Dt9EKG--Lm8KGN0C5AgmUfRv77_Jk,28940
 supervisely_lib/__init__.py,sha256=7-3QnN8Zf0wj8NCr2oJmqoQWMKKPKTECvjH9pd2S5vY,159
-supervisely-6.73.257.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.257.dist-info/METADATA,sha256=UyU-S9TnzIcLlXhsvyoWuEMUDL031uxLtqyG_IJvLBs,33573
-supervisely-6.73.257.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.257.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.257.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.257.dist-info/RECORD,,
+supervisely-6.73.258.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.258.dist-info/METADATA,sha256=uPJIk_UXG49MKoa1f7pszlICBQGZ7qLTvgTUC0aLbJk,33573
+supervisely-6.73.258.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.258.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.258.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.258.dist-info/RECORD,,