remotivelabs-cli 0.0.14__py3-none-any.whl → 0.0.16__py3-none-any.whl

cli/broker/export.py

@@ -9,7 +9,7 @@ import typer
 
 from cli.errors import ErrorPrinter
 
-from .lib.broker import Broker
+from .lib.broker import Broker, SubscribableSignal
 
 app = typer.Typer(
     rich_markup_mode="rich",
@@ -24,8 +24,8 @@ but more formats will come soon
 def influxdb(
     url: str = typer.Option(..., help="Broker URL", envvar="REMOTIVE_BROKER_URL"),
     api_key: str = typer.Option(None, help="Cloud Broker API-KEY", envvar="REMOTIVE_BROKER_API_KEY"),
-    signal: List[str] = typer.Option(..., help="List of signal names to subscribe to"),
-    namespace: str = typer.Option(..., help="Cloud Broker API-KEY or access token", envvar="REMOTIVE_BROKER_API_KEY"),
+    signal: List[str] = typer.Option(..., help="List of signal names to subscribe to in format namespace:signal_name"),
+    # namespace: str = typer.Option(..., help="Cloud Broker API-KEY or access token", envvar="REMOTIVE_BROKER_API_KEY"),
     on_change_only: bool = typer.Option(default=False, help="Only get signal if value is changed"),
     output: str = typer.Option(None, help="Write results to file, defaults to stdout"),
 ):
@@ -37,12 +37,12 @@ def influxdb(
 
     Export:
     remotive broker export influxdb --url [URL] --output signals.influx --namespace VehicleBus  \\
-        --signal Control.SteeringWheel_Position --signal Control.Accelerator_PedalPosition \\
-        --signal GpsPosition.GPS_Longitude --signal GpsPosition.GPS_Latitude
+        --signal vehiclebus:Control.SteeringWheel_Position --signal Control.Accelerator_PedalPosition \\
+        --signal vehiclebus:GpsPosition.GPS_Longitude --signal vehiclebus:GpsPosition.GPS_Latitude
 
     Output:
-    Control, SteeringWheel_Position=1.0,Accelerator_PedalPosition=0,Speed=0 1664787032944374000
-    GpsPosition, GPS_Longitude=12.982076,GPS_Latitude=55.618748 1664787032948256000
+    Control, namespace:vehiclebus SteeringWheel_Position=1.0,Accelerator_PedalPosition=0,Speed=0 1664787032944374000
+    GpsPosition, namespace:vehiclebus GPS_Longitude=12.982076,GPS_Latitude=55.618748 1664787032948256000
 
     Import:
     influx write --org myorg -b my-bucket -p ns --format=lp  -f signals.influx
@@ -62,10 +62,12 @@ def influxdb(
         signals = list(x)
         if len(signals) == 0:
             return
-
-        frame_name = signals[0]["name"].split(".")[0]
-        signals_str = ",".join(list(map(lambda s: f'{s["name"].split(".")[1]}={s["value"]}', signals)))
-        influx_lp = f"{frame_name},namespace={namespace} {signals_str} {round(signals[0]['timestamp_us'] * 1000)}"
+        sig: str = signals[0]["name"].rpartition(".")[-1]
+        frame = signals[0]["name"].rsplit(".", 1)[0]
+        # frame_name = signals[0]["name"].split(".")[1]
+        namespace = signals[0]["namespace"]
+        signals_str = ",".join(list(map(lambda s: f'{sig}={s["value"]}', signals)))
+        influx_lp = f"{frame},namespace={namespace} {signals_str} {round(signals[0]['timestamp_us'] * 1000)}"
         if output is not None:
             f.write(f"{influx_lp}\n")
         else:
@@ -104,7 +106,17 @@ def influxdb(
     # print(namespace)
     # signals2 = list(map( lambda s: s['signal'], broker.list_signal_names2(namespace)))
     try:
+
+        def to_subscribable_signal(sig: str):
+            arr = sig.split(":")
+            if len(arr) != 2:
+                ErrorPrinter.print_hint(f"--signal must have format namespace:signal ({sig})")
+                exit(1)
+
+            return SubscribableSignal(namespace=arr[0], name=arr[1])
+
+        signals_to_subscribe_to = list(map(to_subscribable_signal, signal))
         broker = Broker(url, api_key)
-        broker.subscribe(signal, namespace, per_frame_influx_line_protocol, on_change_only)
+        broker.long_name_subscribe(signals_to_subscribe_to, per_frame_influx_line_protocol, on_change_only)
     except grpc.RpcError as rpc_error:
         ErrorPrinter.print_grpc_error(rpc_error)

cli/broker/lib/broker.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import binascii
-import datetime
 import ntpath
 import os
 import posixpath
@@ -183,7 +182,9 @@ class Broker:
             self.__check_playbackmode_result(status)
         return status
 
-    def listen_on_playback(self, callback: Callable[[str], None]):
+    def listen_on_playback(self, repeat: bool, recording_and_namespace: List, callback: Callable[[int, int, str], None]):
+        # include recording_and_namespace if we want to loop the recording
+        # This can probably be improved
         def get_mode(mode: int):
             if mode == 0:
                 return "playing"
@@ -195,14 +196,19 @@ class Broker:
         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)
+            offset_length = 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)
+            total_length = int((end_time - start_time) / 1000000)
 
-            callback(f"{(datetime.timedelta(seconds=offset_time))} / {(datetime.timedelta(seconds=length))} ({get_mode(mode)})")
+            if mode == 2 and repeat:
+                # If we get a stop and is fairly (this is mostly not 100%) close to the end
+                # we repeat the recording when files are included
+                if abs(total_length - offset_length) < 5:
+                    self.play(recording_and_namespace)
+            callback(offset_length, total_length, get_mode(mode))
 
     def pause(self, namespace: str, path: str, silent: bool = False):
         playback_list = [
@@ -478,7 +484,12 @@ class Broker:
         return subscription
 
     def __each_signal(self, signals, callback):
-        callback(map(lambda s: {"timestamp_us": s.timestamp, "name": s.id.name, "value": self.__get_value(s)}, signals))
+        callback(
+            map(
+                lambda s: {"timestamp_us": s.timestamp, "namespace": s.id.namespace.name, "name": s.id.name, "value": self.__get_value(s)},
+                signals,
+            )
+        )
 
     @staticmethod
     def __get_value(signal):

cli/cloud/recordings_playback.py

@@ -1,9 +1,12 @@
 from __future__ import annotations
 
+import datetime
 import json
 import tempfile
+from typing import List
 
 import grpc
+import rich
 import typer
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
@@ -25,13 +28,15 @@ def play(
     broker: str = typer.Option(None, help="Broker to use"),
     project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
     show_progress: bool = typer.Option(False, help="Show progress after started playing"),
+    repeat: bool = typer.Option(False, help="Repeat recording - must keep command running in terminal"),
 ):
     """
-    Start playing a recording
+    Start playing a recording.
+    There is no problem invoking play multiple times since if it is already playing the command will be ignored.
+    Use --repeat to have the recording replayed when it reaches the end.
     """
-    _do_change_playback_mode("play", recording_session, broker, project)
-    if progress:
-        _do_change_playback_mode("status", recording_session, broker, project)
+
+    _do_change_playback_mode("play", recording_session, broker, project, progress_on_play=show_progress, repeat=repeat)
 
 
 @app.command()
@@ -53,7 +58,8 @@ def progress(
     project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
 ):
     """
-    Shows progress of the recording playing
+    Shows progress of the recording playing.
+    Use --repeat to have the recording replayed when it reaches the end.
     """
     _do_change_playback_mode("status", recording_session, broker, project)
 
@@ -83,7 +89,15 @@ def stop(
     _do_change_playback_mode("stop", recording_session, broker, project)
 
 
-def _do_change_playback_mode(mode: str, recording_session: str, broker: str, project: str, seconds: int | None = None):  # noqa: C901
+def _do_change_playback_mode(
+    mode: str,
+    recording_session: str,
+    broker: str,
+    project: str,
+    seconds: int | None = None,
+    progress_on_play: bool = False,
+    repeat: bool = False,
+):  # noqa: C901
     response = rest.handle_get(f"/api/project/{project}/files/recording/{recording_session}", return_response=True)
     r = json.loads(response.text)
     recordings: list = r["recordings"]
@@ -103,6 +117,42 @@ def _do_change_playback_mode(mode: str, recording_session: str, broker: str, pro
 
     broker_info = json.loads(response.text)
     broker = Broker(broker_info["url"], None)
+
+    _verify_recording_on_broker(broker, recording_session, mode, project)
+
+    if mode == "pause":
+        broker.pause_play(files, True)
+    elif mode == "play":
+        broker.play(files, True)
+        if progress_on_play or repeat:
+            _track_progress(broker, repeat, files)
+    elif mode == "seek":
+        broker.seek(files, int(seconds * 1000000), True)
+    elif mode == "stop":
+        broker.seek(files, 0, True)
+    elif mode == "status":
+        _track_progress(broker, repeat, files)
+    else:
+        raise Exception(f"Illegal command {mode}")
+
+
+def _track_progress(broker: Broker, repeat: bool, files: List):
+    p = Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}"), transient=True)
+    t = p.add_task("label", total=1)
+    if repeat:
+        rich.print(":point_right: Keep this command running in terminal to keep the recording play with repeat")
+    with p:
+
+        def print_progress(offset: int, total: int, current_mode: str):
+            p.update(
+                t,
+                description=f"{(datetime.timedelta(seconds=offset))} " f"/ {(datetime.timedelta(seconds=total))} ({current_mode})",
+            )
+
+        broker.listen_on_playback(repeat, files, print_progress)
+
+
+def _verify_recording_on_broker(broker: Broker, recording_session: str, mode: str, project: str):
     try:
         # 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
@@ -126,19 +176,3 @@ def _do_change_playback_mode(mode: str, recording_session: str, broker: str, pro
         else:
             ErrorPrinter.print_grpc_error(rpc_error)
         exit(1)
-    if mode == "pause":
-        broker.pause_play(files, True)
-    elif mode == "play":
-        r = broker.play(files, True)
-    elif mode == "seek":
-        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}")

{remotivelabs_cli-0.0.14.dist-info → remotivelabs_cli-0.0.16.dist-info}/METADATA

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

{remotivelabs_cli-0.0.14.dist-info → remotivelabs_cli-0.0.16.dist-info}/RECORD

@@ -1,10 +1,10 @@
 cli/__about__.py,sha256=qXVkxWb3aPCF-4MjQhB0wqL2GEblEH4Qwk70o29UkJk,122
 cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/broker/brokers.py,sha256=sSX--mm5ln5RUFR60VFHQR6NWu4Qz7Jqi2Ws-4TJsDI,3052
-cli/broker/export.py,sha256=GxwE9ufWRwfxVh3eTLkwuOqwUOtsvS9Wb7b-BooULC8,3734
+cli/broker/export.py,sha256=kPB8xRe-I-fte5d95E0Uy2wLvQp943e4yFARGPKySoY,4386
 cli/broker/files.py,sha256=_8elBjbmJ5MEEeFGJ7QYkXzyuLDCDpO6UvEVXHbRy7U,4133
 cli/broker/lib/__about__.py,sha256=xnZ5V6ZcHW9dhWLWdMzVjYJbEnMKpeXm0_S_mbNzypE,141
-cli/broker/lib/broker.py,sha256=fmGsdxmdC3llrIvr0o3E2cpkGHU6mxrbZ7_ac2ZqVvU,20664
+cli/broker/lib/broker.py,sha256=kpcSaHcjZlcsgNgxwDBEa13RYRtx0Uz-fbBg2pKAHI0,21174
 cli/broker/playback.py,sha256=oOfC8Jn4Ib-nc9T6ob_uNXZSeCWfft7MrMQPafH4U2I,4846
 cli/broker/record.py,sha256=gEvo3myHbIl6UyXzhJE741NiwRrFf7doBg6HXzzp5z0,1382
 cli/broker/scripting.py,sha256=sLDtuktWsVk0fJ3RW4kYyh-_YAVJP3VM0xFIQR499Oo,3392
@@ -17,7 +17,7 @@ cli/cloud/cloud_cli.py,sha256=nRRXFF_IgUMayerxS-h7oqsNe6tt34Q5VeThq8gatEg,1443
 cli/cloud/configs.py,sha256=2p1mCHf5BwYNtwbY0Cbed5t6-79WHGKWU4Fv6LuJ21o,4069
 cli/cloud/projects.py,sha256=-uqltAOficwprOKaPd2R0Itm4sqTz3VJNs9Sc8jtO5k,1369
 cli/cloud/recordings.py,sha256=0xQw8iv-NjUUqxQjq5O4WqNYsew2lNlQ9Z0Qevl2f9E,20844
-cli/cloud/recordings_playback.py,sha256=QNQ_icUxffUVKNM48WRo74EhBxjhpy2mrPjq4uZC3JI,5930
+cli/cloud/recordings_playback.py,sha256=ygJRBbJ_BYmrEZ7k0j2b11N3xrrgmOdL3jZckJ-f-uU,7120
 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
@@ -33,8 +33,8 @@ 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=kSd1c-nxxXyeKkm19oDILiDBZsKOcpjsUT0T3xox5Qs,2172
 cli/tools/tools.py,sha256=LwQdWMcJ19pCyKUsVfSB2B3R6ui61NxxFWP0Nrnd5Jk,198
-remotivelabs_cli-0.0.14.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.0.14.dist-info/METADATA,sha256=rhN0Ppf8WBcns42rzb8vF4thU7MHOi2M4oxXY_hTMD8,1224
-remotivelabs_cli-0.0.14.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-remotivelabs_cli-0.0.14.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.0.14.dist-info/RECORD,,
+remotivelabs_cli-0.0.16.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
+remotivelabs_cli-0.0.16.dist-info/METADATA,sha256=A5ZA5VGXfw287Q187R5Pt4cPH5xOVmDWzeRq8offtPk,1224
+remotivelabs_cli-0.0.16.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+remotivelabs_cli-0.0.16.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
+remotivelabs_cli-0.0.16.dist-info/RECORD,,