supervisely 6.73.348__py3-none-any.whl → 6.73.350__py3-none-any.whl

supervisely/api/entity_annotation/figure_api.py

@@ -23,7 +23,7 @@ import numpy as np
 from requests_toolbelt import MultipartDecoder, MultipartEncoder
 from tqdm import tqdm
 
-from supervisely._utils import batched
+from supervisely._utils import batched, logger, run_coroutine
 from supervisely.api.module_api import ApiField, ModuleApi, RemoveableBulkModuleApi
 from supervisely.geometry.rectangle import Rectangle
 from supervisely.video_annotation.key_id_map import KeyIdMap
@@ -473,24 +473,24 @@ class FigureApi(RemoveableBulkModuleApi):
         :rtype: :class: `Dict[int, List[FigureInfo]]`
         """
         fields = [
-            "id",
-            "createdAt",
-            "updatedAt",
-            "imageId",
-            "objectId",
-            "classId",
-            "projectId",
-            "datasetId",
-            "geometry",
-            "geometryType",
-            "geometryMeta",
-            "tags",
-            "meta",
-            "area",
-            "priority",
+            ApiField.ID,
+            ApiField.CREATED_AT,
+            ApiField.UPDATED_AT,
+            ApiField.IMAGE_ID,
+            ApiField.OBJECT_ID,
+            ApiField.CLASS_ID,
+            ApiField.PROJECT_ID,
+            ApiField.DATASET_ID,
+            ApiField.GEOMETRY,
+            ApiField.GEOMETRY_TYPE,
+            ApiField.GEOMETRY_META,
+            ApiField.TAGS,
+            ApiField.META,
+            ApiField.AREA,
+            ApiField.PRIORITY,
         ]
         if skip_geometry is True:
-            fields = [x for x in fields if x != "geometry"]
+            fields = [x for x in fields if x != ApiField.GEOMETRY]
 
         if image_ids is None:
             filters = []
@@ -498,8 +498,8 @@ class FigureApi(RemoveableBulkModuleApi):
             filters = [
                 {
                     ApiField.FIELD: ApiField.ENTITY_ID,
-                    "operator": "in",
-                    "value": image_ids,
+                    ApiField.OPERATOR: "in",
+                    ApiField.VALUE: image_ids,
                 }
             ]
         data = {
@@ -784,3 +784,192 @@ class FigureApi(RemoveableBulkModuleApi):
 
         if tasks:
             await asyncio.gather(*tasks)
+
+    async def download_async(
+        self,
+        dataset_id: int,
+        image_ids: Optional[List[int]] = None,
+        skip_geometry: bool = False,
+        semaphore: Optional[asyncio.Semaphore] = None,
+        log_progress: bool = True,
+    ) -> Dict[int, List[FigureInfo]]:
+        """
+        Asynchronously download figures for the given dataset ID. Can be filtered by image IDs.
+        This method is significantly faster than the synchronous version for large datasets.
+
+        :param dataset_id: Dataset ID in Supervisely.
+        :type dataset_id: int
+        :param image_ids: Specify the list of image IDs within the given dataset ID. If image_ids is None, the method returns all possible pairs of images with figures.
+        :type image_ids: List[int], optional
+        :param skip_geometry: Skip the download of figure geometry. May be useful for a significant api request speed increase in the large datasets.
+        :type skip_geometry: bool
+        :param semaphore: Semaphore to limit the number of concurrent downloads.
+        :type semaphore: Optional[asyncio.Semaphore], optional
+        :param log_progress: If True, log the progress of the download.
+        :type log_progress: bool, optional
+        :return: A dictionary where keys are image IDs and values are lists of figures.
+        :rtype: Dict[int, List[FigureInfo]]
+
+        :Usage example:
+
+        .. code-block:: python
+
+            import supervisely as sly
+
+            os.environ['SERVER_ADDRESS'] = 'https://app.supervisely.com'
+            os.environ['API_TOKEN'] = 'Your Supervisely API Token'
+            api = sly.Api.from_env()
+
+            dataset_id = 12345
+            download_coroutine = api.image.figure.download_async(dataset_id)
+            figures = sly.run_coroutine(download_coroutine)
+        """
+        fields = [
+            ApiField.ID,
+            ApiField.CREATED_AT,
+            ApiField.UPDATED_AT,
+            ApiField.IMAGE_ID,
+            ApiField.OBJECT_ID,
+            ApiField.CLASS_ID,
+            ApiField.PROJECT_ID,
+            ApiField.DATASET_ID,
+            ApiField.GEOMETRY,
+            ApiField.GEOMETRY_TYPE,
+            ApiField.GEOMETRY_META,
+            ApiField.TAGS,
+            ApiField.META,
+            ApiField.AREA,
+            ApiField.PRIORITY,
+        ]
+        if skip_geometry is True:
+            fields = [x for x in fields if x != ApiField.GEOMETRY]
+
+        if image_ids is None:
+            filters = []
+        else:
+            filters = [
+                {
+                    ApiField.FIELD: ApiField.ENTITY_ID,
+                    ApiField.OPERATOR: "in",
+                    ApiField.VALUE: image_ids,
+                }
+            ]
+
+        data = {
+            ApiField.DATASET_ID: dataset_id,
+            ApiField.FIELDS: fields,
+            ApiField.FILTER: filters,
+        }
+
+        # Get first page to determine total pages
+        if semaphore is None:
+            semaphore = self._api.get_default_semaphore()
+        images_figures = defaultdict(list)
+        pages_count = None
+        total = 0
+        tasks = []
+
+        async def _get_page(page_data, page_num):
+            async with semaphore:
+                response = await self._api.post_async("figures.list", page_data)
+                response_json = response.json()
+                nonlocal pages_count, total
+                pages_count = response_json["pagesCount"]
+                if page_num == 1:
+                    total = response_json["total"]
+
+                page_figures = []
+                for info in response_json["entities"]:
+                    figure_info = self._convert_json_info(info, True)
+                    page_figures.append(figure_info)
+                return page_figures
+
+        # Get first page
+        data[ApiField.PAGE] = 1
+        first_page_figures = await _get_page(data, 1)
+
+        if log_progress:
+            progress_cb = tqdm(total=total, desc="Downloading figures")
+
+        for figure in first_page_figures:
+            images_figures[figure.entity_id].append(figure)
+            if log_progress:
+                progress_cb.update(1)
+
+        # Get rest of the pages in parallel
+        if pages_count > 1:
+            for page in range(2, pages_count + 1):
+                page_data = data.copy()
+                page_data[ApiField.PAGE] = page
+                tasks.append(asyncio.create_task(_get_page(page_data, page)))
+
+            for task in asyncio.as_completed(tasks):
+                page_figures = await task
+                for figure in page_figures:
+                    images_figures[figure.entity_id].append(figure)
+                    if log_progress:
+                        progress_cb.update(1)
+
+        return dict(images_figures)
+
+    def download_fast(
+        self,
+        dataset_id: int,
+        image_ids: Optional[List[int]] = None,
+        skip_geometry: bool = False,
+        semaphore: Optional[asyncio.Semaphore] = None,
+        log_progress: bool = True,
+    ) -> Dict[int, List[FigureInfo]]:
+        """
+        Download figures for the given dataset ID. Can be filtered by image IDs.
+        This method is significantly faster than the synchronous version for large datasets and
+        is designed to be used in an asynchronous context.
+        Will fallback to the synchronous version if async fails.
+
+        :param dataset_id: Dataset ID in Supervisely.
+        :type dataset_id: int
+        :param image_ids: Specify the list of image IDs within the given dataset ID. If image_ids is None, the method returns all possible pairs of images with figures.
+        :type image_ids: List[int], optional
+        :param skip_geometry: Skip the download of figure geometry. May be useful for a significant api request speed increase in the large datasets.
+        :type skip_geometry: bool
+        :param semaphore: Semaphore to limit the number of concurrent downloads.
+        :type semaphore: Optional[asyncio.Semaphore], optional
+        :param log_progress: If True, log the progress of the download.
+        :type log_progress: bool, optional
+
+        :return: A dictionary where keys are image IDs and values are lists of figures.
+        :rtype: Dict[int, List[FigureInfo]]
+
+        :Usage example:
+
+        .. code-block:: python
+
+            import supervisely as sly
+
+            os.environ['SERVER_ADDRESS'] = 'https://app.supervisely.com'
+            os.environ['API_TOKEN'] = 'Your Supervisely API Token'
+            api = sly.Api.from_env()
+
+            dataset_id = 12345
+            figures = api.image.figure.download_fast(dataset_id)
+        """
+        try:
+            return run_coroutine(
+                self.download_async(
+                    dataset_id=dataset_id,
+                    image_ids=image_ids,
+                    skip_geometry=skip_geometry,
+                    semaphore=semaphore,
+                    log_progress=log_progress,
+                )
+            )
+        except Exception:
+            # Fallback to the synchronous version if async fails
+            logger.debug("Async download of figures is failed, falling back to sync download.")
+            if log_progress:
+                logger.debug("Downloading figures without progress bar.")
+            return self.download(
+                dataset_id=dataset_id,
+                image_ids=image_ids,
+                skip_geometry=skip_geometry,
+            )

supervisely/app/fastapi/index.html

@@ -70,6 +70,7 @@
   {% if __webpy_script__ %}
   <script src="https://cdn.jsdelivr.net/pyodide/{{{pyodide_version}}}/full/pyodide.js"></script>
   {% endif %}
+  <script src="https://cdn.jsdelivr.net/npm/socket.io-client@2.0.4/dist/socket.io.js"></script>
   <script
     src="https://cdn.jsdelivr.net/gh/supervisely/js-bundle@{{{js_bundle_version}}}/sly-app-widgets-{{{js_bundle_version}}}.bundle.js"></script>
   <script type="module"
@@ -257,4 +258,4 @@ if state.get("app_initializing", False) == True:
   {% endif %}
 </body>
 
-</html>
+</html>

supervisely/app/fastapi/templating.py

@@ -14,7 +14,7 @@ from supervisely.app.widgets_context import JinjaWidgets
 js_bundle_version = "2.1.99"
 
 # https://github.com/supervisely-ecosystem/supervisely-app-frontend-js
-js_frontend_version = "v0.0.55"
+js_frontend_version = "v0.0.56"
 
 
 pyodide_version = "v0.25.0"

{supervisely-6.73.348.dist-info → supervisely-6.73.350.dist-info}/METADATA

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

{supervisely-6.73.348.dist-info → supervisely-6.73.350.dist-info}/RECORD

@@ -50,7 +50,7 @@ supervisely/api/video_annotation_tool_api.py,sha256=3A9-U8WJzrTShP_n9T8U01M9FzGY
 supervisely/api/workspace_api.py,sha256=5KAxpI9DKBmgF_pyQaXHpGT30HZ9wRtR6DP3FoYFZtY,9228
 supervisely/api/entity_annotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/api/entity_annotation/entity_annotation_api.py,sha256=K79KdDyepQv4FiNQHBj9V4-zLIemxK9WG1ig1bfBKb8,3083
-supervisely/api/entity_annotation/figure_api.py,sha256=_v7Nhi63Ksw1OE38ZvFwj9F4O0GNmf96U3gFyGTs4Hs,27776
+supervisely/api/entity_annotation/figure_api.py,sha256=rmsE3L_JfqN94sLN637pQ0syiBAXPd8RyAwhl41j1xs,35318
 supervisely/api/entity_annotation/object_api.py,sha256=gbcNvN_KY6G80Me8fHKQgryc2Co7VU_kfFd1GYILZ4E,8875
 supervisely/api/entity_annotation/tag_api.py,sha256=M-28m9h8R4k9Eqo6P1S0UH8_D5kqCwAvQLYY6_Yz4oM,11161
 supervisely/api/pointcloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -90,12 +90,12 @@ supervisely/app/development/sly-net.sh,sha256=-EVburj4NtS7Dw4OiwXXolYu9SXvui83F-
 supervisely/app/fastapi/__init__.py,sha256=kNhkaGuBKn9-GNnPOmikIHqhjL-j66xmZaBbjCmXfAo,460
 supervisely/app/fastapi/custom_static_files.py,sha256=5todaVIvUG9sAt6vu1IujJn8N7zTmFhVUfeCVbuXbvc,3391
 supervisely/app/fastapi/dialog_window.html,sha256=ffaAxjK0TQRa7RrY5oA4uE6RzFuS0VnRG1pfoIzTqVM,1183
-supervisely/app/fastapi/index.html,sha256=6K8akK7_k9Au-BpZ7cM2qocuiegLdXz8UFPnWg8TepI,7987
+supervisely/app/fastapi/index.html,sha256=ympsbjKHauNbCqDNAb-hjFM6UnOMRJf2VYEkSQFYpPk,8084
 supervisely/app/fastapi/no_html_main.html,sha256=NhQP7noyORBx72lFh1CQKgBRupkWjiq6Gaw-9Hkvg7c,37
 supervisely/app/fastapi/offline.py,sha256=CwMMkJ1frD6wiZS-SEoNDtQ1UJcJe1Ob6ohE3r4CQL8,7414
 supervisely/app/fastapi/request.py,sha256=NU7rKmxJ1pfkDZ7_yHckRcRAueJRQIqCor11UO2OHr8,766
 supervisely/app/fastapi/subapp.py,sha256=5lMfFLYBfHzE1OmITHsogB9hScyTJFjGV45AKY67Hkg,45647
-supervisely/app/fastapi/templating.py,sha256=3X69vo-_RO2tlaVz5obifXjrNEIHVSNVQFNm_xjOMe4,2929
+supervisely/app/fastapi/templating.py,sha256=pcghBW2OWVrNtplZuYa-mx04ektLiSvnBg-mhmyCoJc,2929
 supervisely/app/fastapi/utils.py,sha256=t_UquzlFrdkKtAJmH6eJ279pE8Aa3BaIu4XjX-SEaIE,946
 supervisely/app/fastapi/websocket.py,sha256=TlRSPOAhRItTv1HGvdukK1ZvhRjMUxRa-lJlsRR9rJw,1308
 supervisely/app/v1/__init__.py,sha256=OdU0PYv6hLwahYoyaLFO8m3cbJSchvPbqxuG1N3T734,848
@@ -1083,9 +1083,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.348.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.348.dist-info/METADATA,sha256=Heozuyuf1zukvQzantkbHHyMXh1S4WnVFvWm0p4JIE8,33596
-supervisely-6.73.348.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.348.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.348.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.348.dist-info/RECORD,,
+supervisely-6.73.350.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.350.dist-info/METADATA,sha256=2hZYrEUmL3RyDgh_rG9RU5RdHEfNB7aRGMhQysvHAk4,33596
+supervisely-6.73.350.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.350.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.350.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.350.dist-info/RECORD,,