supervisely 6.73.289__tar.gz → 6.73.291__tar.gz

{supervisely-6.73.289/supervisely.egg-info → supervisely-6.73.291}/PKG-INFO

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

{supervisely-6.73.289 → supervisely-6.73.291}/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):
@@ -1027,7 +1028,10 @@ class ImageApi(RemoveableBulkModuleApi):
         return results
 
     def check_existing_links(
-        self, links: List[str], progress_cb: Optional[Union[tqdm, Callable]] = None
+        self,
+        links: List[str],
+        progress_cb: Optional[Union[tqdm, Callable]] = None,
+        team_id: Optional[int] = None,
     ) -> List[str]:
         """
         Checks existing links for Images.
@@ -1036,6 +1040,8 @@ class ImageApi(RemoveableBulkModuleApi):
         :type links: List[str]
         :param progress_cb: Function for tracking progress of checking.
         :type progress_cb: tqdm or callable, optional
+        :param team_id: Team ID in Supervisely (will be used to get remote storage settings).
+        :type team_id: int
         :return: List of existing links
         :rtype: List[str]
         """
@@ -1043,9 +1049,9 @@ class ImageApi(RemoveableBulkModuleApi):
         if len(links) == 0:
             return []
 
-        def _is_image_available(url, progress_cb=None):
+        def _is_image_available(url, team_id, progress_cb=None):
             if self._api.remote_storage.is_bucket_url(url):
-                response = self._api.remote_storage.is_path_exist(url)
+                response = self._api.remote_storage.is_path_exist(url, team_id)
                 result = url if response else None
             else:
                 response = requests.head(url)
@@ -1054,7 +1060,9 @@ class ImageApi(RemoveableBulkModuleApi):
                 progress_cb(1)
             return result
 
-        _is_image_available_with_progress = partial(_is_image_available, progress_cb=progress_cb)
+        _is_image_available_with_progress = partial(
+            _is_image_available, team_id=team_id, progress_cb=progress_cb
+        )
 
         with ThreadPoolExecutor(max_workers=20) as executor:
             results = list(executor.map(_is_image_available_with_progress, links))
@@ -4486,7 +4494,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 +4537,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 +4590,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 → supervisely-6.73.291}/supervisely/api/module_api.py

@@ -617,6 +617,8 @@ class ApiField:
     """"""
     CUSTOM_SORT = "customSort"
     """"""
+    GROUP_ID = "groupId"
+    """"""
 
 
 def _get_single_item(items):

{supervisely-6.73.289 → supervisely-6.73.291}/supervisely/api/remote_storage_api.py

@@ -1,14 +1,15 @@
 # coding: utf-8
-from typing import Optional, Callable, Union, List
+import mimetypes
+from typing import Callable, List, Optional, Union
 
+from requests_toolbelt import MultipartEncoder
 from tqdm import tqdm
 
-from supervisely.api.module_api import ModuleApiBase, ApiField
+from supervisely import logger
+from supervisely.api.module_api import ApiField, ModuleApiBase
 from supervisely.collection.str_enum import StrEnum
+from supervisely.io import env
 from supervisely.io.fs import ensure_base_path, get_file_name_with_ext
-from supervisely import logger
-from requests_toolbelt import MultipartEncoder
-import mimetypes
 
 
 class Provider(StrEnum):
@@ -53,30 +54,38 @@ class RemoteStorageApi(ModuleApiBase):
     def get_file_info_by_path(
         self,
         path: str,
-    ) -> dict:
+        team_id: int = None,
+    ) -> Optional[dict]:
         """
         Get info about file for given remote path.
 
         :param path: Remote path to file.
         :type path: str
-        :returns: List of files in the given remote path
-        :rtype: dict
+        :param team_id: Team ID (to get cloud storages connected to the team)
+        :type team_id: int
+        :returns: file  info in the given remote path
+        :rtype: Optional[dict]
 
         """
-
+        team_id = team_id or env.team_id(raise_not_found=False)
         Provider.validate_path(path)
         path = path.rstrip("/")
-        resp = self._api.get(
-            "remote-storage.list",
-            {
-                ApiField.PATH: path,
-                "recursive": False,
-                "files": True,
-                "folders": False,
-                "limit": 1,
-                "startAfter": "",
-            },
-        )
+
+        json_body = {
+            ApiField.PATH: path,
+            ApiField.RECURSIVE: False,
+            ApiField.FILES: True,
+            ApiField.FOLDERS: False,
+            ApiField.LIMIT: 1,
+            "startAfter": "",
+        }
+        if team_id is not None:
+            json_body[ApiField.GROUP_ID] = team_id
+
+        resp = self._api.get("remote-storage.list", json_body)
+        if resp is None:
+            return None
+
         return resp.json()[0]
 
     def list(
@@ -87,6 +96,7 @@ class RemoteStorageApi(ModuleApiBase):
         folders: bool = True,
         limit: int = 10000,
         start_after: str = "",
+        team_id: int = None,
     ) -> list:
         """
         List files and directories for given remote path.
@@ -103,28 +113,39 @@ class RemoteStorageApi(ModuleApiBase):
         :type limit: int
         :param start_after: Start listing path after given file name.
         :type start_after: str
+        :param team_id: Team ID (to get cloud storages connected to the team)
+        :type team_id: int
         :returns: List of files in the given remote path
-        :rtype: dict
+        :rtype: list
 
         """
+        team_id = team_id or env.team_id(raise_not_found=False)
 
         Provider.validate_path(path)
         path = path.rstrip("/") + "/"
-        resp = self._api.get(
-            "remote-storage.list",
-            {
-                ApiField.PATH: path,
-                "recursive": recursive,
-                "files": files,
-                "folders": folders,
-                "limit": limit,
-                "startAfter": start_after,
-            },
-        )
+
+        json_body = {
+            ApiField.PATH: path,
+            ApiField.RECURSIVE: recursive,
+            ApiField.FILES: files,
+            ApiField.FOLDERS: folders,
+            ApiField.LIMIT: limit,
+            "startAfter": start_after,
+        }
+        if team_id is not None:
+            json_body[ApiField.GROUP_ID] = team_id
+
+        resp = self._api.get("remote-storage.list", json_body)
+        if resp is None:
+            return []
         return resp.json()
 
     def download_path(
-        self, remote_path: str, save_path: str, progress_cb: Optional[Union[tqdm, Callable]] = None
+        self,
+        remote_path: str,
+        save_path: str,
+        progress_cb: Optional[Union[tqdm, Callable]] = None,
+        team_id: int = None,
     ):
         """
         Downloads item from given remote path to given local path.
@@ -135,6 +156,8 @@ class RemoteStorageApi(ModuleApiBase):
         :type save_path: str
         :param progress_cb: Progress function to download.
         :type progress_cb: tqdm or callable, optional
+        :param team_id: Team ID (to get cloud storages connected to the team)
+        :type team_id: int
 
 
         .. code-block:: python
@@ -145,13 +168,17 @@ class RemoteStorageApi(ModuleApiBase):
             remote_path = api.remote_storage.get_remote_path(provider, bucket, path_in_bucket)
             # or alternatively use this:
             # remote_path = f"{provider}://{bucket}{path_in_bucket}"
-            api.remote_storage.upload_path(local_path="images/my-cats.jpg", remote_path=remote_path)
+            api.remote_storage.download_path(local_path="images/my-cats.jpg", remote_path=remote_path)
         """
+        team_id = team_id or env.team_id(raise_not_found=False)
         Provider.validate_path(remote_path)
         ensure_base_path(save_path)
-        response = self._api.post(
-            "remote-storage.download", {ApiField.LINK: remote_path}, stream=True
-        )
+
+        json_body = {ApiField.LINK: remote_path}
+        if team_id is not None:
+            json_body[ApiField.GROUP_ID] = team_id
+
+        response = self._api.post("remote-storage.download", json_body, stream=True)
         # if "Content-Length" in response.headers:
         #     length = int(response.headers['Content-Length'])
         with open(save_path, "wb") as fd:
@@ -160,7 +187,7 @@ class RemoteStorageApi(ModuleApiBase):
                 if progress_cb is not None:
                     progress_cb(len(chunk))
 
-    def upload_path(self, local_path: str, remote_path: str):
+    def upload_path(self, local_path: str, remote_path: str, team_id: int = None):
         """
         Uploads item from given local path to given remote path.
 
@@ -168,6 +195,8 @@ class RemoteStorageApi(ModuleApiBase):
         :type local_path: str
         :param remote_path: Remote destination path.
         :type remote_path: str
+        :param team_id: Team ID (to get cloud storages connected to the team)
+        :type team_id: int
         :Usage example:
 
         .. code-block:: python
@@ -176,15 +205,17 @@ class RemoteStorageApi(ModuleApiBase):
             bucket = "bucket-test-export"
             path_in_bucket = "/demo/image.jpg"
             remote_path = api.remote_storage.get_remote_path(provider, bucket, path_in_bucket)
+            team_id = 123
             # or alternatively use this:
             # remote_path = f"{provider}://{bucket}{path_in_bucket}"
-            api.remote_storage.upload_path(local_path="images/my-cats.jpg", remote_path=remote_path)
+            api.remote_storage.upload_path("images/my-cats.jpg", remote_path, team_id)
         """
         Provider.validate_path(remote_path)
-        return self._upload_paths_batch([local_path], [remote_path])
+        return self._upload_paths_batch([local_path], [remote_path], team_id)
 
-    def _upload_paths_batch(self, local_paths, remote_paths):
+    def _upload_paths_batch(self, local_paths, remote_paths, team_id: int = None):
         """_upload_paths_batch"""
+        team_id = team_id or env.team_id(raise_not_found=False)
 
         if len(local_paths) != len(remote_paths):
             raise ValueError("Inconsistency in paths, len(local_paths) != len(remote_paths)")
@@ -209,7 +240,10 @@ class RemoteStorageApi(ModuleApiBase):
                 )
             )
         encoder = MultipartEncoder(fields=content)
-        resp = self._api.post("remote-storage.upload", encoder)
+        url = f"remote-storage.upload"
+        if team_id is not None:
+            url += f"?teamId={team_id}"
+        resp = self._api.post(url, encoder)
         return resp.json()
 
     def get_remote_path(self, provider: str, bucket: str, path_in_bucket: str) -> str:
@@ -236,10 +270,15 @@ class RemoteStorageApi(ModuleApiBase):
         Provider.validate_path(res_path)
         return res_path
 
-    def get_list_available_providers(self) -> List[dict]:
+    def get_list_available_providers(
+        self,
+        team_id: int = None,
+    ) -> List[dict]:
         """
         Get the list of available providers for the instance.
 
+        :param team_id: Team ID (to get cloud storages connected to the team)
+        :type team_id: int
         :return: List of available providers
         :rtype: List[dict]
         :Usage example:
@@ -260,7 +299,8 @@ class RemoteStorageApi(ModuleApiBase):
             # Pass values into the API constructor (optional, not recommended)
             # api = sly.Api(server_address="https://app.supervise.ly", token="4r47N...xaTatb")
 
-            available_providers = api.remote_storage.get_list_available_providers()
+            team_id = 123
+            available_providers = api.remote_storage.get_list_available_providers(team_id)
 
             # Output example
 
@@ -281,13 +321,24 @@ class RemoteStorageApi(ModuleApiBase):
             #    ]
 
         """
-        resp = self._api.get("remote-storage.available_providers", {})
+        team_id = team_id or env.team_id(raise_not_found=False)
+
+        json_body = {}
+        if team_id is not None:
+            json_body[ApiField.GROUP_ID] = team_id
+
+        resp = self._api.get("remote-storage.available_providers", json_body)
         return resp.json()
 
-    def get_list_supported_providers(self) -> List[dict]:
+    def get_list_supported_providers(
+        self,
+        team_id: int = None,
+    ) -> List[dict]:
         """
         Get the list of supported providers for the instance.
 
+        :param team_id: Team ID (to get cloud storages connected to the team)
+        :type team_id: int
         :return: List of supported providers
         :rtype: List[dict]
         :Usage example:
@@ -308,7 +359,8 @@ class RemoteStorageApi(ModuleApiBase):
             # Pass values into the API constructor (optional, not recommended)
             # api = sly.Api(server_address="https://app.supervise.ly", token="4r47N...xaTatb")
 
-            supported_providers = api.remote_storage.get_list_supported_providers()
+            team_id = 123
+            supported_providers = api.remote_storage.get_list_supported_providers(team_id)
 
             # Output example
 
@@ -325,15 +377,27 @@ class RemoteStorageApi(ModuleApiBase):
             #    ]
 
         """
-        resp = self._api.get("remote-storage.supported_providers", {})
+        team_id = team_id or env.team_id(raise_not_found=False)
+
+        json_body = {}
+        if team_id is not None:
+            json_body[ApiField.GROUP_ID] = team_id
+
+        resp = self._api.get("remote-storage.supported_providers", json_body)
         return resp.json()
 
-    def is_path_exist(self, path: str) -> bool:
+    def is_path_exist(
+        self,
+        path: str,
+        team_id: int = None,
+    ) -> bool:
         """
         Check if the file path exists.
 
         :param path: URL of the file in the bucket storage
         :type path: str
+        :param team_id: Team ID (to get cloud storages connected to the team)
+        :type team_id: int
         :return: True if the file exists, False otherwise
         :rtype: bool
         :Usage example:
@@ -358,13 +422,17 @@ class RemoteStorageApi(ModuleApiBase):
             is_exist = api.remote_storage.is_path_exist(path)
 
         """
-
+        team_id = team_id or env.team_id(raise_not_found=False)
         Provider.validate_path(path)
 
-        resp = self._api.get(
-            "remote-storage.exists",
-            {ApiField.PATH: path},
-        )
+        json_body = {ApiField.PATH: path}
+        if team_id is not None:
+            json_body[ApiField.GROUP_ID] = team_id
+
+        resp = self._api.get("remote-storage.exists", json_body)
+        if resp is None:
+            return False
+            
         resp = resp.json()
 
         if resp.get("exists"):
@@ -372,12 +440,18 @@ class RemoteStorageApi(ModuleApiBase):
         else:
             return False
 
-    def get_path_stats(self, path: str) -> Optional[dict]:
+    def get_path_stats(
+        self,
+        path: str,
+        team_id: int = None,
+    ) -> Optional[dict]:
         """
         Get information about file size and the date of its last modification in bucket storage.
 
         :param path: URL of the file in the bucket storage
         :type path: str
+        :param team_id: Team ID (to get cloud storages connected to the team)
+        :type team_id: int
         :return: File 'size' in bytes and 'lastModified' date if file exists, otherwise None
         :rtype: Optional[dict]
         :Usage example:
@@ -399,7 +473,8 @@ class RemoteStorageApi(ModuleApiBase):
             # api = sly.Api(server_address="https://app.supervise.ly", token="4r47N...xaTatb")
 
             path = "s3://bucket/lemons/ds1/img/IMG_444.jpeg"
-            stats = api.remote_storage.get_path_stats(path)
+            team_id = 123
+            stats = api.remote_storage.get_path_stats(path, team_id)
 
             # Output example
 
@@ -409,11 +484,14 @@ class RemoteStorageApi(ModuleApiBase):
             #   }
 
         """
-        if self.is_path_exist(path):
-            resp = self._api.get(
-                "remote-storage.stat",
-                {ApiField.PATH: path},
-            )
+        team_id = team_id or env.team_id(raise_not_found=False)
+
+        json_body = {ApiField.PATH: path}
+        if team_id is not None:
+            json_body[ApiField.GROUP_ID] = team_id
+
+        if self.is_path_exist(path, team_id):
+            resp = self._api.get("remote-storage.stat", json_body)
             return resp.json()
         else:
             path_folers = path.split("/")[3:]

{supervisely-6.73.289 → supervisely-6.73.291}/supervisely/project/project.py

@@ -3352,8 +3352,9 @@ class Project:
             existing_hashes = api.image.check_existing_hashes(
                 list(set([inf.hash for inf in image_infos if inf.hash and not inf.link]))
             )
+            workspace_info = api.workspace.get_info_by_id(workspace_id)
             existing_links = api.image.check_existing_links(
-                list(set([inf.link for inf in image_infos if inf.link]))
+                list(set([inf.link for inf in image_infos if inf.link])), team_id=workspace_info.team_id
             )
         image_infos = sorted(image_infos, key=lambda info: info.link is not None)
 

{supervisely-6.73.289 → supervisely-6.73.291/supervisely.egg-info}/PKG-INFO

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