supervisely 6.73.329__tar.gz → 6.73.330__tar.gz

{supervisely-6.73.329/supervisely.egg-info → supervisely-6.73.330}/PKG-INFO

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

{supervisely-6.73.329 → supervisely-6.73.330}/supervisely/_utils.py

@@ -500,8 +500,9 @@ def run_coroutine(coroutine):
             async def async_function():
                 await asyncio.sleep(1)
                 return "Hello, World!"
-            coro = async_function()
-            result = run_coroutine(coro)
+                
+            coroutine = async_function()
+            result = run_coroutine(coroutine)
             print(result)
             # Output: Hello, World!
     """

{supervisely-6.73.329 → supervisely-6.73.330}/supervisely/api/api.py

@@ -290,6 +290,8 @@ class Api:
         # api = sly.Api(server_address="https://app.supervisely.com", token="4r47N...xaTatb")
     """
 
+    _checked_servers = set()
+
     def __init__(
         self,
         server_address: str = None,
@@ -371,7 +373,9 @@ class Api:
         self.retry_count = retry_count
         self.retry_sleep_sec = retry_sleep_sec
 
-        self._skip_https_redirect_check = sly_env.supervisely_skip_https_user_helper_check()
+        skip_from_env = sly_env.supervisely_skip_https_user_helper_check()
+        self._skip_https_redirect_check = skip_from_env or self.server_address in Api._checked_servers
+        self.logger.debug(f"Skip HTTPS redirect check on API init: {self._skip_https_redirect_check}. ENV: {skip_from_env}. Checked servers: {Api._checked_servers}")
         self._require_https_redirect_check = False if self._skip_https_redirect_check else not self.server_address.startswith("https://")
 
         if check_instance_version:
@@ -886,7 +890,16 @@ class Api:
         return self.headers.pop(key)
 
     def _check_https_redirect(self):
+        """
+        Check if HTTP server should be redirected to HTTPS.
+        If the server has already been checked before (for any instance of this class), 
+        skip the check to avoid redundant network requests.
+        """
         if self._require_https_redirect_check is True:
+            if self.server_address in Api._checked_servers:
+                self._require_https_redirect_check = False
+                return
+            
             try:
                 response = requests.get(
                     self.server_address.replace("http://", "https://"),
@@ -904,6 +917,7 @@ class Api:
             except:
                 pass
             finally:
+                Api._checked_servers.add(self.server_address)
                 self._require_https_redirect_check = False
 
     @classmethod

{supervisely-6.73.329 → supervisely-6.73.330}/supervisely/geometry/mask_3d.py

@@ -308,7 +308,7 @@ class Mask3D(Geometry):
         except KeyError as e:
             header_keys = ["'space'", "'space directions'", "'space origin'"]
             if str(e) in header_keys:
-                logger.warning(
+                logger.debug(
                     f"The Mask3D geometry created from the file '{file_path}' doesn't contain optional space attributes that have similar names to {', '.join(header_keys)}. To set the values for these attributes, you can use information from the Volume associated with this figure object."
                 )
         return geometry
@@ -568,6 +568,7 @@ class Mask3D(Geometry):
 
         if origin:
             x, y = origin
+            # pylint: disable=possibly-used-before-assignment
             new_mask = np.zeros(new_shape, dtype=mask_2d.dtype)
             new_mask[x : x + mask_2d.shape[0], y : y + mask_2d.shape[1]] = mask_2d
 

{supervisely-6.73.329 → supervisely-6.73.330}/supervisely/io/fs.py

@@ -1,15 +1,15 @@
 # coding: utf-8
 
 # docs
+import base64
 import errno
+import hashlib
 import mimetypes
 import os
 import re
 import shutil
 import subprocess
 import tarfile
-import hashlib
-import base64
 from typing import Callable, Dict, Generator, List, Literal, Optional, Tuple, Union
 
 import aiofiles
@@ -1417,14 +1417,10 @@ async def copy_file_async(
      .. code-block:: python
 
         import supervisely as sly
+        from supervisely._utils import run_coroutine
 
-        loop = sly.utils.get_or_create_event_loop()
-        coro = sly.fs.copy_file_async('/home/admin/work/projects/example/1.png', '/home/admin/work/tests/2.png')
-        if loop.is_running():
-            future = asyncio.run_coroutine_threadsafe(coro, loop)
-            future.result()
-        else:
-            loop.run_until_complete(coro)
+        coroutine = sly.fs.copy_file_async('/home/admin/work/projects/example/1.png', '/home/admin/work/tests/2.png')
+        run_coroutine(coroutine)
     """
     ensure_base_path(dst)
     async with aiofiles.open(dst, "wb") as out_f:
@@ -1453,14 +1449,10 @@ async def get_file_hash_async(path: str) -> str:
      .. code-block:: python
 
         import supervisely as sly
+        from supervisely._utils import run_coroutine
 
-        loop = sly.utils.get_or_create_event_loop()
-        coro = sly.fs.get_file_hash_async('/home/admin/work/projects/examples/1.jpeg')
-        if loop.is_running():
-            future = asyncio.run_coroutine_threadsafe(coro, loop)
-            hash = future.result()
-        else:
-            hash = loop.run_until_complete(coro)
+        coroutine = sly.fs.get_file_hash_async('/home/admin/work/projects/examples/1.jpeg')
+        hash = run_coroutine(coroutine)
     """
     async with aiofiles.open(path, "rb") as file:
         file_bytes = await file.read()
@@ -1493,17 +1485,13 @@ async def unpack_archive_async(
      .. code-block:: python
 
         import supervisely as sly
+        from supervisely._utils import run_coroutine
 
         archive_path = '/home/admin/work/examples.tar'
         target_dir = '/home/admin/work/projects'
 
-        loop = sly.utils.get_or_create_event_loop()
-        coro = sly.fs.unpack_archive_async(archive_path, target_dir)
-        if loop.is_running():
-            future = asyncio.run_coroutine_threadsafe(coro, loop)
-            future.result()
-        else:
-            loop.run_until_complete(coro)
+        coroutine = sly.fs.unpack_archive_async(archive_path, target_dir)
+        run_coroutine(coroutine)
     """
     if is_split:
         chunk = chunk_size_mb * 1024 * 1024
@@ -1549,14 +1537,10 @@ async def touch_async(path: str) -> None:
      .. code-block:: python
 
         import supervisely as sly
+        from supervisely._utils import run_coroutine
 
-        loop = sly.utils.get_or_create_event_loop()
-        coro = sly.fs.touch_async('/home/admin/work/projects/examples/1.jpeg')
-        if loop.is_running():
-            future = asyncio.run_coroutine_threadsafe(coro, loop)
-            future.result()
-        else:
-            loop.run_until_complete(coro)
+        coroutine = sly.fs.touch_async('/home/admin/work/projects/examples/1.jpeg')
+        run_coroutine(coroutine)
     """
     ensure_base_path(path)
     async with aiofiles.open(path, "a"):
@@ -1591,15 +1575,12 @@ async def list_files_recursively_async(
          .. code-block:: python
     
             import supervisely as sly
-    
+            from supervisely._utils import run_coroutine
+                
             dir_path = '/home/admin/work/projects/examples'
-            loop = sly.utils.get_or_create_event_loop()
-            coro = sly.fs.list_files_recursively_async(dir_path)
-            if loop.is_running():
-                future = asyncio.run_coroutine_threadsafe(coro, loop)
-                files = future.result()
-            else:
-                files = loop.run_until_complete(coro)
+
+            coroutine = sly.fs.list_files_recursively_async(dir_path)
+            files = run_coroutine(coroutine)
     """
 
     def sync_file_list():

{supervisely-6.73.329 → supervisely-6.73.330}/supervisely/io/json.py

@@ -250,15 +250,12 @@ async def dump_json_file_async(data: Dict, filename: str, indent: Optional[int]
      .. code-block:: python
 
         import supervisely as sly
+        from supervisely._utils import run_coroutine
 
         data = {1: 'example'}
-        loop = sly.utils.get_or_create_event_loop()
-        coro = sly.json.dump_json_file_async(data, '/home/admin/work/projects/examples/1.json')
-        if loop.is_running():
-            future = asyncio.run_coroutine_threadsafe(coro, loop)
-            future.result()
-        else:
-            loop.run_until_complete(coro)
+
+        coroutine = sly.json.dump_json_file_async(data, '/home/admin/work/projects/examples/1.json')
+        run_coroutine(coroutine)
     """
     async with aiofiles.open(filename, "w") as fout:
         await fout.write(json.dumps(data, indent=indent))

{supervisely-6.73.329 → supervisely-6.73.330}/supervisely/project/project.py

@@ -1301,19 +1301,16 @@ class Dataset(KeyObject):
          .. code-block:: python
 
             import supervisely as sly
+            from supervisely._utils import run_coroutine
+
             dataset_path = "/home/admin/work/supervisely/projects/lemons_annotated/ds1"
             ds = sly.Dataset(dataset_path, sly.OpenMode.READ)
 
             img_path = "/home/admin/Pictures/Clouds.jpeg"
             img_np = sly.image.read(img_path)
-            img_bytes = sly.image.write_bytes(img_np, "jpeg")
-            loop = sly.utils.get_or_create_event_loop()
+            img_bytes = sly.image.write_bytes(img_np, "jpeg")            
             coroutine = ds.add_item_raw_bytes_async("IMG_050.jpeg", img_bytes)
-            if loop.is_running():
-                future = asyncio.run_coroutine_threadsafe(coroutine, loop)
-                future.result()
-            else:
-                loop.run_until_complete(coroutine)
+            run_coroutine(coroutine)
 
             print(ds.item_exists("IMG_050.jpeg"))
             # Output: True
@@ -1649,17 +1646,14 @@ class Dataset(KeyObject):
          .. code-block:: python
 
             import supervisely as sly
+            from supervisely._utils import run_coroutine
+
             dataset_path = "/home/admin/work/supervisely/projects/lemons_annotated/ds1"
             ds = sly.Dataset(dataset_path, sly.OpenMode.READ)
             new_ann = "/home/admin/work/supervisely/projects/kiwi_annotated/ds1/ann/IMG_1812.jpeg.json"
 
-            loop = sly.utils.get_or_create_event_loop()
             coroutine = ds.set_ann_file_async("IMG_1812.jpeg", new_ann)
-            if loop.is_running():
-                future = asyncio.run_coroutine_threadsafe(coroutine, loop)
-                future.result()
-            else:
-                loop.run_until_complete(coroutine)
+            run_coroutine(coroutine)
         """
         if type(ann_path) is not str:
             raise TypeError("Annotation path should be a string, not a {}".format(type(ann_path)))
@@ -1682,6 +1676,8 @@ class Dataset(KeyObject):
          .. code-block:: python
 
             import supervisely as sly
+            from supervisely._utils import run_coroutine
+
             dataset_path = "/home/admin/work/supervisely/projects/lemons_annotated/ds1"
             ds = sly.Dataset(dataset_path, sly.OpenMode.READ)
 
@@ -1695,14 +1691,9 @@ class Dataset(KeyObject):
                 "objects":[],
                 "customBigData":{}
             }
-
-            loop = sly.utils.get_or_create_event_loop()
+            
             coroutine = ds.set_ann_dict_async("IMG_8888.jpeg", new_ann_json)
-            if loop.is_running():
-                future = asyncio.run_coroutine_threadsafe(coroutine, loop)
-                future.result()
-            else:
-                loop.run_until_complete(coroutine)
+            run_coroutine(coroutine)
         """
         if type(ann) is not dict:
             raise TypeError("Ann should be a dict, not a {}".format(type(ann)))
@@ -1725,18 +1716,16 @@ class Dataset(KeyObject):
          .. code-block:: python
 
             import supervisely as sly
+            from supervisely._utils import run_coroutine
+
             dataset_path = "/home/admin/work/supervisely/projects/lemons_annotated/ds1"
             ds = sly.Dataset(dataset_path, sly.OpenMode.READ)
 
             height, width = 500, 700
             new_ann = sly.Annotation((height, width))
-            loop = sly.utils.get_or_create_event_loop()
+            
             coroutine = ds.set_ann_async("IMG_0748.jpeg", new_ann)
-            if loop.is_running():
-                future = asyncio.run_coroutine_threadsafe(coroutine, loop)
-                future.result()
-            else:
-                loop.run_until_complete(coroutine)
+            run_coroutine(coroutine)
         """
         if type(ann) is not self.annotation_class:
             raise TypeError(
@@ -3734,6 +3723,7 @@ class Project:
             .. code-block:: python
 
                 import supervisely as sly
+                from supervisely._utils import run_coroutine
 
                 os.environ['SERVER_ADDRESS'] = 'https://app.supervisely.com'
                 os.environ['API_TOKEN'] = 'Your Supervisely API Token'
@@ -3741,14 +3731,9 @@ class Project:
 
                 project_id = 8888
                 save_directory = "/path/to/save/projects"
-
-                loop = sly.utils.get_or_create_event_loop()
-                coro = sly.Project.download_async(api, project_id, save_directory)
-                if loop.is_running():
-                    future = asyncio.run_coroutine_threadsafe(coroutine, loop)
-                    future.result()
-                else:
-                    loop.run_until_complete(coroutine)
+                
+                coroutine = sly.Project.download_async(api, project_id, save_directory)
+                run_coroutine(coroutine)
         """
         if kwargs.pop("cache", None) is not None:
             logger.warning(

{supervisely-6.73.329 → supervisely-6.73.330}/supervisely/project/video_project.py

@@ -1211,6 +1211,7 @@ class VideoProject(Project):
         .. code-block:: python
 
             import supervisely as sly
+            from supervisely._utils import run_coroutine
 
             os.environ['SERVER_ADDRESS'] = 'https://app.supervisely.com'
             os.environ['API_TOKEN'] = 'Your Supervisely API Token'
@@ -1219,13 +1220,9 @@ class VideoProject(Project):
             save_directory = "/home/admin/work/supervisely/source/video_project"
             project_id = 8888
 
-            loop = sly.utils.get_or_create_event_loop()
             coroutine = sly.VideoProject.download_async(api, project_id, save_directory)
-            if loop.is_running():
-                future = asyncio.run_coroutine_threadsafe(coroutine, loop)
-                future.result()
-            else:
-                loop.run_until_complete(coroutine)
+            run_coroutine(coroutine)
+            
         """
         await download_video_project_async(
             api=api,

{supervisely-6.73.329 → supervisely-6.73.330/supervisely.egg-info}/PKG-INFO

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