remotivelabs-cli 0.0.15__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

@@ -484,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):

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

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

{remotivelabs_cli-0.0.15.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=b4MO38_SamR2eE-ClDZMWSVpVRfQ6HQ27ALVpmmVGXc,21071
+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
@@ -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.15.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.0.15.dist-info/METADATA,sha256=6WwZlFqtnnC892J5T6m_Zgs1XGz_wnyNzzihRRFDY_Q,1224
-remotivelabs_cli-0.0.15.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-remotivelabs_cli-0.0.15.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.0.15.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,,