supervisely 6.73.213__py3-none-any.whl → 6.73.215__py3-none-any.whl

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

@@ -0,0 +1,33 @@
+from typing import Dict, List
+
+from supervisely.nn.benchmark.visualization.widgets.widget import BaseWidget
+
+
+class CollapseWidget(BaseWidget):
+    def __init__(self, widgets: List[BaseWidget]) -> None:
+        super().__init__()
+        self.widgets = widgets
+
+    def save_data(self, basepath: str) -> None:
+        for widget in self.widgets:
+            widget.save_data(basepath)
+
+    def get_state(self) -> Dict:
+        return {}
+
+    def to_html(self) -> str:
+        items = "\n".join(
+            [
+                f"""
+                    <el-collapse-item title="{widget.title}">
+                        {widget.to_html()}
+                    </el-collapse-item>
+                """
+                for widget in self.widgets
+            ]
+        )
+        return f"""
+                    <el-collapse class='mb-6'>
+                        {items}
+                    </el-collapse>
+                """

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

@@ -0,0 +1,54 @@
+from typing import Dict, List, Literal, Optional, Union
+
+from supervisely.nn.benchmark.visualization.widgets.widget import BaseWidget
+
+
+class ContainerWidget(BaseWidget):
+    def __init__(
+        self,
+        widgets: List[BaseWidget],
+        name: str = "container",
+        title: str = None,
+        grid: Optional[bool] = False,
+        grid_cols: Union[int, Literal["auto"]] = 2,
+        grid_rows: Union[int, Literal["auto"]] = "auto",
+    ):
+        super().__init__(name, title)
+        self.widgets = widgets
+        self.grid = grid
+        self.grid_cols = grid_cols
+        self.grid_rows = grid_rows
+
+    def to_html(self) -> str:
+        if self.grid:
+            if any([v != "auto" and type(v) != int for v in [self.grid_cols, self.grid_rows]]):
+                raise ValueError("grid_cols and grid_rows must be either 'auto' or an integer")
+            s = f"""
+                <div 
+                    id="{ self.id }"
+                    style="
+                        display: grid; 
+                        grid-template-columns: repeat({self.grid_cols}, 1fr); 
+                        grid-template-rows: repeat({self.grid_rows}, 1fr);
+                        grid-column-gap: 16px;
+                        grid-row-gap: 16px;
+                        margin-bottom: 25px;
+                    "
+                >
+            """
+        else:
+            s = "<div>"
+        for widget in self.widgets:
+            s += "<div>" + widget.to_html() + "</div>"
+        s += "</div>"
+        return s
+
+    def save_data(self, basepath: str) -> None:
+        for widget in self.widgets:
+            widget.save_data(basepath)
+
+    def get_state(self) -> Dict:
+        state = {}
+        for widget in self.widgets:
+            state.update(widget.get_state())
+        return state

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

@@ -0,0 +1,125 @@
+import json
+from pathlib import Path
+from typing import 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
+
+
+class GalleryWidget(BaseWidget):
+    def __init__(
+        self,
+        name: str,
+        filters: Optional[List] = None,
+        is_modal: Optional[bool] = False,
+        columns_number: int = 3,
+    ):
+        super().__init__(name)
+        self.reference = self.id
+        self.is_modal = is_modal
+        self.click_handled = False
+        self.click_gallery_id = None
+        self.click_data = None
+        self.click_gallery_items_limit = None
+        self.image_left_header = False
+        self._project_meta = None
+        self.show_all_button = False
+        self.columns_number = columns_number
+
+        filters = filters  # or [{"confidence": [0.6, 1]}]
+        self._gallery = GridGalleryV2(
+            columns_number=columns_number,
+            annotations_opacity=0.4,
+            border_width=4,
+            enable_zoom=False,
+            default_tag_filters=filters,
+            show_zoom_slider=False,
+        )
+
+    def set_project_meta(self, project_meta: ProjectMeta):
+        self._project_meta = project_meta
+
+    def set_images(
+        self,
+        image_infos: List[ImageInfo],
+        ann_infos: List[AnnotationInfo],
+        project_metas: List[ProjectMeta] = None,
+        skip_tags_filtering: Optional[List[Union[bool, List[str]]]] = None,
+    ):
+        """One time operation"""
+        if project_metas is None:
+            project_metas = [self._project_meta] * self.columns_number
+
+        if skip_tags_filtering is None:
+            skip_tags_filtering = [False] * self.columns_number
+
+        for idx, (image, ann) in enumerate(zip(image_infos, ann_infos)):
+            image_name = image.name
+            image_url = image.full_storage_url
+            self._gallery.append(
+                title=image_name,
+                image_url=image_url,
+                annotation_info=ann,
+                column_index=idx % self.columns_number,
+                project_meta=project_metas[idx % self.columns_number],
+                ignore_tags_filtering=skip_tags_filtering[idx % self.columns_number],
+            )
+
+    def _get_init_data(self):
+        res = {}
+        self._gallery._update_filters()
+        res.update(self._gallery.get_json_state())
+        res.update(self._gallery.get_json_data()["content"])
+        res["layoutData"] = res.pop("annotations")
+        res["projectMeta"] = self._project_meta.to_json()
+        return res
+
+    def save_data(self, basepath: str) -> None:
+        # init data
+        basepath = basepath.rstrip("/")
+        ensure_base_path(basepath + self.data_source)
+
+        with open(basepath + self.data_source, "w") as f:
+            json.dump(self._get_init_data(), f)
+
+        # click data
+        if self.click_data is not None:
+            ensure_base_path(basepath + self.click_data_source)
+            with open(basepath + self.click_data_source, "w") as f:
+                json.dump(self.click_data, f)
+
+    def get_state(self) -> None:
+        return {}
+
+    def to_html(self) -> str:
+        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):
+        self.click_handled = True
+        self.click_gallery_id = gallery_id
+        self.click_data = click_data
+        self.click_gallery_items_limit = gallery_items_limit
+
+    def add_image_left_header(self, html: str):
+        self.image_left_header = html
+
+    def _get_template_data(self):
+        return {
+            "widget_id": self.id,
+            "reference": self.reference,  # TODO: same as id?
+            "init_data_source": self.data_source,
+            "is_modal": str(self.is_modal).lower(),
+            "click_handled": self.click_handled,
+            "show_all_button": self.show_all_button,
+            "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,
+        }

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

@@ -0,0 +1,49 @@
+<div style="position: relative; max-height: 600px; overflow: hidden;">
+    <sly-iw-gallery ref="{{ widget_id }}" iw-widget-id="{{ widget_id }}" :options="{'isModalWindow': {{ is_modal }}}"
+        :actions="{
+        'init': {
+            'dataSource': '{{ init_data_source }}',
+        },
+        {% if click_handled %}
+        'chart-click': {
+            'key': 'explore',
+            'dataSource': '{{ click_data_source }}',
+            'galleryId': '{{ click_gallery_id }}',
+            'limit': {{ click_gallery_items_limit }},
+        },
+        {% endif %}
+    }" :command="command" :data="data">
+        {% if image_left_header %}
+        <span slot="image-left-header">
+            {{ image_left_header }}
+        </span>
+        {% endif %}
+    </sly-iw-gallery>
+
+
+    {% if show_all_button %}
+    <!-- Gradient overlay -->
+    <div
+        style="position: absolute; z-index: 100; bottom: 20px; width: 100%; height: 100px; background: linear-gradient(to top, rgba(255, 255, 255, 1), transparent);">
+    </div>
+    <div
+        style="position: absolute; z-index: 100; bottom: 0; width: 100%; height: 20px; background: rgba(255, 255, 255, 1);">
+    </div>
+
+    <!-- 'Explore more' button -->
+    <div style="position: absolute; bottom: 20px; z-index: 101; display: flex; justify-content: center; width: 100%">
+        <el-button iw-widget-id="btn-1" type="primary" @click="command({
+                  method: 'update-gallery',
+                  payload: {
+                    data: {
+                      'key': 'explore',
+                      'limit': {{ click_gallery_items_limit}},
+                      'dataSource': '{{ click_data_source }}',
+                    },
+                    'galleryId': '{{ click_gallery_id }}',
+                  },
+                  internalCommand: true
+                })">Explore more</el-button>
+    </div>
+    {% endif %}
+</div>

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

@@ -0,0 +1,53 @@
+from typing import Dict
+
+from supervisely.io.fs import ensure_base_path
+from supervisely.nn.benchmark.visualization.widgets.widget import BaseWidget
+
+
+class MarkdownWidget(BaseWidget):
+    def __init__(
+        self,
+        name: str,
+        title: str,
+        text: str = None,
+    ) -> None:
+        super().__init__(name, title)
+        self.text = text
+        self.data_source = f"/data/{self.name}_{self.id}.md"
+        self.is_info_block = False
+        self.width_fit_content = False
+
+    def save_data(self, basepath: str) -> None:
+        # init data
+        basepath = basepath.rstrip("/")
+        ensure_base_path(basepath + self.data_source)
+
+        with open(basepath + self.data_source, "w") as f:
+            f.write(self.text)
+
+    def get_state(self) -> Dict:
+        return {}
+
+    def to_html(self) -> str:
+        style_class = "markdown-no-border"
+        if self.is_info_block:
+            style_class += " overview-info-block"
+        if self.width_fit_content:
+            style_class += " markdown-fit-content"
+
+        return f"""
+            <div style="margin-top: 10px;">
+                <sly-iw-markdown
+                id="{ self.id }"
+                class="{ style_class }"
+                iw-widget-id="{ self.id }"
+                :actions="{{
+                    'init': {{
+                    'dataSource': '{ self.data_source }',
+                    }},
+                }}"
+                :command="command"
+                :data="data"
+                />
+            </div>
+        """

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

@@ -0,0 +1,38 @@
+from typing import Dict
+
+from supervisely.nn.benchmark.visualization.widgets.widget import BaseWidget
+
+
+class NotificationWidget(BaseWidget):
+
+    def __init__(
+        self,
+        name: str,
+        title: str,
+        desc: str = None,
+    ) -> None:
+        super().__init__(name, title=title)
+        self.desc = desc
+
+    def save_data(self, basepath: str) -> None:
+        return
+
+    def get_state(self) -> Dict:
+        return {}
+
+    def to_html(self) -> str:
+        return f"""
+                    <div style="margin-top: 20px; margin-bottom: 20px;">
+                        <sly-iw-notification              
+                        iw-widget-id="{ self.id }"
+                        >
+                            <span slot="title">
+                                { self.title }
+                            </span>
+
+                            <span slot="description">
+                                { self.desc }
+                            </span>
+                        </sly-iw-notification>
+                    </div>
+        """

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

@@ -0,0 +1,67 @@
+from typing import Dict, List
+
+from jinja2 import Template
+
+from supervisely.nn.benchmark.visualization.widgets.widget import BaseWidget
+
+
+class SidebarWidget(BaseWidget):
+
+    def __init__(self, widgets: List[BaseWidget], anchors: List[str]) -> None:
+        self.widgets = widgets
+        self.anchors = anchors
+
+    def sidebar_template_str(self, widget: BaseWidget):
+        button_style = f"{{fontWeight: data.scrollIntoView === '{widget.id}' ? 'bold' : 'normal'}}"
+
+        return f"""
+            <div>
+                <el-button type="text" @click="data.scrollIntoView='{widget.id}'" :style="{button_style}">
+                {widget.title}
+                </el-button>
+            </div>
+        """
+
+    @property
+    def html_str(self):
+        anchored_widgets = sorted(
+            [widget for widget in self.widgets if widget.id in self.anchors],
+            key=lambda x: self.anchors.index(x.id),
+        )
+
+        sidebar_content = "".join(self.sidebar_template_str(widget) for widget in anchored_widgets)
+        main_content = "".join(
+            f"""
+            <div style="margin-top: 20px;">
+                {widget.to_html()}
+            </div>
+            """
+            for widget in self.widgets
+        )
+        template = f"""
+            <sly-iw-sidebar
+                :options="{{ height: 'calc(100vh - 130px)', clearMainPanelPaddings: true, leftSided: false, disableResize: true, sidebarWidth: 300 }}"
+            >
+                <div slot="sidebar">
+                    {sidebar_content}
+                </div>
+                <div style="padding-right: 35px;">
+                    {main_content}
+                </div>
+            </sly-iw-sidebar>
+        """
+
+        return template
+
+    def to_html(self) -> str:
+        return Template(self.html_str).render()
+
+    def save_data(self, basepath: str) -> None:
+        for widget in self.widgets:
+            widget.save_data(basepath)
+
+    def get_state(self) -> Dict:
+        state = {}
+        for widget in self.widgets:
+            state.update(widget.get_state())
+        return state

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

@@ -0,0 +1,116 @@
+import json
+from typing import Any, Dict, Optional, Union
+
+from jinja2 import Template
+
+from supervisely.io.fs import ensure_base_path
+from supervisely.nn.benchmark.visualization.widgets.widget import BaseWidget
+
+
+class TableWidget(BaseWidget):
+    def __init__(
+        self,
+        name: str,
+        data: Dict = None,
+        click_data: Any = None,
+        click_gellery_id: str = "",
+        fix_columns: int = 0,
+        show_header_controls: bool = True,
+        main_column: Optional[str] = None,
+        width: Optional[Union[int, str]] = None,
+        page_size: int = 10,
+    ) -> None:
+        super().__init__(name=name)
+        self.data = data
+        self.fix_columns = fix_columns
+        self.show_header_controls = show_header_controls
+        self.main_column = main_column
+        self.click_data = click_data
+        self.click_gellery_id = click_gellery_id
+
+        if isinstance(width, int):
+            width = f"width: {width}px"
+        elif isinstance(width, str):
+            width = f"width: {width.rstrip('%')}%"
+        self.width = width
+        self.page_size = page_size
+
+        self.clickable = self.click_data is not None
+
+    def save_data(self, basepath: str) -> None:
+        # init data
+        basepath = basepath.rstrip("/")
+        ensure_base_path(basepath + self.data_source)
+
+        with open(basepath + self.data_source, "w") as f:
+            json.dump(self.data, f)
+
+        # click data
+        if self.click_data is not None:
+            ensure_base_path(basepath + self.click_data_source)
+            with open(basepath + self.click_data_source, "w") as f:
+                json.dump(self.click_data, f)
+
+    def get_state(self) -> Dict:
+        return {}
+
+    def get_render_data(self) -> Dict:
+        return {
+            "widget_id": self.id,
+            "fixColumns": self.fix_columns,
+            "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,
+            "mainColumn": self.main_column,
+            "clickable": self.clickable,
+            "width": self.width or "",
+            "data": "data",
+            "command": "command",
+            "page_size": self.page_size,
+        }
+
+    def to_html(self) -> str:
+        template_str = """
+            <div style="margin-top: 20px; margin-bottom: 30px; {{ width }}">
+                <sly-iw-table
+                    iw-widget-id="{{ widget_id }}"
+                    {% if clickable %}
+                        style="cursor: pointer;"
+                    {% endif %}
+                    :options="{
+                        isRowClickable: '{{ clickable }}' === 'True',
+                        fixColumns: {{ fixColumns }}, 
+                        showHeaderControls: '{{ showHeaderControls }}' === 'True',
+                    }"
+                    :actions="{
+                    'init': {
+                        'dataSource': '{{ init_data_source }}',
+                        'perPage': {{ page_size }},
+                    },
+                        {% if clickable %}
+                    'chart-click': {
+                        'dataSource': '{{ table_click_data }}',
+                        'galleryId': '{{ table_gallery_id }}',
+                        'getKey':(payload)=>payload.row[0],
+                    },
+                        {% endif %}
+                    }"
+                :command="{{ command }}"
+                :data="{{ data }}"
+                >
+                    <span
+                    slot="custom-cell-content"
+                    slot-scope='{ row, column, cellValue }'
+                    >
+                    <div
+                        v-if="column === '{{ mainColumn }}'"
+                        class="fflex"
+                    >
+                        <b>{{ '{{cellValue}}' }}</b>
+                    </div>
+                    </span>
+                </sly-iw-table>
+            </div>
+        """
+        return Template(template_str).render(self.get_render_data())

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

@@ -0,0 +1,22 @@
+from typing import Optional
+
+from supervisely._utils import camel_to_snake, rand_str
+
+
+class BaseWidget:
+    def __init__(self, name: str = None, title: Optional[str] = None) -> None:
+        self.type = camel_to_snake(self.__class__.__name__)
+        self.id = f"{self.type}_{rand_str(5)}"
+        self.name = name
+        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"
+
+    def save_data(self, basepath: str) -> None:
+        raise NotImplementedError
+
+    def get_state(self) -> None:
+        raise NotImplementedError
+
+    def to_html(self) -> str:
+        raise NotImplementedError

supervisely/nn/inference/cache.py

@@ -1,18 +1,18 @@
 import json
 import os
 import shutil
+from concurrent.futures import ThreadPoolExecutor
 from enum import Enum
 from logging import Logger
 from pathlib import Path
 from threading import Lock, Thread
-from concurrent.futures import ThreadPoolExecutor
 from time import sleep
 from typing import Any, Callable, Generator, List, Optional, Tuple, Union
 
 import cv2
 import numpy as np
 from cacheout import Cache as CacheOut
-from cachetools import Cache, LRUCache, TTLCache, _Link
+from cachetools import Cache, LRUCache, TTLCache
 from fastapi import BackgroundTasks, FastAPI, Form, Request, UploadFile
 
 import supervisely as sly
@@ -83,7 +83,10 @@ class PersistentImageTTLCache(TTLCache):
             # pylint: disable=no-member
             link = self._TTLCache__getlink(key)
             # pylint: disable=no-member
-            link.expire = self._TTLCache__timer() + self._TTLCache__ttl
+            if hasattr(link, "expire"):
+                link.expire = self.timer() + self._TTLCache__ttl
+            else:
+                link.expires = self.timer() + self._TTLCache__ttl
         except KeyError:
             return
 
@@ -626,11 +629,11 @@ class InferenceImageCache:
                 pos_by_name[name] = pos
             elif return_images is True:
                 items.append((pos, name))
-        
+
         def get_one_image(item):
             pos, name = item
             return pos, self._cache.get_image(name)
-        
+
         if len(items) > 0:
             with ThreadPoolExecutor(min(64, len(items))) as executor:
                 for pos, image in executor.map(get_one_image, items):

{supervisely-6.73.213.dist-info → supervisely-6.73.215.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.213
+Version: 6.73.215
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely
@@ -20,7 +20,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cachetools<5.0.0,>=4.2.3
+Requires-Dist: cachetools<=5.5.0,>=4.2.3
 Requires-Dist: numpy<2.0.0,>=1.19
 Requires-Dist: opencv-python<5.0.0.0,>=4.5.5.62
 Requires-Dist: PTable<1.0.0,>=0.9.2
@@ -38,12 +38,12 @@ Requires-Dist: SimpleITK<3.0.0.0,>=2.1.1.2
 Requires-Dist: pydicom<3.0.0,>=2.3.0
 Requires-Dist: stringcase<2.0.0,>=1.2.0
 Requires-Dist: python-magic<1.0.0,>=0.4.25
-Requires-Dist: trimesh<4.0.0,>=3.11.2
+Requires-Dist: trimesh<=4.5.0,>=3.11.2
 Requires-Dist: uvicorn[standard]<1.0.0,>=0.18.2
 Requires-Dist: pydantic<=2.8.2,>=1.7.4
 Requires-Dist: anyio<=4.2.0,>=3.7.1
 Requires-Dist: fastapi<=0.109.0,>=0.79.0
-Requires-Dist: websockets<11.0,>=10.3
+Requires-Dist: websockets<=13.1,>=10.3
 Requires-Dist: jinja2<4.0.0,>=3.0.3
 Requires-Dist: psutil<6.0.0,>=5.9.0
 Requires-Dist: jsonpatch<2.0,>=1.32
@@ -71,7 +71,7 @@ Requires-Dist: zstd
 Provides-Extra: apps
 Requires-Dist: uvicorn[standard]<1.0.0,>=0.18.2; extra == "apps"
 Requires-Dist: fastapi<1.0.0,>=0.79.0; extra == "apps"
-Requires-Dist: websockets<11.0,>=10.3; extra == "apps"
+Requires-Dist: websockets<=13.1,>=10.3; extra == "apps"
 Requires-Dist: jinja2<4.0.0,>=3.0.3; extra == "apps"
 Requires-Dist: psutil<6.0.0,>=5.9.0; extra == "apps"
 Requires-Dist: jsonpatch<2.0,>=1.32; extra == "apps"