supervisely 6.73.248__py3-none-any.whl → 6.73.249__py3-none-any.whl

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.dist-info → supervisely-6.73.249.dist-info}/METADATA

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

{supervisely-6.73.248.dist-info → supervisely-6.73.249.dist-info}/RECORD

@@ -546,7 +546,7 @@ supervisely/cli/project/project_download.py,sha256=dEznxE_MhLTYbU9KBbdmw-Ria1Knh
 supervisely/cli/project/project_get.py,sha256=RWnMxuKd_WWhUlA5QEqI_9d4N6x8VDq0taPTWB8nxXc,689
 supervisely/cli/project/project_upload.py,sha256=qA_0ktOpJxUUa_Hliwvny8-uIYDQBiuzHMq8nufbLd4,1416
 supervisely/cli/release/__init__.py,sha256=5aDijgIIDsKFZVayq8anvv5ynWKhC4LZqAdESTKCW2c,335
-supervisely/cli/release/release.py,sha256=rnCGTbxZ0KhBR8Xc_cdr8KtzI5v28VggbJCiqfBNw7I,7572
+supervisely/cli/release/release.py,sha256=OQEcc9fABWYBzuLc-69jNprtbGsD3QRfxFV3inH_krY,7841
 supervisely/cli/release/run.py,sha256=z6jDTVweCnlaIWsdUIN282B_JUqYZefJMIPLZnq2g9U,19899
 supervisely/cli/task/__init__.py,sha256=n0ofJDqX3AMvvTz1umfBDfEUPDFzk5Htve3nnZFd7fs,67
 supervisely/cli/task/task_set.py,sha256=KIGJ-X0iB7DzX3Ig8720FJh1WpohTVkkPk8HZt2rIzM,1337
@@ -1041,9 +1041,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.248.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.248.dist-info/METADATA,sha256=0R4I5m8-EAFFV8m29WqXyaj3kbtRi5O8AbRa3OeyCpI,33351
-supervisely-6.73.248.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.248.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.248.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.248.dist-info/RECORD,,
+supervisely-6.73.249.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.249.dist-info/METADATA,sha256=FBoF2tXmhzf_EnSJp7NDXFSo33Wo4Tu-oTMHcdxBA94,33351
+supervisely-6.73.249.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.249.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.249.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.249.dist-info/RECORD,,