supervisely 6.73.229__tar.gz → 6.73.231__tar.gz

{supervisely-6.73.229/supervisely.egg-info → supervisely-6.73.231}/PKG-INFO

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

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/api/entity_annotation/tag_api.py

@@ -74,7 +74,7 @@ class TagApi(ModuleApi):
 
         :param project_id: :class:`Dataset<supervisely.project.project.Project>` ID in Supervisely.
         :type project_id: int
-        :param filters: List of parameters to sort output tags. See: https://dev.supervise.ly/api-docs/#tag/Advanced/paths/~1tags.list/get
+        :param filters: List of parameters to sort output tags. See: https://api.docs.supervisely.com/#tag/Advanced/paths/~1tags.list/get
         :type filters: List[Dict[str, str]], optional
         :return: List of the tags from the project with given id.
         :rtype: list

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/api/image_api.py

@@ -325,6 +325,7 @@ class ImageApi(RemoveableBulkModuleApi):
         return_first_response: Optional[bool] = False,
         project_id: Optional[int] = None,
         only_labelled: Optional[bool] = False,
+        fields: Optional[List[str]] = None,
     ) -> List[ImageInfo]:
         """
         List of Images in the given :class:`Dataset<supervisely.project.project.Dataset>`.
@@ -347,6 +348,8 @@ class ImageApi(RemoveableBulkModuleApi):
         :type project_id: :class:`int`
         :param only_labelled: If True, returns only images with labels.
         :type only_labelled: bool, optional
+        :param fields: List of fields to return. If None, returns all fields.
+        :type fields: List[str], optional
         :return: Objects with image information from Supervisely.
         :rtype: :class:`List[ImageInfo]<ImageInfo>`
         :Usage example:
@@ -419,7 +422,8 @@ class ImageApi(RemoveableBulkModuleApi):
                     },
                 }
             ]
-
+        if fields is not None:
+            data[ApiField.FIELDS] = fields
         return self.get_list_all_pages(
             "images.list",
             data=data,

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/api/pointcloud/pointcloud_api.py

@@ -232,7 +232,7 @@ class PointcloudApi(RemoveableBulkModuleApi):
 
         :param dataset_id: :class:`Dataset<supervisely.project.project.Dataset>` ID in Supervisely.
         :type dataset_id: int
-        :param filters: List of parameters to sort output Pointclouds. See: https://dev.supervise.ly/api-docs/#tag/Point-Clouds/paths/~1point-clouds.list/get
+        :param filters: List of parameters to sort output Pointclouds. See: https://api.docs.supervisely.com/#tag/Point-Clouds/paths/~1point-clouds.list/get
         :type filters: List[Dict[str, str]], optional
         :return: List of the point clouds objects from the dataset with given id.
         :rtype: :class:`List[PointcloudInfo]`
@@ -407,7 +407,7 @@ class PointcloudApi(RemoveableBulkModuleApi):
             #     'hash': 'vxA+emfDNUkFP9P6oitMB5Q0rMlnskmV2jvcf47OjGU=',
             #     'link': None,
             #     'preview': '/previews/q/ext:jpeg/resize:fill:50:0:0/q:50/plain/h5ad-public/images/original/S/j/hJ/PwMg.png',
-            #     'fullStorageUrl': 'https://dev.supervise.ly/hs4-public/images/original/S/j/hJ/PwMg.png',
+            #     'fullStorageUrl': 'https://app.supervisely.com/hs4-public/images/original/S/j/hJ/PwMg.png',
             #     'name': 'img00'
             # }
         """

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/api/video/video_api.py

@@ -339,16 +339,22 @@ class VideoApi(RemoveableBulkModuleApi):
         dataset_id: int,
         filters: Optional[List[Dict[str, str]]] = None,
         raw_video_meta: Optional[bool] = False,
+        fields: Optional[List[str]] = None,
+        force_metadata_for_links: Optional[bool] = False,
     ) -> List[VideoInfo]:
         """
         Get list of information about all videos for a given dataset ID.
 
         :param dataset_id: :class:`Dataset<supervisely.project.project.Dataset>` ID in Supervisely.
         :type dataset_id: int
-        :param filters: List of parameters to sort output Videos. See: https://dev.supervise.ly/api-docs/#tag/Videos/paths/~1videos.list/get
+        :param filters: List of parameters to sort output Videos. See: https://api.docs.supervisely.com/#tag/Videos/paths/~1videos.list/get
         :type filters: List[Dict[str, str]], optional
         :param raw_video_meta: Get normalized metadata from server if False.
         :type raw_video_meta: bool
+        :param fields: List of fields to return.
+        :type fields: List[str], optional
+        :param force_metadata_for_links: Specify whether to force retrieving video metadata from the server.
+        :type force_metadata_for_links: Optional[bool]
         :return: List of information about videos in given dataset.
         :rtype: :class:`List[VideoInfo]`
 
@@ -372,15 +378,15 @@ class VideoApi(RemoveableBulkModuleApi):
             print(filtered_video_infos)
             # Output: [VideoInfo(id=19371139, ...)]
         """
-
-        return self.get_list_all_pages(
-            "videos.list",
-            {
-                ApiField.DATASET_ID: dataset_id,
-                ApiField.FILTER: filters or [],
-                ApiField.RAW_VIDEO_META: raw_video_meta,
-            },
-        )
+        data = {
+            ApiField.DATASET_ID: dataset_id,
+            ApiField.FILTER: filters or [],
+            ApiField.RAW_VIDEO_META: raw_video_meta,
+            ApiField.FORCE_METADATA_FOR_LINKS: force_metadata_for_links,
+        }
+        if fields is not None:
+            data[ApiField.FIELDS] = fields
+        return self.get_list_all_pages("videos.list", data)
 
     def get_list_generator(
         self,
@@ -391,6 +397,7 @@ class VideoApi(RemoveableBulkModuleApi):
         limit: Optional[int] = None,
         raw_video_meta: Optional[bool] = False,
         batch_size: Optional[int] = None,
+        force_metadata_for_links: Optional[bool] = False,
     ) -> Iterator[List[VideoInfo]]:
         data = {
             ApiField.DATASET_ID: dataset_id,
@@ -399,6 +406,7 @@ class VideoApi(RemoveableBulkModuleApi):
             ApiField.SORT_ORDER: sort_order,
             ApiField.RAW_VIDEO_META: raw_video_meta,
             ApiField.PAGINATION_MODE: ApiField.TOKEN,
+            ApiField.FORCE_METADATA_FOR_LINKS: force_metadata_for_links,
         }
         if batch_size is not None:
             data[ApiField.PER_PAGE] = batch_size
@@ -426,7 +434,7 @@ class VideoApi(RemoveableBulkModuleApi):
         :type id: int
         :param raise_error: Return an error if the video info was not received.
         :type raise_error: bool
-        :param force_metadata_for_links: Get video metadata from server (if the video is uploaded as a link)
+        :param force_metadata_for_links: Specify whether to force retrieving video metadata from the server.
         :type force_metadata_for_links: bool
         :return: Information about Video. See :class:`info_sequence<info_sequence>`
         :rtype: :class:`VideoInfo`
@@ -506,7 +514,7 @@ class VideoApi(RemoveableBulkModuleApi):
         :type ids: List[int]
         :param progress_cb: Function for tracking download progress.
         :type progress_cb: Optional[Union[tqdm, Callable]]
-        :param force_metadata_for_links: Get normalized metadata from server.
+        :param force_metadata_for_links: Specify whether to force retrieving video metadata from the server.
         :type force_metadata_for_links: bool
         :return: List of information about Videos. See :class:`info_sequence<info_sequence>`.
         :rtype: List[VideoInfo]
@@ -580,6 +588,8 @@ class VideoApi(RemoveableBulkModuleApi):
         :type id: int
         :param raise_error: Return an error if the video info was not received.
         :type raise_error: bool
+        :param force_metadata_for_links: Specify whether to force retrieving video metadata from the server.
+        :type force_metadata_for_links: bool
         :return: Information about Video. See :class:`info_sequence<info_sequence>`
         :rtype: dict
 
@@ -967,6 +977,7 @@ class VideoApi(RemoveableBulkModuleApi):
                 links_names,
                 metas=links_metas,
                 skip_download=True,
+                force_metadata_for_links=False,
             )
 
             for info, pos in zip(res_infos_links, links_order):
@@ -1042,7 +1053,7 @@ class VideoApi(RemoveableBulkModuleApi):
         if len(set(vid_info.dataset_id for vid_info in ids_info)) > 1:
             raise ValueError("Videos ids have to be from the same dataset")
 
-        existing_videos = self.get_list(dst_dataset_id)
+        existing_videos = self.get_list(dst_dataset_id, force_metadata_for_links=False)
         existing_names = {video.name for video in existing_videos}
 
         if change_name_if_conflict:
@@ -1846,7 +1857,7 @@ class VideoApi(RemoveableBulkModuleApi):
         :type skip_download: Optional[bool]
         :param progress_cb: Function for tracking the progress of copying.
         :type progress_cb: tqdm or callable, optional
-        :param force_metadata_for_links: Specify if metadata should be forced. Default is True.
+        :param force_metadata_for_links: Specify whether to force retrieving videos metadata from the server after upload
         :type force_metadata_for_links: Optional[bool]
         :return: List with information about Videos. See :class:`info_sequence<info_sequence>`
         :rtype: :class:`List[VideoInfo]`
@@ -1939,6 +1950,7 @@ class VideoApi(RemoveableBulkModuleApi):
         hash: Optional[str] = None,
         meta: Optional[List[Dict]] = None,
         skip_download: Optional[bool] = False,
+        force_metadata_for_links: Optional[bool] = True,
     ):
         """
         Upload Video from given link to Dataset.
@@ -1957,6 +1969,8 @@ class VideoApi(RemoveableBulkModuleApi):
         :type meta: List[Dict], optional
         :param skip_download: Skip download video to local storage.
         :type skip_download: Optional[bool]
+        :param force_metadata_for_links: Specify whether to force retrieving video metadata from the server after upload
+        :type force_metadata_for_links: Optional[bool]
         :return: List with information about Video. See :class:`info_sequence<info_sequence>`
         :rtype: :class:`List[VideoInfo]`
 
@@ -2041,6 +2055,7 @@ class VideoApi(RemoveableBulkModuleApi):
             hashes=[h],
             metas=[meta],
             skip_download=skip_download,
+            force_metadata_for_links=force_metadata_for_links
         )
         if len(links) != 1:
             raise RuntimeError(
@@ -2216,7 +2231,7 @@ class VideoApi(RemoveableBulkModuleApi):
         :rtype: List[str]
         """
 
-        videos_in_dataset = self.get_list(dataset_id)
+        videos_in_dataset = self.get_list(dataset_id, force_metadata_for_links=False)
         used_names = {video_info.name for video_info in videos_in_dataset}
         new_names = [
             generate_free_name(used_names, name, with_ext=True, extend_used_names=True)
@@ -2242,7 +2257,7 @@ class VideoApi(RemoveableBulkModuleApi):
         :return: None
         :rtype: None
         """
-        videos_in_dataset = self.get_list(dataset_id)
+        videos_in_dataset = self.get_list(dataset_id, force_metadata_for_links=False)
         used_names = {video_info.name for video_info in videos_in_dataset}
         name_intersections = used_names.intersection(set(names))
         if message is None:

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/api/volume/volume_api.py

@@ -65,7 +65,7 @@ class VolumeInfo(NamedTuple):
                 'rescaleIntercept': 0
             },
             path_original='/h5af-public/images/original/M/e/7R/vsytec8zX0p.nrrd',
-            full_storage_url='https://dev.supervise.ly/h5un-public/images/original/M/e/7R/zX0p.nrrd',
+            full_storage_url='https://app.supervisely.com/h5un-public/images/original/M/e/7R/zX0p.nrrd',
             tags=[],
             team_id=435,
             workspace_id=685,
@@ -260,7 +260,7 @@ class VolumeApi(RemoveableBulkModuleApi):
 
         :param dataset_id: :class:`Dataset<supervisely.project.project.Dataset>` ID in Supervisely.
         :type dataset_id: int
-        :param filters: List of parameters to sort output Volumes. See: https://dev.supervise.ly/api-docs/#tag/Volumes/paths/~1volumes.list/get
+        :param filters: List of parameters to sort output Volumes. See: https://api.docs.supervisely.com/#tag/Volumes/paths/~1volumes.list/get
         :type filters: List[Dict[str, str]], optional
         :param sort: Attribute to sort the list by. The default is "id". Valid values are "id", "name", "description", "createdAt", "updatedAt".
         :type sort: :class:`str`
@@ -349,7 +349,7 @@ class VolumeApi(RemoveableBulkModuleApi):
             #         'rescaleIntercept': 0
             #     },
             #     path_original='/h5af-public/images/original/M/e/7R/vs0p.nrrd',
-            #     full_storage_url='https://dev.supervise.ly/.../original/M/e/7R/zX0p.nrrd',
+            #     full_storage_url='https://app.supervisely.com/.../original/M/e/7R/zX0p.nrrd',
             #     tags=[],
             #     team_id=435,
             #     workspace_id=685,
@@ -435,7 +435,7 @@ class VolumeApi(RemoveableBulkModuleApi):
             #         'rescaleIntercept': 0
             #     },
             #     path_original='/h5af-public/images/original/M/e/7R/zfsfX0p.nrrd',
-            #     full_storage_url='https://dev.supervise.ly/h5un-public/images/original/M/e/7R/zXdd0p.nrrd',
+            #     full_storage_url='https://app.supervisely.com/h5un-public/images/original/M/e/7R/zXdd0p.nrrd',
             #     tags=[],
             #     team_id=435,
             #     workspace_id=685,

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/app/fastapi/subapp.py

@@ -762,7 +762,7 @@ def _init(
             await StateJson.from_request(request)
 
         if not ("application/json" not in request.headers.get("Content-Type", "")):
-            # {'command': 'inference_batch_ids', 'context': {}, 'state': {'dataset_id': 49711, 'batch_ids': [3120204], 'settings': None}, 'user_api_key': 'XXX', 'api_token': 'XXX', 'instance_type': None, 'server_address': 'https://dev.supervise.ly'}
+            # {'command': 'inference_batch_ids', 'context': {}, 'state': {'dataset_id': 49711, 'batch_ids': [3120204], 'settings': None}, 'user_api_key': 'XXX', 'api_token': 'XXX', 'instance_type': None, 'server_address': 'https://app.supervisely.com'}
             content = await request.json()
 
             request.state.context = content.get("context")

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/app/v1/__init__.py

@@ -14,4 +14,4 @@
 # }
 
 # context_root: Download as, Run App (default), Report
-# [![Views](https://dev.supervise.ly/public/api/v3/ecosystem.counters?repo=supervisely-ecosystem/roads-test&counter=views&label=custom)](https://supervise.ly)
+# [![Views](https://app.supervisely.com/public/api/v3/ecosystem.counters?repo=supervisely-ecosystem/roads-test&counter=views&label=custom)](https://supervisely.com)

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/convert/video/video_converter.py

@@ -123,7 +123,8 @@ class VideoConverter(BaseConverter):
 
         meta, renamed_classes, renamed_tags = self.merge_metas_with_conflicts(api, dataset_id)
 
-        existing_names = set([vid.name for vid in api.video.get_list(dataset_id)])
+        videos_in_dataset = api.video.get_list(dataset_id, force_metadata_for_links=False)
+        existing_names = {video_info.name for video_info in videos_in_dataset}
 
         # check video codecs, mimetypes and convert if needed
         convert_progress, convert_progress_cb = self.get_progress(

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/imaging/image.py

@@ -1386,3 +1386,17 @@ def get_labeling_tool_link(url: str, name: Optional[str] = "open in labeling too
     :rtype: str
     """
     return f'<a href="{url}" rel="noopener noreferrer" target="_blank">{name}<i class="zmdi zmdi-open-in-new" style="margin-left: 5px"></i></a>'
+
+
+def get_size_from_bytes(data: bytes) -> Tuple[int, int]:
+    """
+    Get size of image from bytes.
+
+    :param data: Bytes of image.
+    :type data: bytes
+    :return: Height and width of image
+    :rtype: :class:`Tuple[int, int]`
+    """
+    image = PILImage.open(io.BytesIO(data))
+    width, height = image.size
+    return width, height

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/pointcloud/pointcloud.py

@@ -233,7 +233,7 @@ def get_labeling_tool_url(dataset_id: int, pointcloud_id: int):
 
         print(url)
         # Output:
-        # https://dev.supervise.ly/app/point-clouds/?datasetId=55875&pointCloudId=19373403
+        # https://app.supervisely.com/app/point-clouds/?datasetId=55875&pointCloudId=19373403
     """
 
     res = f"/app/point-clouds/?datasetId={dataset_id}&pointCloudId={pointcloud_id}"
@@ -280,7 +280,7 @@ def get_labeling_tool_link(url, name="open in labeling tool"):
         print(link)
         # Output:
         # <a
-        #     href="https://dev.supervise.ly/app/point-clouds/?datasetId=55875&pointCloudId=19373403"
+        #     href="https://app.supervisely.com/app/point-clouds/?datasetId=55875&pointCloudId=19373403"
         #     rel="noopener noreferrer"
         #     target="_blank"
         # >

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/pointcloud_episodes/pointcloud_episodes.py

@@ -37,7 +37,7 @@ def get_labeling_tool_url(dataset_id, pointcloud_id):
 
         print(url)
         # Output:
-        # https://dev.supervise.ly/app/point-clouds-tracking/?datasetId=55875&pointCloudId=19373403
+        # https://app.supervisely.com/app/point-clouds-tracking/?datasetId=55875&pointCloudId=19373403
     """
 
     res = f"/app/point-clouds-tracking/?datasetId={dataset_id}&pointCloudId={pointcloud_id}"
@@ -72,7 +72,7 @@ def get_labeling_tool_link(url, name="open in labeling tool"):
         api = sly.Api.from_env()
 
         # Pass values into the API constructor (optional, not recommended)
-        # api = sly.Api(server_address="https://app.supervise.ly", token="4r47N...xaTatb")
+        # api = sly.Api(server_address="https://app.supervisely.com", token="4r47N...xaTatb")
 
         pointcloud_id = 19373403
         pcd_info = api.pointcloud.get_info_by_id(pointcloud_id)
@@ -84,7 +84,7 @@ def get_labeling_tool_link(url, name="open in labeling tool"):
         print(link)
         # Output:
         # <a
-        #     href="https://dev.supervise.ly/app/point-clouds/?datasetId=55875&pointCloudId=19373403"
+        #     href="https://app.supervisely.com/app/point-clouds/?datasetId=55875&pointCloudId=19373403"
         #     rel="noopener noreferrer"
         #     target="_blank"
         # >

{supervisely-6.73.229 → supervisely-6.73.231}/supervisely/project/project.py

@@ -4418,7 +4418,12 @@ async def _download_project_async(
         else:
             dataset_fs = project_fs.create_dataset(dataset.name, dataset_path)
 
-        all_images = api.image.get_list(dataset_id, force_metadata_for_links=False)
+        force_metadata_for_links = False
+        if save_images is False and only_image_tags is True:
+            force_metadata_for_links = True
+        all_images = api.image.get_list(
+            dataset_id, force_metadata_for_links=force_metadata_for_links
+        )
         images = [image for image in all_images if images_ids is None or image.id in images_ids]
 
         ds_progress = progress_cb
@@ -4499,6 +4504,9 @@ async def _download_project_item_async(
         img_bytes = await api.image.download_bytes_single_async(
             img_info.id, semaphore=semaphore, check_hash=True
         )
+        if None in [img_info.height, img_info.width]:
+            width, height = sly.image.get_size_from_bytes(img_bytes)
+            img_info = img_info._replace(height=height, width=width)
     else:
         img_bytes = None
 
@@ -4506,9 +4514,13 @@ async def _download_project_item_async(
         ann_info = await api.annotation.download_async(
             img_info.id,
             semaphore=semaphore,
-            force_metadata_for_links=False,
+            force_metadata_for_links=not save_images,
         )
         ann_json = ann_info.annotation
+        tmp_ann = Annotation.from_json(ann_json, meta)
+        if None in tmp_ann.img_size:
+            tmp_ann = tmp_ann.clone(img_size=(img_info.height, img_info.width))
+            ann_json = tmp_ann.to_json()
     else:
         tags = TagCollection.from_api_response(
             img_info.tags,

{supervisely-6.73.229 → supervisely-6.73.231/supervisely.egg-info}/PKG-INFO

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

{supervisely-6.73.229 → supervisely-6.73.231}/tests/test_async_image_api.py

@@ -116,6 +116,6 @@ if __name__ == "__main__":
         main_dps()  # to download and save images as files (batch)
         # compare_main_dps()  # to compare the time taken for downloading images as files (batch)
         # main_bytes()  # to download and save image as bytes
-        # main_n_bytes()  # to download and save images as bytes (batch)
+        # main_n_bytes()  # to download and save images as bytes (batch)        
     except KeyboardInterrupt:
         sly.logger.info("Stopped by user")