supervisely 6.73.248__tar.gz → 6.73.250__tar.gz

{supervisely-6.73.248/supervisely.egg-info → supervisely-6.73.250}/PKG-INFO

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

{supervisely-6.73.248 → supervisely-6.73.250}/supervisely/api/api.py

@@ -1011,6 +1011,7 @@ class Api:
         headers: Optional[Dict[str, str]] = None,
         retries: Optional[int] = None,
         raise_error: Optional[bool] = False,
+        timeout: httpx._types.TimeoutTypes = 60,
     ) -> httpx.Response:
         """
         Performs POST request to server with given parameters using httpx.
@@ -1031,6 +1032,8 @@ class Api:
         :type retries: int, optional
         :param raise_error: Define, if you'd like to raise error if connection is failed.
         :type raise_error: bool, optional
+        :param timeout: Overall timeout for the request.
+        :type timeout: float, optional
         :return: Response object
         :rtype: :class:`httpx.Response`
         """
@@ -1057,6 +1060,7 @@ class Api:
                     json=json,
                     params=params,
                     headers=headers,
+                    timeout=timeout,
                 )
                 if response.status_code != httpx.codes.OK:
                     self._check_version()
@@ -1098,6 +1102,7 @@ class Api:
         params: httpx._types.QueryParamTypes,
         retries: Optional[int] = None,
         use_public_api: Optional[bool] = True,
+        timeout: httpx._types.TimeoutTypes = 60,
     ) -> httpx.Response:
         """
         Performs GET request to server with given parameters.
@@ -1110,6 +1115,8 @@ class Api:
         :type retries: int, optional
         :param use_public_api: Define if public API should be used. Default is True.
         :type use_public_api: bool, optional
+        :param timeout: Overall timeout for the request.
+        :type timeout: float, optional
         :return: Response object
         :rtype: :class:`Response<Response>`
         """
@@ -1131,7 +1138,12 @@ class Api:
         for retry_idx in range(retries):
             response = None
             try:
-                response = self.httpx_client.get(url, params=request_params, headers=self.headers)
+                response = self.httpx_client.get(
+                    url,
+                    params=request_params,
+                    headers=self.headers,
+                    timeout=timeout,
+                )
                 if response.status_code != httpx.codes.OK:
                     Api._raise_for_status_httpx(response)
                 return response
@@ -1170,7 +1182,7 @@ class Api:
         raise_error: Optional[bool] = False,
         chunk_size: int = 8192,
         use_public_api: Optional[bool] = True,
-        timeout: httpx._types.TimeoutTypes = 15,
+        timeout: httpx._types.TimeoutTypes = 60,
     ) -> Generator:
         """
         Performs streaming GET or POST request to server with given parameters.
@@ -1325,6 +1337,7 @@ class Api:
         headers: Optional[Dict[str, str]] = None,
         retries: Optional[int] = None,
         raise_error: Optional[bool] = False,
+        timeout: httpx._types.TimeoutTypes = 60,
     ) -> httpx.Response:
         """
         Performs POST request to server with given parameters using httpx.
@@ -1345,6 +1358,8 @@ class Api:
         :type retries: int, optional
         :param raise_error: Define, if you'd like to raise error if connection is failed.
         :type raise_error: bool, optional
+        :param timeout: Overall timeout for the request.
+        :type timeout: float, optional
         :return: Response object
         :rtype: :class:`httpx.Response`
         """
@@ -1371,6 +1386,7 @@ class Api:
                     json=json,
                     params=params,
                     headers=headers,
+                    timeout=timeout,
                 )
                 if response.status_code != httpx.codes.OK:
                     self._check_version()
@@ -1417,7 +1433,7 @@ class Api:
         range_end: Optional[int] = None,
         chunk_size: int = 8192,
         use_public_api: Optional[bool] = True,
-        timeout: httpx._types.TimeoutTypes = 15,
+        timeout: httpx._types.TimeoutTypes = 60,
     ) -> AsyncGenerator:
         """
         Performs asynchronous streaming GET or POST request to server with given parameters.

{supervisely-6.73.248 → supervisely-6.73.250}/supervisely/cli/release/release.py

@@ -1,18 +1,19 @@
+import datetime
 import json
 import os
 import random
 import re
-import string
-import datetime
 import shutil
-import tarfile
-import requests
+import string
 import subprocess
+import tarfile
 from pathlib import Path
+
 import git
+import requests
+from giturlparse import parse
 from requests_toolbelt import MultipartEncoder, MultipartEncoderMonitor
 from tqdm import tqdm
-from giturlparse import parse
 
 
 def slug_is_valid(slug):
@@ -90,9 +91,7 @@ def get_instance_version(token, server):
         "x-api-key": token,
         "Content-Type": "application/json",
     }
-    r = requests.post(
-        f'{server.rstrip("/")}/public/api/v3/instance.version', headers=headers
-    )
+    r = requests.post(f'{server.rstrip("/")}/public/api/v3/instance.version', headers=headers)
     if r.status_code == 403:
         raise PermissionError()
     if r.status_code == 404:
@@ -139,6 +138,7 @@ def upload_archive(
     share_app,
 ):
     f = open(archive_path, "rb")
+    archive_name = os.path.basename(archive_path)
     fields = {
         "appKey": appKey,
         "subAppPath": subapp_path,
@@ -147,9 +147,9 @@ def upload_archive(
         "readme": readme,
         "modalTemplate": modal_template,
         "archive": (
-            "arhcive.tar.gz",
+            archive_name,
             f,
-            "application/gzip",
+            "application/gzip" if archive_name.endswith(".tar.gz") else "application/x-tar",
         ),
     }
     if slug:
@@ -166,9 +166,7 @@ def upload_archive(
         unit_scale=True,
         unit_divisor=1024,
     ) as bar:
-        m = MultipartEncoderMonitor(
-            e, lambda monitor: bar.update(monitor.bytes_read - bar.n)
-        )
+        m = MultipartEncoderMonitor(e, lambda monitor: bar.update(monitor.bytes_read - bar.n))
         response = requests.post(
             f"{server_address.rstrip('/')}/public/api/v3/ecosystem.release",
             data=m,
@@ -194,14 +192,20 @@ def archive_application(repo: git.Repo, config, slug):
     app_folder_name = re.sub("[ \/]", "-", app_folder_name)
     app_folder_name = re.sub("[\"'`,\[\]\(\)]", "", app_folder_name)
     working_dir_path = Path(repo.working_dir).absolute()
-    with tarfile.open(archive_folder + "/archive.tar.gz", "w:gz") as tar:
+    if config.get("type", "app") == "client_side_app":
+        archive_path = archive_folder + "/archive.tar"
+        write_mode = "w"
+    else:
+        archive_path = archive_folder + "/archive.tar.gz"
+        write_mode = "w:gz"
+    with tarfile.open(archive_path, write_mode) as tar:
         for path in file_paths:
             if path.is_file():
                 tar.add(
                     path.absolute(),
                     Path(app_folder_name).joinpath(path.relative_to(working_dir_path)),
                 )
-    return archive_folder
+    return archive_path
 
 
 def get_user(server_address, api_token):
@@ -209,9 +213,7 @@ def get_user(server_address, api_token):
         "x-api-key": api_token,
         "Content-Type": "application/json",
     }
-    r = requests.post(
-        f'{server_address.rstrip("/")}/public/api/v3/users.me', headers=headers
-    )
+    r = requests.post(f'{server_address.rstrip("/")}/public/api/v3/users.me', headers=headers)
     if r.status_code == 403:
         raise PermissionError()
     if r.status_code == 404 or r.status_code == 400:
@@ -256,7 +258,7 @@ def release(
 ):
     if created_at is None:
         created_at = get_created_at(repo, release_version)
-    archive_dir = archive_application(repo, config, slug)
+    archive_path = archive_application(repo, config, slug)
     release = {
         "name": release_name,
         "version": release_version,
@@ -265,7 +267,7 @@ def release(
         release["createdAt"] = created_at
     try:
         response = upload_archive(
-            archive_dir + "/archive.tar.gz",
+            archive_path,
             server_address,
             api_token,
             appKey,
@@ -279,5 +281,5 @@ def release(
             share_app,
         )
     finally:
-        delete_directory(archive_dir)
+        delete_directory(os.path.dirname(archive_path))
     return response

{supervisely-6.73.248 → supervisely-6.73.250}/supervisely/project/project.py

@@ -4605,6 +4605,9 @@ async def _download_project_item_async(
     Uses parameters from the parent function _download_project_async.
     """
     if save_images:
+        logger.debug(
+            f"Downloading 1 image in single mode: {img_info.name} with _download_project_item_async"
+        )
         img_bytes = await api.image.download_bytes_single_async(
             img_info.id, semaphore=semaphore, check_hash=True
         )
@@ -4667,6 +4670,9 @@ async def _download_project_items_batch_async(
         img_ids = [img_info.id for img_info in img_infos]
         imgs_bytes = [None] * len(img_ids)
         temp_dict = {}
+        logger.debug(
+            f"Downloading {len(img_ids)} images in bulk with _download_project_items_batch_async"
+        )
         async for img_id, img_bytes in api.image.download_bytes_generator_async(
             dataset_id,
             img_ids,

{supervisely-6.73.248 → supervisely-6.73.250/supervisely.egg-info}/PKG-INFO

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