remotivelabs-cli 0.0.29__py3-none-any.whl → 0.0.31__py3-none-any.whl

cli/cloud/filestorage.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 import os.path
 import sys
 from pathlib import Path
@@ -75,6 +76,7 @@ def delete_file(
 def copy_file(  # noqa: C901 # type: ignore[too-many-branches]  # pylint: disable=no-member
     source: str = typer.Argument(default=..., help="Remote or local path to source file"),
     dest: str = typer.Argument(default=..., help="Remote or local path to destination file"),
+    overwrite: bool = typer.Option(default=False, help="Overwrite existing file on RCS"),
     project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
 ) -> None:
     """
@@ -100,20 +102,17 @@ def copy_file(  # noqa: C901 # type: ignore[too-many-branches]  # pylint: disabl
     else:
         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)
+                    __copy_to_remote(source=source, dest=dest, project=project, overwrite=overwrite)
             sys.exit(1)
         else:
-            __copy_to_remote(source=source, dest=dest, project=project)
+            __copy_to_remote(source=source, dest=dest, project=project, overwrite=overwrite)
 
 
-def __copy_to_remote(source: str, dest: str, project: str) -> None:
+def __copy_to_remote(source: str, dest: str, project: str, overwrite: bool) -> None:
     path = Path(source)
     if path.is_dir():
-        print("is dir")
         sys.exit(1)
 
     if not path.exists():
@@ -123,7 +122,8 @@ def __copy_to_remote(source: str, dest: str, project: str) -> None:
     rcs_path = __check_rcs_path(dest)
     if rcs_path.endswith("/"):
         rcs_path = rcs_path + filename
-    res = Rest.handle_post(f"/api/project/{project}/files/storage{rcs_path}", return_response=True)
+    upload_options = {"overwrite": "always" if overwrite else "never"}
+    res = Rest.handle_post(f"/api/project/{project}/files/storage{rcs_path}", return_response=True, body=json.dumps(upload_options))
     if res is None:
         return
     json_res = res.json()

cli/cloud/recordings.py

@@ -58,7 +58,9 @@ def list_recordings(
     """
 
     if is_processing:
-        Rest.handle_get(f"/api/project/{project}/files/recording/processing")
+        res = Rest.handle_get(f"/api/project/{project}/files/recording/processing", return_response=True)
+        json_res: List[Dict[str, Any]] = res.json()
+        print(json.dumps(list(filter(lambda r: r["status"] == "RUNNING" or r["status"] == "FAILED", json_res))))
     else:
         Rest.handle_get(f"/api/project/{project}/files/recording")
 
@@ -79,7 +81,44 @@ def describe(
 #                     body=json.dumps({'projectUid': target_project}))
 
 
-def do_start(name: str, project: str, api_key: str, return_response: bool = False) -> requests.Response | None:
+@app.command(name="import")
+def import_as_recording(
+    project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
+    path: str = typer.Argument(default=..., help="Remote storage path to file to delete"),
+) -> None:
+    """
+    Imports a file from Storage as a recording.
+    NOTE that Storage is not yet available to all customers
+    """
+
+    if path.startswith("rcs://"):
+        final_path = __check_rcs_path(path)
+    else:
+        ErrorPrinter.print_hint("Path must start with rcs://")
+        sys.exit(1)
+
+    Rest.handle_post(
+        url=f"/api/project/{project}/files/recording",
+        return_response=True,
+        progress_label=f"Importing {final_path}...",
+        body=json.dumps({"path": final_path}),
+    )
+
+    ErrorPrinter.print_hint(
+        f"Import started, you can track progress with 'remotive cloud recordings list --is-processing --project {project}'"
+    )
+
+
+# Copied from filestorage
+def __check_rcs_path(path: str) -> str:
+    rcs_path = path.replace("rcs://", "/")
+    if rcs_path.startswith("/."):
+        ErrorPrinter.print_hint("Invalid path")
+        sys.exit(1)
+    return rcs_path
+
+
+def do_start(name: str, project: str, api_key: str, return_response: bool = False) -> requests.Response:
     if api_key == "":
         body = {"size": "S"}
     else:
@@ -125,13 +164,10 @@ def mount(  # noqa: C901
     else:
         r = Rest.handle_get(url=f"/api/project/{project}/brokers/{broker}", return_response=True, allow_status_codes=[404])
 
-        if r is None:
-            sys.exit(1)
         if r.status_code == 404:
             if ensure_broker_started:
                 r = do_start(broker, project, "", return_response=True)
-                if r is None:
-                    sys.exit(1)
+
                 if r.status_code != 200:
                     print(r.text)
                     sys.exit(1)

cli/cloud/rest_helper.py

@@ -102,7 +102,7 @@ class RestHelper:
         progress_label: str = "Fetching...",
         use_progress_indicator: bool = True,
         timeout: int = 20,
-    ) -> requests.Response | None:
+    ) -> requests.Response:
         # pylint: disable=R0913
         # Returns a Response object if succesfull otherwise None
         if params is None:
@@ -118,7 +118,7 @@ class RestHelper:
             RestHelper.check_api_result(r, allow_status_codes)
             return r
         RestHelper.print_api_result(r)
-        return requests.Response()
+        sys.exit(0)
 
     @staticmethod
     def has_access(url: str, params: Any = {}) -> bool:  # pylint: disable=W0102
@@ -174,7 +174,7 @@ class RestHelper:
     @staticmethod
     def handle_post(  # pylint: disable=W0102
         url: str, body: Any = None, params: Any = {}, progress_label: str = "Processing...", return_response: bool = False
-    ) -> requests.Response | None:
+    ) -> requests.Response:
         # Returns a Response object if succesfull otherwise, None
         RestHelper.ensure_auth_token()
         RestHelper.__headers["content-type"] = "application/json"
@@ -187,7 +187,7 @@ class RestHelper:
             return r
 
         RestHelper.print_api_result(r)
-        return None
+        sys.exit(0)
 
     @staticmethod
     def handle_put(url: str, body: Any = None, params: Any = {}, return_response: bool = False) -> requests.Response | None:  # pylint: disable=W0102

cli/cloud/resumable_upload.py

@@ -76,10 +76,12 @@ def upload_signed_url(signed_url: str, source_file_name: str, headers: Dict[str,
     :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)
+
+    with open(source_file_name, "rb") as file:
+        with wrap_file(file, os.stat(source_file_name).st_size, description=f"Uploading {source_file_name}...") 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.29.dist-info → remotivelabs_cli-0.0.31.dist-info}/METADATA

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

{remotivelabs_cli-0.0.29.dist-info → remotivelabs_cli-0.0.31.dist-info}/RECORD

@@ -16,13 +16,13 @@ cli/cloud/auth_tokens.py,sha256=0U60Gk2-TnAUff5anZmTB1rOEninNvYy1o5ihCqgj8A,4525
 cli/cloud/brokers.py,sha256=DNj79MTkPylKUQbr-iPUhQgfNJLAW8UehnvgpEmNH_k,3890
 cli/cloud/cloud_cli.py,sha256=09YCHs8IivYsVJOsxlM5OMEqBdq3QUXtDsktcO8Kjyw,1263
 cli/cloud/configs.py,sha256=xg3J-kaS-Pp0p9otV2cWl_oOWJzs_jZhXwFHz0gQxvc,4625
-cli/cloud/filestorage.py,sha256=cCPDYwCyJxP4V_qK1_Gnsg_T-zVsw6QaZdY_l4s4vC0,5445
+cli/cloud/filestorage.py,sha256=BZbSk9abuLYw9TjGsQpfYMobtE4VLgXFrWD1sVvGolY,5621
 cli/cloud/organisations.py,sha256=txKQmSQEpTmeqlqngai8pwgQQEvRgeDd0dT_VzZ7RNc,752
 cli/cloud/projects.py,sha256=YrwPJClC2Sq_y1HjPd_tzaiv4GEnnsXSXHBhtQCPdK0,1431
-cli/cloud/recordings.py,sha256=jnsc39CmIQQ3DUu5Mpe7wrr6aLCK870TRi6TcgGmiY0,24137
+cli/cloud/recordings.py,sha256=jai5Gim28UmZFGniUI9qKDwtLoi2Nllv4eyPeIk3OAc,25366
 cli/cloud/recordings_playback.py,sha256=PRzftmvG2iePrL9f6qTEXVOnyJ-etcyzn5w9CCxcSto,11539
-cli/cloud/rest_helper.py,sha256=8XgqmxoeW8zM0tYWNAn7rABJdvgJFYfy0adOo66kys4,11499
-cli/cloud/resumable_upload.py,sha256=sYThyhseXRniOMbctbO5p4BGVb9b7BXVBcmcZXwnClM,3550
+cli/cloud/rest_helper.py,sha256=lZp0NjQ8yOaggQGNiqNxHex_YFOmuq0rnLPtpLq3Z3Q,11470
+cli/cloud/resumable_upload.py,sha256=5R6TLq9j8h-qs5bgGFC-lVaEsTI4DoAiTsZcROVtqgw,3688
 cli/cloud/sample_recordings.py,sha256=OVX32U1dkkkJZysbgr5Dy515oOQKnwBAbZYzV_QUu1g,690
 cli/cloud/service_account_tokens.py,sha256=263u1bRmBKfYsxL6TV6YjReUBUaVHWc3ETCd7AS3DTU,2297
 cli/cloud/service_accounts.py,sha256=XOIPobUamCLIaufjyvb33XJDwy6uRqW5ZljZx3GYEfo,1659
@@ -36,8 +36,8 @@ cli/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/tools/can/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/tools/can/can.py,sha256=8uATViSFlpkdSiIm4fzbuQi1_m7V9Pym-K17TaJQRHU,2262
 cli/tools/tools.py,sha256=0KU-hXR1f9xHP4BOG9A9eXfmICLmNuQCOU8ueF6iGg0,198
-remotivelabs_cli-0.0.29.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.0.29.dist-info/METADATA,sha256=72C3NkomgtEga_Fwr-zzm-N-93nYvflrGr51ulAuh4Q,1318
-remotivelabs_cli-0.0.29.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-remotivelabs_cli-0.0.29.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.0.29.dist-info/RECORD,,
+remotivelabs_cli-0.0.31.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
+remotivelabs_cli-0.0.31.dist-info/METADATA,sha256=hXSuC1H53XacGz8LX3D4ySgdUIOncQG7iIWQEm5NdkI,1318
+remotivelabs_cli-0.0.31.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+remotivelabs_cli-0.0.31.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
+remotivelabs_cli-0.0.31.dist-info/RECORD,,