supervisely 6.73.323__py3-none-any.whl → 6.73.324__py3-none-any.whl

supervisely/_utils.py

@@ -471,9 +471,20 @@ def get_or_create_event_loop() -> asyncio.AbstractEventLoop:
             return loop
 
 
-def sync_call(coro):
+def run_coroutine(coroutine):
     """
-    This function is used to run asynchronous functions in synchronous context.
+    Runs an asynchronous coroutine in a synchronous context and waits for its result.
+
+    This function checks if an event loop is already running:
+    - If a loop is running, it schedules the coroutine using `asyncio.run_coroutine_threadsafe()`
+      and waits for the result.
+    - If no loop is running, it creates one and executes the coroutine with `run_until_complete()`.
+
+    This ensures compatibility with both synchronous and asynchronous environments
+    without creating unnecessary event loops.
+
+    ⚠️ Note: This method is preferable when working with `asyncio` objects like `Semaphore`,
+    since it avoids issues with mismatched event loops.
 
     :param coro: Asynchronous function.
     :type coro: Coroutine
@@ -484,13 +495,13 @@ def sync_call(coro):
 
     .. code-block:: python
 
-            from supervisely.utils import sync_call
+            from supervisely._utils import run_coroutine
 
             async def async_function():
                 await asyncio.sleep(1)
                 return "Hello, World!"
             coro = async_function()
-            result = sync_call(coro)
+            result = run_coroutine(coro)
             print(result)
             # Output: Hello, World!
     """
@@ -498,10 +509,10 @@ def sync_call(coro):
     loop = get_or_create_event_loop()
 
     if loop.is_running():
-        future = asyncio.run_coroutine_threadsafe(coro, loop=loop)
+        future = asyncio.run_coroutine_threadsafe(coroutine, loop=loop)
         return future.result()
     else:
-        return loop.run_until_complete(coro)
+        return loop.run_until_complete(coroutine)
 
 
 def get_filename_from_headers(url):

supervisely/api/file_api.py

@@ -23,7 +23,7 @@ from typing_extensions import Literal
 
 import supervisely.io.env as env
 import supervisely.io.fs as sly_fs
-from supervisely._utils import batched, rand_str
+from supervisely._utils import batched, rand_str, run_coroutine
 from supervisely.api.module_api import ApiField, ModuleApiBase
 from supervisely.io.fs import (
     ensure_base_path,
@@ -2302,3 +2302,89 @@ class FileApi(ModuleApiBase):
             else:
                 raise e
         return res_remote_dir
+
+    def upload_directory_fast(
+        self,
+        team_id: int,
+        local_dir: str,
+        remote_dir: str,
+        change_name_if_conflict: Optional[bool] = True,
+        progress_cb: Optional[Union[tqdm, Callable]] = None,
+        replace_if_conflict: Optional[bool] = False,
+        enable_fallback: Optional[bool] = True,
+    ) -> str:
+        """
+        Upload Directory to Team Files from local path in fast mode.
+        Files are uploaded asynchronously. If an error occurs, the method will fallback to synchronous upload.
+
+        :param team_id: Team ID in Supervisely.
+        :type team_id: int
+        :param local_dir: Path to local Directory.
+        :type local_dir: str
+        :param remote_dir: Path to Directory in Team Files.
+        :type remote_dir: str
+        :param change_name_if_conflict: Checks if given name already exists and adds suffix to the end of the name.
+        :type change_name_if_conflict: bool, optional
+        :param progress_cb: Function for tracking download progress in bytes.
+        :type progress_cb: Progress, optional
+        :param replace_if_conflict: If True, replace existing dir.
+        :type replace_if_conflict: bool, optional
+        :param enable_fallback: If True, the method will fallback to synchronous upload if an error occurs.
+        :type enable_fallback: bool, optional
+        :return: Path to Directory in Team Files
+        :rtype: :class:`str`
+        """
+        coroutine = self.upload_directory_async(
+            team_id=team_id,
+            local_dir=local_dir,
+            remote_dir=remote_dir,
+            change_name_if_conflict=change_name_if_conflict,
+            progress_size_cb=progress_cb,
+            replace_if_conflict=replace_if_conflict,
+            enable_fallback=enable_fallback,
+        )
+        return run_coroutine(coroutine)
+
+    def upload_bulk_fast(
+        self,
+        team_id: int,
+        src_paths: List[str],
+        dst_paths: List[str],
+        semaphore: Optional[asyncio.Semaphore] = None,
+        progress_cb: Optional[Union[tqdm, Callable]] = None,
+        progress_cb_type: Literal["number", "size"] = "size",
+        enable_fallback: Optional[bool] = True,
+    ) -> None:
+        """
+        Upload multiple files from local paths to Team Files in fast mode.
+        Files are uploaded asynchronously. If an error occurs, the method will fallback to synchronous upload.
+
+        :param team_id: Team ID in Supervisely.
+        :type team_id: int
+        :param src_paths: List of local paths to files.
+        :type src_paths: List[str]
+        :param dst_paths: List of paths to save files in Team Files.
+        :type dst_paths: List[str]
+        :param semaphore: Semaphore for limiting the number of simultaneous uploads.
+        :type semaphore: asyncio.Semaphore, optional
+        :param progress_cb: Function for tracking download progress.
+        :type progress_cb: tqdm or callable, optional
+        :param progress_cb_type: Type of progress callback. Can be "number" or "size". Default is "size".
+                                "size" is used to track the number of transferred bytes.
+                                "number" is used to track the number of transferred files.
+        :type progress_cb_type: Literal["number", "size"], optional 
+        :param enable_fallback: If True, the method will fallback to synchronous upload if an error occurs.
+        :type enable_fallback: bool, optional
+        :return: None
+        :rtype: :class:`NoneType`
+        """
+        coroutine = self.upload_bulk_async(
+            team_id=team_id,
+            src_paths=src_paths,
+            dst_paths=dst_paths,
+            semaphore=semaphore,
+            progress_cb=progress_cb,
+            progress_cb_type=progress_cb_type,
+            enable_fallback=enable_fallback,
+        )
+        return run_coroutine(coroutine)

supervisely/app/fastapi/utils.py

@@ -3,6 +3,20 @@ import concurrent.futures
 
 
 def run_sync(coroutine):
+    """
+    Runs an asynchronous coroutine in a separate thread and waits for its result.
+    It is useful for running async functions in a synchronous
+    environment.
+
+    This method creates a new thread using ThreadPoolExecutor and executes the coroutine
+    inside a new event loop.
+
+    ⚠️ Note: This function creates a new event loop every time it is called,
+    which can cause issues when using objects tied to a specific loop (e.g., asyncio.Semaphore).
+
+    :param coroutine: coroutine to run
+    :return: result of coroutine
+    """
     try:
         with concurrent.futures.ThreadPoolExecutor(max_workers=1) as executor:
             result = executor.submit(

supervisely/nn/training/train_app.py

@@ -39,7 +39,7 @@ from supervisely import (
     is_production,
     logger,
 )
-from supervisely._utils import abs_url, get_filename_from_headers, sync_call
+from supervisely._utils import abs_url, get_filename_from_headers
 from supervisely.api.file_api import FileInfo
 from supervisely.app import get_synced_data_dir
 from supervisely.app.widgets import Progress
@@ -60,7 +60,7 @@ from supervisely.nn.utils import ModelSource
 from supervisely.output import set_directory
 from supervisely.project.download import (
     copy_from_cache,
-    download_async_or_sync,
+    download_fast,
     download_to_cache,
     get_cache_size,
     is_cached,
@@ -806,7 +806,7 @@ class TrainApp:
         with self.progress_bar_main(message="Downloading input data", total=total_images) as pbar:
             logger.debug("Downloading project data without cache")
             self.progress_bar_main.show()
-            download_async_or_sync(
+            download_fast(
                 api=self._api,
                 project_id=self.project_id,
                 dest_dir=self.project_dir,
@@ -1619,14 +1619,13 @@ class TrainApp:
             unit_scale=True,
         ) as upload_artifacts_pbar:
             self.progress_bar_main.show()
-            remote_dir = sync_call(
-                self._api.file.upload_directory_async(
-                    team_id=self.team_id,
-                    local_dir=local_demo_dir,
-                    remote_dir=remote_demo_dir,
-                    progress_size_cb=upload_artifacts_pbar.update,
-                )
+            remote_dir = self._api.file.upload_directory_fast(
+                team_id=self.team_id,
+                local_dir=local_demo_dir,
+                remote_dir=remote_demo_dir,
+                progress_cb=upload_artifacts_pbar.update,
             )
+
             self.progress_bar_main.hide()
 
     def _get_train_val_splits_for_app_state(self) -> Dict:
@@ -1733,13 +1732,11 @@ class TrainApp:
             unit_scale=True,
         ) as upload_artifacts_pbar:
             self.progress_bar_main.show()
-            remote_dir = sync_call(
-                self._api.file.upload_directory_async(
-                    team_id=self.team_id,
-                    local_dir=self.output_dir,
-                    remote_dir=remote_artifacts_dir,
-                    progress_size_cb=upload_artifacts_pbar.update,
-                )
+            remote_dir = self._api.file.upload_directory_fast(
+                team_id=self.team_id,
+                local_dir=self.output_dir,
+                remote_dir=remote_artifacts_dir,
+                progress_cb=upload_artifacts_pbar.update,
             )
             self.progress_bar_main.hide()
 
@@ -2524,13 +2521,11 @@ class TrainApp:
             logger.debug(f"Uploading {len(export_weights)} export weights of size {size} bytes")
             logger.debug(f"Destination paths: {file_dest_paths}")
             self.progress_bar_main.show()
-            sync_call(
-                self._api.file.upload_bulk_async(
-                    team_id=self.team_id,
-                    src_paths=export_weights.values(),
-                    dst_paths=file_dest_paths,
-                    progress_cb=export_upload_main_pbar.update,
-                )
+            self._api.file.upload_bulk_fast(
+                team_id=self.team_id,
+                src_paths=export_weights.values(),
+                dst_paths=file_dest_paths,
+                progress_cb=export_upload_main_pbar.update,
             )
 
         self.progress_bar_main.hide()

supervisely/project/download.py

@@ -281,6 +281,34 @@ def download_async_or_sync(
         )
 
 
+def download_fast(
+    api: Api,
+    project_id: int,
+    dest_dir: str,
+    dataset_ids: Optional[List[int]] = None,
+    log_progress: bool = True,
+    progress_cb: Optional[Union[tqdm, Callable]] = None,
+    semaphore: Optional[asyncio.Semaphore] = None,
+    **kwargs,
+) -> None:
+    """
+    Download project in a fast mode.
+    Items are downloaded asynchronously. If an error occurs, the method will fallback to synchronous download.
+    Automatically detects project type.
+    You can pass :class:`ProjectInfo` as `project_info` kwarg to avoid additional API requests.
+    """
+    download_async_or_sync(
+        api=api,
+        project_id=project_id,
+        dest_dir=dest_dir,
+        dataset_ids=dataset_ids,
+        log_progress=log_progress,
+        progress_cb=progress_cb,
+        semaphore=semaphore,
+        **kwargs,
+    )
+
+
 def _get_cache_dir(project_id: int, dataset_path: str = None) -> str:
     p = os.path.join(apps_cache_dir(), str(project_id))
     if dataset_path is not None:
@@ -468,7 +496,7 @@ def _download_project_to_cache(
     if len(dataset_infos) == 0:
         logger.debug("No datasets to download")
         return
-    download_async_or_sync(
+    download_fast(
         api=api,
         project_id=project_id,
         dest_dir=cached_project_dir,

{supervisely-6.73.323.dist-info → supervisely-6.73.324.dist-info}/METADATA

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

{supervisely-6.73.323.dist-info → supervisely-6.73.324.dist-info}/RECORD

@@ -1,6 +1,6 @@
 supervisely/README.md,sha256=XM-DiMC6To3I9RjQZ0c61905EFRR_jnCUx2q3uNR-X8,3331
 supervisely/__init__.py,sha256=mtgVKiRSlnRU7yKG0Re130mBL10wCzsNfOfi-w-Kj4c,10833
-supervisely/_utils.py,sha256=hYzGRVAh-cB2RmqixHbaJQZHy4byNip4KZm2Gdt8P7k,16849
+supervisely/_utils.py,sha256=KWfbw8XFfV2uxLzhuku_J0UQKpG-D80Hp6UOQD316P8,17460
 supervisely/function_wrapper.py,sha256=R5YajTQ0GnRp2vtjwfC9hINkzQc0JiyGsu8TER373xY,1912
 supervisely/sly_logger.py,sha256=z92Vu5hmC0GgTIJO1n6kPDayRW9__8ix8hL6poDZj-Y,6274
 supervisely/tiny_timer.py,sha256=hkpe_7FE6bsKL79blSs7WBaktuPavEVu67IpEPrfmjE,183
@@ -25,7 +25,7 @@ supervisely/api/annotation_api.py,sha256=kuk4qwojTJxYr2iqAKbW-QhWw_DFc4TsjA2Wc2M
 supervisely/api/api.py,sha256=6TczKT1t0MWlbArSW31RmeyWP04pqngfUO_NrG5FETE,66287
 supervisely/api/app_api.py,sha256=RsbVej8WxWVn9cNo5s3Fqd1symsCdsfOaKVBKEUapRY,71927
 supervisely/api/dataset_api.py,sha256=GH7prDRJKyJlTv_7_Y-RkTwJN7ED4EkXNqqmi3iIdI4,41352
-supervisely/api/file_api.py,sha256=xVM4fFeIc52aKnxduCIU7L6Rgd7Rh36rzTJ8hVT8hw4,88925
+supervisely/api/file_api.py,sha256=S2xZAy36YzWA1R41SIlLXX9JwSf9ax18AIAIQGgHGlA,92801
 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=WIML_6N1qgOWBm3acexmGSWz4hAaSxlYmUtbytROaP8,192375
@@ -95,7 +95,7 @@ supervisely/app/fastapi/offline.py,sha256=CwMMkJ1frD6wiZS-SEoNDtQ1UJcJe1Ob6ohE3r
 supervisely/app/fastapi/request.py,sha256=NU7rKmxJ1pfkDZ7_yHckRcRAueJRQIqCor11UO2OHr8,766
 supervisely/app/fastapi/subapp.py,sha256=5lMfFLYBfHzE1OmITHsogB9hScyTJFjGV45AKY67Hkg,45647
 supervisely/app/fastapi/templating.py,sha256=JOAW8U-14GD47E286mzFi3mZSPbm_csJGqtXWLRM4rc,2929
-supervisely/app/fastapi/utils.py,sha256=GZuTWLcVRGVx8TL3jVEYUOZIT2FawbwIe2kAOBLw9ho,398
+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
 supervisely/app/v1/app_config.md,sha256=-8GKbiQoX25RhEj3EDJ7TxiYuFw5wL2TO3qV5AJLZTs,2536
@@ -979,7 +979,7 @@ supervisely/nn/tracker/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 supervisely/nn/tracker/utils/gmc.py,sha256=3JX8979H3NA-YHNaRQyj9Z-xb9qtyMittPEjGw8y2Jo,11557
 supervisely/nn/tracker/utils/kalman_filter.py,sha256=eSFmCjM0mikHCAFvj-KCVzw-0Jxpoc3Cfc2NWEjJC1Q,17268
 supervisely/nn/training/__init__.py,sha256=gY4PCykJ-42MWKsqb9kl-skemKa8yB6t_fb5kzqR66U,111
-supervisely/nn/training/train_app.py,sha256=yVsMdMlV6OHCRMJ63-hPmTfdsC3Z1-0ohphsMtDMpPw,104944
+supervisely/nn/training/train_app.py,sha256=lFvYxt2Zsd7FrqfeA2C-eNX0tQVLtz3V8om3DwvNFtM,104720
 supervisely/nn/training/gui/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 supervisely/nn/training/gui/classes_selector.py,sha256=8UgzA4aogOAr1s42smwEcDbgaBj_i0JLhjwlZ9bFdIA,3772
 supervisely/nn/training/gui/gui.py,sha256=CnT_QhihrxdSHKybpI0pXhPLwCaXEana_qdn0DhXByg,25558
@@ -1016,7 +1016,7 @@ supervisely/pointcloud_episodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 supervisely/pointcloud_episodes/pointcloud_episodes.py,sha256=cRXdtw7bMsbsdVQjxfWxFSESrO-LGiqqsZyyExl2Mbg,3430
 supervisely/project/__init__.py,sha256=hlzdj9Pgy53Q3qdP8LMtGTChvZHQuuShdtui2eRUQeE,2601
 supervisely/project/data_version.py,sha256=6vOz5ovBeCIiMAKUG7lGQ5IXvQnU1GbcnrWxdOvaVlo,19311
-supervisely/project/download.py,sha256=zb8sb4XZ6Qi3CP7fmtLRUAYzaxs_W0WnOfe2x3ZVRMs,24639
+supervisely/project/download.py,sha256=GQFYN3KCdM_egXDzoyZrzl6Yeg2QshYQNFNlKi8Nh8A,25471
 supervisely/project/pointcloud_episode_project.py,sha256=yiWdNBQiI6f1O9sr1pg8JHW6O-w3XUB1rikJNn3Oung,41866
 supervisely/project/pointcloud_project.py,sha256=Kx1Vaes-krwG3BiRRtHRLQxb9G5m5bTHPN9IzRqmNWo,49399
 supervisely/project/project.py,sha256=nKnnYVrSx_MWh5G_fObaAegkRxLFJg_J074SaduEYGo,205871
@@ -1081,9 +1081,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.323.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.323.dist-info/METADATA,sha256=uIqQoH6i-OiLhSZSLt6SqL7O1ZWPV0D6ZRJICli80eE,33596
-supervisely-6.73.323.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.323.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.323.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.323.dist-info/RECORD,,
+supervisely-6.73.324.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.324.dist-info/METADATA,sha256=mUZAJc6JxtQ7H7I31gf_QWoBAjl4qXsS-CilUCvf8f8,33596
+supervisely-6.73.324.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.324.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.324.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.324.dist-info/RECORD,,