remotivelabs-cli 0.0.27__tar.gz → 0.0.28__tar.gz

{remotivelabs_cli-0.0.27 → remotivelabs_cli-0.0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remotivelabs-cli
-Version: 0.0.27
+Version: 0.0.28
 Summary: CLI for operating RemotiveCloud and RemotiveBroker
 Author: Johan Rask
 Author-email: johan.rask@remotivelabs.com

{remotivelabs_cli-0.0.27 → remotivelabs_cli-0.0.28}/cli/cloud/auth_tokens.py

@@ -46,16 +46,17 @@ def list_personal_access_tokens() -> None:
 @app.command(name="revoke")
 def revoke(name_or_file: str = typer.Argument(help="Name or file path of the access token to revoke")) -> None:
     """
-        Revoke an access token by token name or path to a file containing that token
-
-        Name is found in the json file
-
-        {
-            "expires": "2034-07-31",
-            "token": "xxx",
-            "created": "2024-07-31T09:18:50.406+02:00",
-            "name": "token_name"
+    Revoke an access token by token name or path to a file containing that token
+
+    Name is found in the json file
+    ```
+    {
+        "expires": "2034-07-31",
+        "token": "xxx",
+        "created": "2024-07-31T09:18:50.406+02:00",
+        "name": "token_name"
     }
+    ```
     """
     name = name_or_file
     if "." in name_or_file:

{remotivelabs_cli-0.0.27 → remotivelabs_cli-0.0.28}/cli/cloud/filestorage.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import sys
 from pathlib import Path
@@ -96,11 +98,24 @@ def copy_file(  # noqa: C901 # type: ignore[too-many-branches]  # pylint: disabl
     if source.startswith("rcs://"):
         __copy_to_local(source=source, dest=dest, project=project)
     else:
-        __copy_to_remote(source=source, dest=dest, project=project)
+        path = Path(source)
+        if path.is_dir():
+            print("is dir")
+            for file_path in path.rglob("*"):
+                if file_path.is_file():
+                    print(file_path)
+                    __copy_to_remote(source=source, dest=dest, project=project)
+            sys.exit(1)
+        else:
+            __copy_to_remote(source=source, dest=dest, project=project)
 
 
 def __copy_to_remote(source: str, dest: str, project: str) -> None:
     path = Path(source)
+    if path.is_dir():
+        print("is dir")
+        sys.exit(1)
+
     if not path.exists():
         ErrorPrinter.print_hint("Source file does not exist")
         sys.exit(1)
@@ -111,11 +126,11 @@ def __copy_to_remote(source: str, dest: str, project: str) -> None:
     res = Rest.handle_post(f"/api/project/{project}/files/storage{rcs_path}", return_response=True)
     if res is None:
         return
-    json = res.json()
-    url = json["url"]
-    content_type = json["contentType"]
+    json_res = res.json()
+    url = json_res["url"]
+    headers = json_res["headers"]
     try:
-        upload.upload_signed_url(url, source, content_type)
+        upload.upload_signed_url(url, source, headers)
     except IsADirectoryError:
         ErrorPrinter.print_hint(f"Supplied source file '{source}' is a directory but must be a file")
 

{remotivelabs_cli-0.0.27 → remotivelabs_cli-0.0.28}/cli/cloud/resumable_upload.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
+
 import os
 import sys
+from typing import Dict
 
 import requests
 from rich.progress import wrap_file
@@ -21,11 +24,12 @@ def __get_uploaded_bytes(upload_url: str) -> int:
     return 0
 
 
-def upload_signed_url(signed_url: str, source_file_name: str, content_type: str) -> None:
+def with_resumable_upload_signed_url(signed_url: str, source_file_name: str, content_type: str) -> None:
     """
     Upload file to file storage with signed url and resumable upload.
     Resumable upload will only work with the same URL and not if a new signed URL is requested with the
     same object id.
+    :param content_type:
     :param signed_url:
     :param source_file_name:
     :return:
@@ -60,3 +64,22 @@ def upload_signed_url(signed_url: str, source_file_name: str, content_type: str)
                     sys.exit(1)
 
     print(f"File {source_file_name} uploaded successfully.")
+
+
+def upload_signed_url(signed_url: str, source_file_name: str, headers: Dict[str, str]) -> None:
+    """
+    Upload file to file storage with signed url and resumable upload.
+    Resumable upload will only work with the same URL and not if a new signed URL is requested with the
+    same object id.
+    :param headers:
+    :param signed_url:
+    :param source_file_name:
+    :return:
+    """
+    with open(source_file_name, "rb") as f:
+        response = requests.put(signed_url, headers=headers, timeout=60, data=f)
+        if response.status_code not in (200, 201, 308):
+            ErrorPrinter.print_generic_error(f"Failed to upload file: {response.status_code} - {response.text}")
+            sys.exit(1)
+
+    print(f"File {source_file_name} uploaded successfully.")

{remotivelabs_cli-0.0.27 → remotivelabs_cli-0.0.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "remotivelabs-cli"
-version = "0.0.27"
+version = "0.0.28"
 description = "CLI for operating RemotiveCloud and RemotiveBroker"
 authors = ["Johan Rask <johan.rask@remotivelabs.com>"]
 readme = "README.md"