remotivelabs-cli 0.0.11__py3-none-any.whl → 0.0.13__py3-none-any.whl

cli/broker/brokers.py

@@ -1,12 +1,9 @@
 from __future__ import annotations
 
 import os
-import signal as os_signal
 from time import sleep
-from typing import List
 
 import typer
-from rich.progress import Progress, SpinnerColumn, TextColumn
 from zeroconf import (
     IPVersion,
     ServiceBrowser,
@@ -15,7 +12,6 @@ from zeroconf import (
 )
 
 from . import export, files, playback, record, scripting, signals
-from .lib.broker import Broker
 
 app = typer.Typer(rich_markup_mode="rich")
 
@@ -31,60 +27,6 @@ def main(
     return
 
 
-@app.command(name="x-diagnose")
-def diagnose(
-    namespace: List[str] = typer.Option([], help="Namespace to diagnose"),
-    all_namespaces: bool = typer.Option(False, help="Scan all namespaces, must be true if no namespaces provided"),
-    wait_for_traffic: bool = typer.Option(False, help="Wait until traffic is found on any bus"),
-    quiet: bool = typer.Option(False, help="Do not prompt me"),
-    url: str = typer.Option(..., help="Broker URL", envvar="REMOTIVE_BROKER_URL"),
-    api_key: str = typer.Option("offline", help="Cloud Broker API-KEY or access token", envvar="REMOTIVE_BROKER_API_KEY"),
-):
-    """
-    [Experimental] - Performs a scan on specified buses to see if the is any traffic coming on the buses. This works
-    for both recordings and live data
-
-    """
-
-    if not quiet:
-        do_it = typer.confirm(
-            """
-        This will perform recordings on selected buses, make sure there are no recordings currently running on the broker.
-        """
-        )
-        if not do_it:
-            print("Skipping diagnosis")
-            raise typer.Abort()
-
-    broker = Broker(url, api_key)
-    with Progress(
-        SpinnerColumn(),
-        TextColumn("[progress.description]{task.description}"),
-        transient=True,
-    ) as progress:
-        if len(namespace) > 0 and all_namespaces:
-            print("No namespaces should be supplied when all-namespaces is used")
-            raise typer.Exit(1)
-        if len(namespace) == 0 and not all_namespaces:
-            print("No namespaces chosen")
-            raise typer.Exit(1)
-
-        if all_namespaces:
-            namespace = broker.list_namespaces()
-
-        if wait_for_traffic:
-            progress.add_task(description=f"Scanning for traffic on  {namespace} [Ctrl+C to exit] ", total=1)
-        else:
-            progress.add_task(description=f"Scanning for traffic on  {namespace}... (just a few seconds)", total=1)
-
-        def on_sigint(sig, frame):
-            progress.add_task(description="Cleaning up, please wait...", total=None)
-
-        os_signal.signal(os_signal.SIGINT, on_sigint)
-
-        broker.diagnose(namespace, wait_for_traffic)
-
-
 @app.command(help="Discover brokers on this network")
 def discover():
     # print("Not implemented")

cli/broker/lib/broker.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import binascii
+import datetime
 import ntpath
 import os
 import posixpath
@@ -8,6 +9,7 @@ import queue
 import signal as os_signal
 import tempfile
 import time
+import typing
 import zipfile
 from dataclasses import dataclass
 from threading import Thread
@@ -181,6 +183,27 @@ class Broker:
             self.__check_playbackmode_result(status)
         return status
 
+    def listen_on_playback(self, callback: Callable[[str], None]):
+        def get_mode(mode: int):
+            if mode == 0:
+                return "playing"
+            if mode == 1:
+                return "paused"
+            if mode == 2:
+                return "stopped"
+
+        sub = self.traffic_stub.PlayTrafficStatus(br.common_pb2.Empty())
+        for playback_state in sub:
+            p = typing.cast(br.traffic_api_pb2.PlaybackInfos, playback_state)
+            offset_time = int(p.playbackInfo[0].playbackMode.offsetTime / 1000000)
+            start_time = p.playbackInfo[0].playbackMode.startTime
+            end_time = p.playbackInfo[0].playbackMode.endTime
+            mode = p.playbackInfo[0].playbackMode.mode
+
+            length = int((end_time - start_time) / 1000000)
+
+            callback(f"{(datetime.timedelta(seconds=offset_time))} / {(datetime.timedelta(seconds=length))} ({get_mode(mode)})")
+
     def pause(self, namespace: str, path: str, silent: bool = False):
         playback_list = [
             {

cli/broker/signals.py

@@ -5,13 +5,12 @@ import numbers
 import os
 import signal as os_signal
 from pathlib import Path
-from typing import List, TypedDict, Union
+from typing import List, TypedDict
 
 import grpc
 import plotext as plt
 import typer
 from rich import print as rich_rprint
-from typing_extensions import Annotated
 
 from cli.errors import ErrorPrinter
 
@@ -57,43 +56,38 @@ def read_scripted_code_file(file_path: Path) -> bytes:
 
 @app.command()
 def subscribe(  # noqa: C901
-    url: str = typer.Option(help="Broker URL", envvar="REMOTIVE_BROKER_URL"),
+    url: str = typer.Option(..., help="Broker URL", envvar="REMOTIVE_BROKER_URL"),
     api_key: str = typer.Option(None, help="Cloud Broker API-KEY or access token", envvar="REMOTIVE_BROKER_API_KEY"),
     signal: List[str] = typer.Option(None, help="Signal names to subscribe to, mandatory when not using script"),
-    namespace: List[str] = typer.Option(None, help="Deprecated, use --signal namespace:signal"),
-    script: Union[
-        Annotated[
-            Path,
-            typer.Option(
-                ...,
-                exists=True,
-                file_okay=True,
-                dir_okay=False,
-                writable=False,
-                readable=True,
-                resolve_path=True,
-                help="Supply a path to Lua script that to use for signal transformation",
-            ),
-        ],
+    script: Path = typer.Option(
         None,
-    ] = None,
+        exists=True,
+        file_okay=True,
+        dir_okay=False,
+        writable=False,
+        readable=True,
+        resolve_path=True,
+        help="Supply a path to Lua script that to use for signal transformation",
+    ),
     on_change_only: bool = typer.Option(default=False, help="Only get signal if value is changed"),
-    x_plot: bool = typer.Option(default=False, help="Experimental: Plot the signal in terminal. Note graphs are not aligned by time"),
+    x_plot: bool = typer.Option(default=False, help="Experimental: Plot the signal in terminal. Note graphs are not " "aligned by time"),
     x_plot_size: int = typer.Option(default=100, help="Experimental: how many points show for each plot"),
     # samples: int = typer.Option(default=0, he)
 ):
     """
-    Sample usage:
+    Subscribe to a selection of signals
 
-    remotive broker signals subscribe  --url http://localhost:50051 --namespace can0 --signal signal1 --signal signal2
+    Subscribe to two signals and have it printed to terminal
+    ```
+    remotive broker signals subscribe  --url http://localhost:50051 --signal can1:signal1 --signal can0:signal2
+    ```
 
+    Subscribe using a LUA script with signal transformations, read more about scripted signals at https://docs.remotivelabs.com/docs/remotive-broker
+    ```
     remotive broker signals subscribe  --url http://localhost:50051 --script myvss_script.lua
+    ```
     """
 
-    if namespace is not None and len(namespace) > 0:
-        ErrorPrinter.print_hint("--namespace has been deprecated and you should instead use --signal namespace:signal when subscribing")
-        exit(1)
-
     if script is None:
         if len(signal) == 0:
             ErrorPrinter.print_generic_error("You must use include at least one signal and one namespace or use script when subscribing")

cli/cloud/configs.py

@@ -1,5 +1,7 @@
+import os.path
 import shutil
 import sys
+from pathlib import Path
 
 import requests
 import typer
@@ -23,6 +25,26 @@ def delete(
     rest.handle_delete(f"/api/project/{project}/files/config/{signal_db_file}")
 
 
+@app.command()
+def upload(
+    path: Path = typer.Argument(
+        ...,
+        exists=True,
+        file_okay=True,
+        dir_okay=False,
+        writable=False,
+        readable=True,
+        resolve_path=True,
+        help="Path to signal database file to upload",
+    ),
+    project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
+):
+    """
+    Uploads signal database to project
+    """
+    rest.upload_file(path=path, url=f"/api/project/{project}/files/config/{os.path.basename(path)}/uploadfile")
+
+
 @app.command()
 def download(
     signal_db_file: str = typer.Argument("", help="Signal database file"),

cli/cloud/recordings.py

@@ -11,8 +11,7 @@ from pathlib import Path
 import grpc
 import requests
 import typer
-from rich.progress import track
-from typing_extensions import Annotated
+from rich.progress import Progress, SpinnerColumn, TextColumn, track
 
 from cli.errors import ErrorPrinter
 
@@ -193,19 +192,16 @@ def delete_recording_file(
 
 @app.command()
 def upload(
-    path: Annotated[
-        Path,
-        typer.Argument(
-            ...,
-            exists=True,
-            file_okay=True,
-            dir_okay=False,
-            writable=False,
-            readable=True,
-            resolve_path=True,
-            help="Path to recording file to upload",
-        ),
-    ],
+    path: Path = typer.Argument(
+        ...,
+        exists=True,
+        file_okay=True,
+        dir_okay=False,
+        writable=False,
+        readable=True,
+        resolve_path=True,
+        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"),
@@ -230,7 +226,9 @@ def upload(
     else:
         r = rest.handle_post(f"/api/project/{project}/files/recording/{filename}", return_response=True)
 
-    response = rest.upload_file(path=path.name, url=r.text, upload_headers={"Content-Type": "application/x-www-form-urlencoded"})
+    response = rest.upload_file_with_signed_url(
+        path=path.name, url=r.text, upload_headers={"Content-Type": "application/x-www-form-urlencoded"}
+    )
 
     if 200 <= response.status_code < 300:
         print(
@@ -385,6 +383,18 @@ def pause(
     _do_change_playback_mode("pause", recording_session, broker, project)
 
 
+@app.command(name="playback-status")
+def playback_status(
+    recording_session: str = typer.Argument(..., help="Recording session id", envvar="REMOTIVE_CLOUD_RECORDING_SESSION"),
+    broker: str = typer.Option(None, help="Broker to use"),
+    project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
+):
+    """
+    Display status and progress of the recording beeing played
+    """
+    _do_change_playback_mode("status", recording_session, broker, project)
+
+
 @app.command()
 def seek(
     recording_session: str = typer.Argument(..., help="Recording session id", envvar="REMOTIVE_CLOUD_RECORDING_SESSION"),
@@ -455,6 +465,12 @@ def _do_change_playback_mode(mode: str, recording_session: str, broker: str, pro
         broker.seek(files, int(seconds * 1000000), True)
     elif mode == "stop":
         broker.seek(files, 0, True)
+    elif mode == "status":
+        p = Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}"), transient=True)
+        t = p.add_task("label", total=1)
+
+        with p:
+            broker.listen_on_playback(lambda c: p.update(t, description=str(c)))
     else:
         raise Exception(f"Illegal command {mode}")
 

cli/cloud/rest_helper.py

@@ -150,6 +150,21 @@ def handle_put(url, body=None, params={}, return_response: bool = False):
 
 
 def upload_file(
+    path: Union[str, Path], url: str, upload_headers: dict[str, str] = None, return_response: bool = False, progress_label="Uploading..."
+):
+    ensure_auth_token()
+    if upload_headers is not None:
+        headers.update(upload_headers)
+    with open(path, "rb") as file:
+        with wrap_file(file, os.stat(path).st_size, description=progress_label) as f:
+            r = requests.post(f"{base_url}{url}", files={os.path.basename(path): f}, headers=headers)
+        if return_response:
+            check_api_result(r)
+            return r
+        print_api_result(r)
+
+
+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:

cli/connect/connect.py

@@ -4,7 +4,7 @@ import sys
 from pathlib import Path
 
 import typer
-from typing_extensions import Annotated, List, Union
+from typing_extensions import List
 
 from cli.broker.lib.broker import SubscribableSignal
 from cli.errors import ErrorPrinter
@@ -14,21 +14,16 @@ app = typer.Typer()
 
 @app.command()
 def protopie(
-    config: Union[
-        Annotated[
-            Path,
-            typer.Option(
-                exists=True,
-                file_okay=True,
-                dir_okay=False,
-                writable=False,
-                readable=True,
-                resolve_path=True,
-                help="Configuration file with signal subscriptions and mapping if needed",
-            ),
-        ],
+    config: Path = typer.Option(
         None,
-    ] = None,
+        exists=True,
+        file_okay=True,
+        dir_okay=False,
+        writable=False,
+        readable=True,
+        resolve_path=True,
+        help="Configuration file with signal subscriptions and mapping if needed",
+    ),
     signal: List[str] = typer.Option(None, help="Signal names to subscribe to, mandatory when not using script"),
     signal_name_expression: str = typer.Option(
         None, help='[Experimental] Python expression to rename signal names, i.e \'lower().replace(".","_")\''

cli/tools/can/can.py

@@ -3,7 +3,6 @@ from pathlib import Path
 import can
 import typer
 from rich.console import Console
-from typing_extensions import Annotated
 
 err_console = Console(stderr=True)
 console = Console()
@@ -17,30 +16,24 @@ app = typer.Typer(help=help)
 
 @app.command("convert")
 def convert(
-    in_file: Annotated[
-        Path,
-        typer.Argument(
-            exists=True,
-            file_okay=True,
-            dir_okay=False,
-            writable=False,
-            readable=True,
-            resolve_path=True,
-            help="File to convert from (.blf .asc .log)",
-        ),
-    ],
-    out_file: Annotated[
-        Path,
-        typer.Argument(
-            exists=False,
-            file_okay=True,
-            dir_okay=False,
-            writable=True,
-            readable=True,
-            resolve_path=True,
-            help="File to convert to (.blf .asc .log)",
-        ),
-    ],
+    in_file: Path = typer.Argument(
+        exists=True,
+        file_okay=True,
+        dir_okay=False,
+        writable=False,
+        readable=True,
+        resolve_path=True,
+        help="File to convert from (.blf .asc .log)",
+    ),
+    out_file: Path = typer.Argument(
+        exists=False,
+        file_okay=True,
+        dir_okay=False,
+        writable=True,
+        readable=True,
+        resolve_path=True,
+        help="File to convert to (.blf .asc .log)",
+    ),
 ):
     r"""
     Converts between ASC, BLF and LOG files. Files must end with .asc, .blf or .log.
@@ -59,18 +52,15 @@ def convert(
 
 @app.command("validate")
 def validate(
-    in_file: Annotated[
-        Path,
-        typer.Argument(
-            exists=True,
-            file_okay=True,
-            dir_okay=False,
-            writable=False,
-            readable=True,
-            resolve_path=True,
-            help="File to validate (.blf .asc .log)",
-        ),
-    ],
+    in_file: Path = typer.Argument(
+        exists=True,
+        file_okay=True,
+        dir_okay=False,
+        writable=False,
+        readable=True,
+        resolve_path=True,
+        help="File to validate (.blf .asc .log)",
+    ),
     print: bool = typer.Option(False, help="Print file contents to terminal"),
 ):
     r"""

{remotivelabs_cli-0.0.11.dist-info → remotivelabs_cli-0.0.13.dist-info}/METADATA

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

{remotivelabs_cli-0.0.11.dist-info → remotivelabs_cli-0.0.13.dist-info}/RECORD

@@ -1,28 +1,28 @@
 cli/__about__.py,sha256=qXVkxWb3aPCF-4MjQhB0wqL2GEblEH4Qwk70o29UkJk,122
 cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cli/broker/brokers.py,sha256=BLjnoNX-WrJx77YMy4j1h0BdwbWkUnsfs-KdbezSXps,5338
+cli/broker/brokers.py,sha256=sSX--mm5ln5RUFR60VFHQR6NWu4Qz7Jqi2Ws-4TJsDI,3052
 cli/broker/export.py,sha256=GxwE9ufWRwfxVh3eTLkwuOqwUOtsvS9Wb7b-BooULC8,3734
 cli/broker/files.py,sha256=_8elBjbmJ5MEEeFGJ7QYkXzyuLDCDpO6UvEVXHbRy7U,4133
 cli/broker/lib/__about__.py,sha256=xnZ5V6ZcHW9dhWLWdMzVjYJbEnMKpeXm0_S_mbNzypE,141
-cli/broker/lib/broker.py,sha256=65Y2MqwPNk0XGv284gKkIJuMeFMYcMdBFRYizzIm_3w,19713
+cli/broker/lib/broker.py,sha256=fmGsdxmdC3llrIvr0o3E2cpkGHU6mxrbZ7_ac2ZqVvU,20664
 cli/broker/playback.py,sha256=oOfC8Jn4Ib-nc9T6ob_uNXZSeCWfft7MrMQPafH4U2I,4846
 cli/broker/record.py,sha256=gEvo3myHbIl6UyXzhJE741NiwRrFf7doBg6HXzzp5z0,1382
 cli/broker/scripting.py,sha256=sLDtuktWsVk0fJ3RW4kYyh-_YAVJP3VM0xFIQR499Oo,3392
-cli/broker/signals.py,sha256=vQAxnxNYzrtuSTGua5MUXWbacF9mZ6WnLSq7lRmUVUQ,6792
+cli/broker/signals.py,sha256=3z4vVivPdo8dfz8XY-s7Ga5I75uQaptWarixrfSsm-0,6547
 cli/cloud/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 cli/cloud/auth.py,sha256=xi47cQWjs6q7Kje4XUbTqEk_BgG3NJ1gMOYPU-_4tgw,3470
 cli/cloud/auth_tokens.py,sha256=5ox0Pxfij8aTgEcDwRBasaSQvDuLIGCJc-INjmIQN2M,3408
 cli/cloud/brokers.py,sha256=wa3uMg91IZdrP0tMpTdO9cBIkZHtMHxQ-zEXwFiye_I,4127
 cli/cloud/cloud_cli.py,sha256=nRRXFF_IgUMayerxS-h7oqsNe6tt34Q5VeThq8gatEg,1443
-cli/cloud/configs.py,sha256=XkSXuJFrWJxkwtbfJrexAiqMQ6StqbJlH2JDJAZTlN0,3489
+cli/cloud/configs.py,sha256=2p1mCHf5BwYNtwbY0Cbed5t6-79WHGKWU4Fv6LuJ21o,4069
 cli/cloud/projects.py,sha256=-uqltAOficwprOKaPd2R0Itm4sqTz3VJNs9Sc8jtO5k,1369
-cli/cloud/recordings.py,sha256=Dd2tp-PtpFziIDqWnwceTT0P4-iVv1pMu4gpQ3FH4nw,19611
-cli/cloud/rest_helper.py,sha256=B41uYaIxc7K1efD9aZ2VdE_aqQY6dDldVxD-eiYvuLY,5885
+cli/cloud/recordings.py,sha256=F42VXWuoIVKmjkSxr4fq0M9w1GwszNE1kUbkVzxEaf4,20334
+cli/cloud/rest_helper.py,sha256=g7lmGosAS0IDlo9Aso0bH0tdlLTCz0IYx3R71DXKtkc,6491
 cli/cloud/sample_recordings.py,sha256=g1X6JTxvzWInSP9R1BJsDmL4WqvpEKqjdJR_xT4bo1U,639
 cli/cloud/service_account_tokens.py,sha256=7vjoMd6Xq7orWCUP7TVUVa86JA0OiX8O10NZcHUE6rM,2294
 cli/cloud/service_accounts.py,sha256=GCYdYPnP5uWVsg1bTIS67CmoPWDng5dupJHmlThrJ80,1606
 cli/connect/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-cli/connect/connect.py,sha256=CAPh8d-pqCTQrPVZiX5j3J9lT-NdzGYp519eJdPmvXY,3805
+cli/connect/connect.py,sha256=xeQLgbLvwB-l2pL6ulbOkYeMQZb5B_rLvy7oQVNa78k,3649
 cli/connect/protopie/protopie.py,sha256=aMF7rQHX4xLN9ylijJB1SMNlB1IIl14YBLw6oLweWH4,5646
 cli/errors.py,sha256=sOjYasWbwqu2IcK4MvrG4ddpQ7idLGxiFYOxjhdsahM,1319
 cli/remotive.py,sha256=KKahzVZACa3MIBqt2lZDiSsDOTmoZIdNeKex8LJR8ZQ,1645
@@ -30,10 +30,10 @@ cli/requirements.txt,sha256=Tjpv2HSAPemgKC-eJbwDw-gvAdklfJ18LixRcwzvQIU,78
 cli/settings.py,sha256=r0txIWXNTH1veGu97J84PiYEDBsAphkXYTN64n_C-qw,792
 cli/tools/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 cli/tools/can/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-cli/tools/can/can.py,sha256=sl95utXl2gjXV8cN0AVzJut95oeWzKn7hgVTQn136V0,2407
+cli/tools/can/can.py,sha256=kSd1c-nxxXyeKkm19oDILiDBZsKOcpjsUT0T3xox5Qs,2172
 cli/tools/tools.py,sha256=LwQdWMcJ19pCyKUsVfSB2B3R6ui61NxxFWP0Nrnd5Jk,198
-remotivelabs_cli-0.0.11.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.0.11.dist-info/METADATA,sha256=QJTlnudIpCSpyyv41IHMd7xvRJLZq9KrkQ2qLyQtx88,1224
-remotivelabs_cli-0.0.11.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-remotivelabs_cli-0.0.11.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.0.11.dist-info/RECORD,,
+remotivelabs_cli-0.0.13.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
+remotivelabs_cli-0.0.13.dist-info/METADATA,sha256=q4vUcxbJSS14XERa8zL9nWJpHA6bVeFSWnja5b75tEo,1224
+remotivelabs_cli-0.0.13.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+remotivelabs_cli-0.0.13.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
+remotivelabs_cli-0.0.13.dist-info/RECORD,,