supervisely 6.73.289__py3-none-any.whl → 6.73.290__py3-none-any.whl

supervisely/api/image_api.py

@@ -78,6 +78,7 @@ from supervisely.project.project_type import (
 from supervisely.sly_logger import logger
 
 SUPPORTED_CONFLICT_RESOLUTIONS = ["skip", "rename", "replace"]
+API_DEFAULT_PER_PAGE = 500
 
 
 class ImageInfo(NamedTuple):
@@ -4486,7 +4487,7 @@ class ImageApi(RemoveableBulkModuleApi):
         force_metadata_for_links: Optional[bool] = True,
         only_labelled: Optional[bool] = False,
         fields: Optional[List[str]] = None,
-        per_page: Optional[int] = 500,
+        per_page: Optional[int] = None,
         semaphore: Optional[List[asyncio.Semaphore]] = None,
         **kwargs,
     ) -> AsyncGenerator[List[ImageInfo]]:
@@ -4529,13 +4530,33 @@ class ImageApi(RemoveableBulkModuleApi):
                     loop = sly.utils.get_or_create_event_loop()
                     images = loop.run_until_complete(api.image.get_list_async(123456, per_page=600))
         """
-
+        
         method = "images.list"
         dataset_info = kwargs.get("dataset_info", None)
 
         if dataset_info is None:
             dataset_info = self._api.dataset.get_info_by_id(dataset_id, raise_error=True)
 
+        if semaphore is None:
+            semaphore = self._api.get_default_semaphore()
+
+        if per_page is None:
+            async with semaphore:
+                # optimized request to get perPage value that predefined on Supervisely instance
+                response = await self._api.post_async(
+                    method,
+                    {
+                        ApiField.DATASET_ID: dataset_info.id,
+                        ApiField.FIELDS: [ApiField.ID, ApiField.PATH_ORIGINAL],
+                        ApiField.FILTER: [
+                            {ApiField.FIELD: ApiField.ID, ApiField.OPERATOR: "=", ApiField.VALUE: 1}
+                        ],
+                        ApiField.FORCE_METADATA_FOR_LINKS: False,
+                    },
+                )
+                response_json = response.json()
+            per_page = response_json.get("perPage", API_DEFAULT_PER_PAGE)
+
         total_pages = ceil(dataset_info.items_count / per_page)
 
         data = {
@@ -4562,9 +4583,6 @@ class ImageApi(RemoveableBulkModuleApi):
                 }
             ]
 
-        if semaphore is None:
-            semaphore = self._api.get_default_semaphore()
-
         async for page in self.get_list_page_generator_async(method, data, total_pages, semaphore):
             yield page
 

{supervisely-6.73.289.dist-info → supervisely-6.73.290.dist-info}/METADATA

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

{supervisely-6.73.289.dist-info → supervisely-6.73.290.dist-info}/RECORD

@@ -28,7 +28,7 @@ supervisely/api/dataset_api.py,sha256=GH7prDRJKyJlTv_7_Y-RkTwJN7ED4EkXNqqmi3iIdI
 supervisely/api/file_api.py,sha256=v2FsD3oljwNPqcDgEJRe8Bu5k0PYKzVhqmRb5QFaHAQ,83422
 supervisely/api/github_api.py,sha256=NIexNjEer9H5rf5sw2LEZd7C1WR-tK4t6IZzsgeAAwQ,623
 supervisely/api/image_annotation_tool_api.py,sha256=YcUo78jRDBJYvIjrd-Y6FJAasLta54nnxhyaGyanovA,5237
-supervisely/api/image_api.py,sha256=bSal6vB2c7Ct2qDarXTaTmXy7x0X1VlV8oTuT6YpY2o,191061
+supervisely/api/image_api.py,sha256=_hoFKsJpvHxrjoLronFNg348TGUn-OC0f5Nuq7IyFIk,191905
 supervisely/api/import_storage_api.py,sha256=BDCgmR0Hv6OoiRHLCVPKt3iDxSVlQp1WrnKhAK_Zl84,460
 supervisely/api/issues_api.py,sha256=BqDJXmNoTzwc3xe6_-mA7FDFC5QQ-ahGbXk_HmpkSeQ,17925
 supervisely/api/labeling_job_api.py,sha256=odnzZjp29yM16Gq-FYkv-OA4WFMNJCLFo4qSikW2A7c,56280
@@ -1071,9 +1071,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.289.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.289.dist-info/METADATA,sha256=RMgZIP_bwLgos0vF9tP2PFNzmKVI5h1VFkdK_bX7WKE,33573
-supervisely-6.73.289.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.289.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.289.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.289.dist-info/RECORD,,
+supervisely-6.73.290.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.290.dist-info/METADATA,sha256=B9crK8mR_VqKArU2r9540M7jiO3aypWHsKAcdeU0YKs,33573
+supervisely-6.73.290.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.290.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.290.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.290.dist-info/RECORD,,