remotivelabs-cli 0.0.21__tar.gz → 0.0.22__tar.gz

{remotivelabs_cli-0.0.21 → remotivelabs_cli-0.0.22}/PKG-INFO

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

{remotivelabs_cli-0.0.21 → remotivelabs_cli-0.0.22}/cli/cloud/recordings.py

@@ -6,7 +6,10 @@ import os
 import re
 import sys
 import tempfile
+import time
+import urllib.parse
 from pathlib import Path
+from typing import Dict, List, Union
 
 import grpc
 import requests
@@ -193,7 +196,7 @@ def delete_recording_file(
 
 
 @app.command()
-def upload(
+def upload(  # noqa: C901
     path: Path = typer.Argument(
         ...,
         exists=True,
@@ -205,38 +208,86 @@ def upload(
         help="Path to recording file to upload",
     ),
     project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
-    recording_type: str = typer.Option("remotive-broker", help="Type of recording"),
-    signal_database: str = typer.Option(None, help="Signal database to use with candump"),
+    recording_session: str = typer.Option(default=None, help="Optional existing recording to upload file to"),
 ):
-    # TODO - Test to do this with typer Enums instead
-    # Validate this here to validate before we start any progress
-    if recording_type == "candump" and (signal_database is None or signal_database == ""):
-        ErrorPrinter.print_hint("Option --signal-database is required with --recording-type is 'candump'")
-        exit(1)
+    """
+    Uploads a recording to RemotiveCloud.
+    Except for recordings from RemotiveBroker you can also upload Can ASC (.asc), Can BLF(.blf) and  Can LOG (.log, .txt)
+    """
 
     filename = os.path.basename(path.name)
     rest.ensure_auth_token()
 
-    if recording_type == "candump":
-        rest.headers["x-recording-type"] = "candump"
-        r = rest.handle_post(
-            url=f"/api/project/{project}/files/recording/{filename}",
-            return_response=True,
-            progress_label="Requesting recording upload...",
-            body=json.dumps({"dbcFile": signal_database}),
-        )
-    else:
+    if recording_session is None:
         r = rest.handle_post(f"/api/project/{project}/files/recording/{filename}", return_response=True)
+    else:
+        r = rest.handle_post(f"/api/project/{project}/files/recording/{recording_session}/recording-file/{filename}", return_response=True)
+
+    upload_url = r.text
+    url_path = urllib.parse.urlparse(upload_url).path
+    # Upload_id is the first part of the path
+    match = re.match(r"^/([^/]+)/organisation/(.*)$", url_path)
+    if match:
+        upload_id = match.group(1)
+    else:
+        ErrorPrinter.print_generic_error(
+            "Something went wrong, please try again. Please contact RemotiveLabs support if this problem remains"
+        )
+        ErrorPrinter.print_hint("Please make sure to use the latest version of RemotiveCLI")
+        exit(1)
 
-    response = rest.upload_file_with_signed_url(path=path, url=r.text, upload_headers={"Content-Type": "application/x-www-form-urlencoded"})
+    upload_response = rest.upload_file_with_signed_url(
+        path=path, url=upload_url, upload_headers={"Content-Type": "application/x-www-form-urlencoded"}, return_response=True
+    )
+
+    # Exact same as in cloud console
+    def get_processing_message(step: str) -> str:
+        if step == "REQUESTED":
+            return "Preparing file..."
+        if step == "VALIDATING":
+            return "Validating file..."
+        if step == "CONVERT":
+            return "Converting file..."
+        if step == "SPLIT":
+            return "Splitting file..."
+        if step == "ZIP":
+            return "Compressing file..."
+        if step == "FINALIZE":
+            return "Finishing up..."
+        return "Processing..."
+
+    # print(response)
+    if 200 <= upload_response.status_code < 300:
+        # We need to print the error message outside the with Progress so the indicator is closed
+        error_message: Union[str, None] = None
+        with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}"), transient=True) as p:
+            t = p.add_task("Processing...", total=1)
+            while True:
+                time.sleep(1)
+                r = rest.handle_get(
+                    f"/api/project/{project}/files/recording/processing", return_response=True, use_progress_indicator=False
+                )
+                status_list: List[Dict[str, any]] = r.json()
+                res = list(filter(lambda s: s["uploadId"] == upload_id, status_list))
+                if len(res) == 1:
+                    tracking_state = res[0]
+                    if tracking_state["status"] != "FAILED" and tracking_state["status"] != "SUCCESS":
+                        p.update(task_id=t, description=get_processing_message(tracking_state["step"]))
+                    else:
+                        if tracking_state["status"] == "FAILED":
+                            error_message = f"Processing of uploaded file failed: {tracking_state['errors'][0]['message']}"
+                        else:
+                            print("File successfully uploaded")
+                        break
+                else:
+                    error_message = "Something went wrong, please try again. Please contact RemotiveLabs support if this problem remains"
+                    break
+        if error_message is not None:
+            ErrorPrinter.print_generic_error(error_message)
+            exit(1)
 
-    if 200 <= response.status_code < 300:
-        print(
-            "File successfully uploaded, please run 'remotive cloud recordings list' "
-            "to verify that the recording was successfully processed"
-        )
     else:
-        rest.err_console.print(f":boom: [bold red]Got status code[/bold red]: {response.status_code} {response.text}")
+        rest.err_console.print(f":boom: [bold red]Got status code[/bold red]: {upload_response.status_code} {upload_response.text}")
 
 
 @app.command()
@@ -450,9 +501,9 @@ def _do_change_playback_mode(mode: str, recording_session: str, broker: str, pro
         # Here we try to verify that we are operating on a recording that is mounted on the
         # broker so we can verify this before we try playback and can also present some good
         # error messages
-        tmp = tempfile.NamedTemporaryFile()
-        broker.download(".cloud.context", tmp.name, True)
-        with open(tmp.name, "r") as f:
+        tmp = os.path.join(tempfile.gettempdir(), os.urandom(24).hex())
+        broker.download(".cloud.context", tmp, True)
+        with open(tmp, "r") as f:
             json_context = json.loads(f.read())
             if json_context["recordingSessionId"] != recording_session:
                 ErrorPrinter.print_generic_error(
@@ -496,3 +547,9 @@ def get_filename_from_cd(cd):
     if len(fname) == 0:
         return None
     return fname[0]
+
+
+def use_progress(label: str):
+    p = Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}"), transient=True)
+    t = p.add_task(label, total=1)
+    return (p, t)

{remotivelabs_cli-0.0.21 → remotivelabs_cli-0.0.22}/cli/cloud/rest_helper.py

@@ -185,7 +185,7 @@ def upload_file_with_signed_url(
     path: Union[str, Path], url: str, upload_headers: dict[str, str], return_response: bool = False, progress_label="Uploading..."
 ):
     with open(path, "rb") as file:
-        with wrap_file(file, os.stat(path).st_size, description=progress_label) as f:
+        with wrap_file(file, os.stat(path).st_size, description=progress_label, transient=True) as f:
             r = requests.put(url, data=f, headers=upload_headers)
         if return_response:
             check_api_result(r)

{remotivelabs_cli-0.0.21 → remotivelabs_cli-0.0.22}/pyproject.toml

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