supervisely 6.73.255__tar.gz → 6.73.257__tar.gz

{supervisely-6.73.255/supervisely.egg-info → supervisely-6.73.257}/PKG-INFO

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

{supervisely-6.73.255 → supervisely-6.73.257}/supervisely/api/api.py

@@ -69,6 +69,7 @@ from supervisely.io.network_exceptions import (
     process_requests_exception,
     process_requests_exception_async,
     process_unhandled_request,
+    RetryableRequestException,
 )
 from supervisely.project.project_meta import ProjectMeta
 from supervisely.sly_logger import logger
@@ -1283,16 +1284,20 @@ class Api:
                         Api._raise_for_status_httpx(resp)
 
                     hhash = resp.headers.get("x-content-checksum-sha256", None)
-                    for chunk in resp.iter_raw(chunk_size):
-                        yield chunk, hhash
-                        total_streamed += len(chunk)
+                    try:
+                        for chunk in resp.iter_raw(chunk_size):
+                            yield chunk, hhash
+                            total_streamed += len(chunk)
+                    except Exception as e:
+                        raise RetryableRequestException(repr(e))
+
                     if expected_size != 0 and total_streamed != expected_size:
                         raise ValueError(
                             f"Streamed size does not match the expected: {total_streamed} != {expected_size}"
                         )
                     logger.trace(f"Streamed size: {total_streamed}, expected size: {expected_size}")
                     return
-            except (httpx.RequestError, httpx.HTTPStatusError) as e:
+            except (httpx.RequestError, httpx.HTTPStatusError, RetryableRequestException) as e:
                 if (
                     isinstance(e, httpx.HTTPStatusError)
                     and resp.status_code == 400
@@ -1531,9 +1536,12 @@ class Api:
 
                     # received hash of the content to check integrity of the data stream
                     hhash = resp.headers.get("x-content-checksum-sha256", None)
-                    async for chunk in resp.aiter_raw(chunk_size):
-                        yield chunk, hhash
-                        total_streamed += len(chunk)
+                    try:
+                        async for chunk in resp.aiter_raw(chunk_size):
+                            yield chunk, hhash
+                            total_streamed += len(chunk)
+                    except Exception as e:
+                        raise RetryableRequestException(repr(e))
 
                     if expected_size != 0 and total_streamed != expected_size:
                         raise ValueError(
@@ -1541,7 +1549,7 @@ class Api:
                         )
                     logger.trace(f"Streamed size: {total_streamed}, expected size: {expected_size}")
                     return
-            except (httpx.RequestError, httpx.HTTPStatusError) as e:
+            except (httpx.RequestError, httpx.HTTPStatusError, RetryableRequestException) as e:
                 if (
                     isinstance(e, httpx.HTTPStatusError)
                     and resp.status_code == 400
@@ -1623,11 +1631,14 @@ class Api:
         else:
             self._check_https_redirect()
             if self.server_address.startswith("https://"):
-                self._semaphore = asyncio.Semaphore(10)
-                logger.debug("Setting global API semaphore size to 10 for HTTPS")
+                size = 10
+                if "app.supervise" in self.server_address:
+                    size = 7
+                logger.debug(f"Setting global API semaphore size to {size} for HTTPS")
             else:
-                self._semaphore = asyncio.Semaphore(5)
-                logger.debug("Setting global API semaphore size to 5 for HTTP")
+                size = 5
+                logger.debug(f"Setting global API semaphore size to {size} for HTTP")
+            self._semaphore = asyncio.Semaphore(size)
 
     def set_semaphore_size(self, size: int = None):
         """

{supervisely-6.73.255 → supervisely-6.73.257}/supervisely/io/network_exceptions.py

@@ -28,6 +28,14 @@ RETRY_STATUS_CODES = {
 }
 
 
+class RetryableRequestException(Exception):
+    """Exception that indicates that the request should be retried."""
+
+    def __init__(self, message, response=None):
+        super().__init__(message)
+        self.response = response
+
+
 async def process_requests_exception_async(
     external_logger,
     exc,
@@ -50,6 +58,8 @@ async def process_requests_exception_async(
     except Exception:
         pass
 
+    is_retryable_exception = isinstance(exc, RetryableRequestException)
+
     is_connection_error = isinstance(
         exc,
         (
@@ -82,7 +92,7 @@ async def process_requests_exception_async(
         except (AttributeError, ValueError):
             pass
 
-    if is_connection_error or is_server_retryable_error:
+    if any([is_connection_error, is_server_retryable_error, is_retryable_exception]):
         await process_retryable_request_async(
             external_logger,
             exc,
@@ -136,6 +146,8 @@ def process_requests_exception(
     except Exception:
         pass
 
+    is_retryable_exception = isinstance(exc, RetryableRequestException)
+
     is_connection_error = isinstance(
         exc,
         (
@@ -168,7 +180,7 @@ def process_requests_exception(
         except (AttributeError, ValueError):
             pass
 
-    if is_connection_error or is_server_retryable_error:
+    if any([is_connection_error, is_server_retryable_error, is_retryable_exception]):
         process_retryable_request(
             external_logger,
             exc,

{supervisely-6.73.255 → supervisely-6.73.257}/supervisely/project/pointcloud_episode_project.py

@@ -31,6 +31,9 @@ from supervisely.video_annotation.frame import Frame
 from supervisely.video_annotation.key_id_map import KeyIdMap
 
 
+KITTI_ITEM_DIR_NAME = "velodyne"
+
+
 class EpisodeItemPaths(NamedTuple):
     #: :class:`str`: Full pointcloud file path of item
     pointcloud_path: str
@@ -153,9 +156,10 @@ class PointcloudEpisodeDataset(PointcloudDataset):
 
     def _read(self):
         if not dir_exists(self.item_dir):
-            raise NotADirectoryError(
-                f"Cannot read dataset {self.name}: {self.item_dir} directory not found"
-            )
+            message = f"Cannot read dataset '{self.name}': '{self.item_dir}' directory not found"
+            if dir_exists(os.path.join(self.directory, KITTI_ITEM_DIR_NAME)):
+                message = f"Cannot read dataset '{self.name}'. The item directory '{KITTI_ITEM_DIR_NAME}' was found. This appears to be a KITTI dataset and will be skipped."
+            raise NotADirectoryError(message)
 
         try:
             item_paths = sorted(list_files(self.item_dir, filter_fn=self._has_valid_ext))
@@ -504,6 +508,7 @@ class PointcloudEpisodeProject(PointcloudProject):
         batch_size: Optional[int] = 10,
         log_progress: bool = True,
         progress_cb: Optional[Union[tqdm, Callable]] = None,
+        **kwargs,
     ) -> None:
         """
         Download pointcloud episodes project from Supervisely to the given directory.
@@ -626,6 +631,12 @@ class PointcloudEpisodeProject(PointcloudProject):
             progress_cb=progress_cb,
         )
 
+    @staticmethod
+    async def download_async(*args, **kwargs):
+        raise NotImplementedError(
+            f"Static method 'download_async()' is not supported for PointcloudEpisodeProject class now."
+        )
+
 
 def download_pointcloud_episode_project(
     api: Api,

{supervisely-6.73.255 → supervisely-6.73.257}/supervisely/project/pointcloud_project.py

@@ -737,6 +737,7 @@ class PointcloudProject(VideoProject):
         batch_size: Optional[int] = 10,
         log_progress: bool = True,
         progress_cb: Optional[Union[tqdm, Callable]] = None,
+        **kwargs,
     ) -> PointcloudProject:
         """
         Download pointcloud project from Supervisely to the given directory.
@@ -858,6 +859,12 @@ class PointcloudProject(VideoProject):
             progress_cb=progress_cb,
         )
 
+    @staticmethod
+    async def download_async(*args, **kwargs):
+        raise NotImplementedError(
+            f"Static method 'download_async()' is not supported for PointcloudProject class now."
+        )
+
 
 def download_pointcloud_project(
     api: Api,

{supervisely-6.73.255 → supervisely-6.73.257}/supervisely/project/project.py

@@ -2091,7 +2091,12 @@ class Project:
                     OpenMode.READ,
                     parents=parents,
                 )
-                self._datasets = self._datasets.add(current_dataset)
+                if current_dataset.name not in self._datasets._collection:
+                    self._datasets = self._datasets.add(current_dataset)
+                else:
+                    logger.debug(
+                        f"Dataset '{current_dataset.name}' already exists in project '{self.name}'. Skip adding to collection."
+                    )
             except Exception as ex:
                 logger.warning(ex)
 

{supervisely-6.73.255 → supervisely-6.73.257}/supervisely/project/volume_project.py

@@ -33,7 +33,9 @@ VolumeItemPaths = namedtuple("VolumeItemPaths", ["volume_path", "ann_path"])
 class VolumeDataset(VideoDataset):
     item_dir_name = "volume"
     interpolation_dir = "interpolation"
+    interpolation_dir_name = interpolation_dir
     mask_dir = "mask"
+    mask_dir_name = mask_dir
     annotation_class = VolumeAnnotation
     item_module = sly_volume
     paths_tuple = VolumeItemPaths
@@ -147,6 +149,7 @@ class VolumeProject(VideoProject):
         download_volumes: Optional[bool] = True,
         log_progress: bool = False,
         progress_cb: Optional[Union[tqdm, Callable]] = None,
+        **kwargs,
     ) -> None:
         """
         Download volume project from Supervisely to the given directory.
@@ -297,6 +300,12 @@ class VolumeProject(VideoProject):
             f"Static method 'get_train_val_splits_by_tag()' is not supported for VolumeProject class now."
         )
 
+    @staticmethod
+    async def download_async(*args, **kwargs):
+        raise NotImplementedError(
+            f"Static method 'download_async()' is not supported for VolumeProject class now."
+        )
+
 
 def download_volume_project(
     api: Api,

{supervisely-6.73.255 → supervisely-6.73.257/supervisely.egg-info}/PKG-INFO

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