remotivelabs-cli 0.2.3__tar.gz → 0.3.1__tar.gz

{remotivelabs_cli-0.2.3 → remotivelabs_cli-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: remotivelabs-cli
-Version: 0.2.3
+Version: 0.3.1
 Summary: CLI for operating RemotiveCloud and RemotiveBroker
 Author: Johan Rask
 Author-email: johan.rask@remotivelabs.com
@@ -20,7 +20,8 @@ Requires-Dist: pydantic (>=2.11.7,<3.0.0)
 Requires-Dist: pyjwt (>=2.6,<3.0)
 Requires-Dist: python-can (>=4.3.1)
 Requires-Dist: python-socketio (>=4.6.1)
-Requires-Dist: remotivelabs-broker (>=0.1.17,<0.2.0)
+Requires-Dist: remotivelabs-broker (>=0.9.1,<0.10.0)
+Requires-Dist: requests (>=2.32.4,<3.0.0)
 Requires-Dist: rich (>=13.7.0,<13.8.0)
 Requires-Dist: trogon (>=0.5.0)
 Requires-Dist: typer (==0.12.5)

remotivelabs_cli-0.3.1/cli/broker/__init__.py

@@ -0,0 +1,36 @@
+from __future__ import annotations
+
+import os
+
+import typer
+
+from cli.broker.discovery import discover as discover_cmd
+from cli.typer import typer_utils
+
+from . import export, files, licenses, playback, record, scripting, signals
+
+app = typer_utils.create_typer(rich_markup_mode="rich")
+
+
+# TODO: remove this?
+def cb(url: str = typer.Option(None, is_eager=False, help="Broker URL", envvar="REMOTIVE_BROKER_URL")) -> None:
+    # This can be used to override the --url per command, lets see if this is a better approach
+    if url is not None:
+        os.environ["REMOTIVE_BROKER_URL"] = url
+
+
+# TODO: move broker commands to subcommand instead?
+app.command(help="Discover brokers on this network")(discover_cmd)
+app.callback()(cb)
+
+# subcommands
+app.add_typer(playback.app, name="playback", help="Manage playing recordings")
+app.add_typer(record.app, name="record", help="Record data on buses")
+app.add_typer(files.app, name="files", help="Upload/Download configurations and recordings")
+app.add_typer(signals.app, name="signals", help="Find and subscribe to signals")
+app.add_typer(export.app, name="export", help="Export to external formats")
+app.add_typer(scripting.app, name="scripting", help="LUA scripting utilities")
+app.add_typer(licenses.app, name="license", help="View and request license to broker")
+
+if __name__ == "__main__":
+    app()

remotivelabs_cli-0.3.1/cli/broker/discovery.py

@@ -0,0 +1,43 @@
+from __future__ import annotations
+
+from time import sleep
+
+from zeroconf import IPVersion, ServiceBrowser, ServiceStateChange, Zeroconf
+
+from cli.utils.console import print_generic_message, print_newline
+
+
+def discover() -> None:
+    zeroconf = Zeroconf(ip_version=IPVersion.V4Only)
+    services = ["_remotivebroker._tcp.local."]
+
+    print_generic_message("Looking for RemotiveBrokers on your network, press Ctrl-C to exit...")
+    ServiceBrowser(zeroconf, services, handlers=[on_service_state_change])
+
+    try:
+        while True:
+            sleep(0.1)
+    except KeyboardInterrupt:
+        pass
+    finally:
+        zeroconf.close()
+
+
+def on_service_state_change(zeroconf: Zeroconf, service_type: str, name: str, state_change: ServiceStateChange) -> None:
+    """TODO: use log instead of print for debug information?"""
+    if state_change is ServiceStateChange.Removed:
+        print_generic_message(f"Service {name} was removed")
+
+    if state_change is ServiceStateChange.Updated:
+        print_generic_message(f"Service {name} was updated")
+
+    if state_change is ServiceStateChange.Added:
+        print_generic_message(f"[ {name} ]")
+        info = zeroconf.get_service_info(service_type, name)
+        if info:
+            for addr in info.parsed_scoped_addresses():
+                print_generic_message(f"RemotiveBrokerApp: http://{addr}:8080")
+                print_generic_message(f"RemotiveBroker http://{addr}:50051")
+        else:
+            print_generic_message("  No info")
+        print_newline()

{remotivelabs_cli-0.2.3 → remotivelabs_cli-0.3.1}/cli/broker/export.py

@@ -7,7 +7,7 @@ from typing import Any, List
 import grpc
 import typer
 
-from cli.errors import ErrorPrinter
+from cli.utils.console import print_generic_message, print_grpc_error, print_hint
 
 from ..typer import typer_utils
 from .lib.broker import Broker, SubscribableSignal
@@ -26,7 +26,6 @@ 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 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"),
 ) -> None:
@@ -51,6 +50,7 @@ def influxdb(
 
     """
 
+    # TODO: file is not properly opened using a context manager
     if output is not None:
         f = open(output, "w")
 
@@ -65,53 +65,23 @@ def influxdb(
             return
         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:
-            print(f"{influx_lp}")
-
-    # TODO - support for csv
-    # def csv(x):
-    # list = list(x)
-    # print(x)
-    # l = list(x)
-    # print(l)
-    # ll=list(map(lambda s : s, l))
-    # for s in l:
-    # dt = datetime.fromtimestamp(s["timestamp_nanos"] / 1000000)
-    # t=datetime.isoformat(dt)
-    # t=rfc3339.format_millisecond(dt)
-    # rich_rprint(len(l))
-    # lat = (l[0])
-    # lon = l[1]
-    # dt = datetime.fromtimestamp(lat["timestamp_nanos"] / 1000000)
-    # t=datetime.isoformat(dt)
-    # t = rfc3339.format_millisecond(dt)
-    # name = s["name"]
-    # value = s["value"]
-    # if output is not None:
-    #    f.write(f'coord,{lat["value"]},{lon["value"]},{t}\n')
-    # else:
-    #    print(f'coord,{lat["value"]},{lon["value"]},{t}')
-    # if output is not None:
-    #    f.flush()
-    # print(x["timestamp_nanos"])
-    # rich_rprint(json.dumps(list(x)))
+            # TODO: Use log instead of print for debug information?
+            print_generic_message(f"{influx_lp}")
 
     os_signal.signal(os_signal.SIGINT, exit_on_ctrlc)
 
-    # print(namespace)
-    # signals2 = list(map( lambda s: s['signal'], broker.list_signal_names2(namespace)))
     try:
 
         def to_subscribable_signal(sig: str) -> SubscribableSignal:
             arr = sig.split(":")
             if len(arr) != 2:
-                ErrorPrinter.print_hint(f"--signal must have format namespace:signal ({sig})")
+                print_hint(f"--signal must have format namespace:signal ({sig})")
                 sys.exit(1)
 
             return SubscribableSignal(namespace=arr[0], name=arr[1])
@@ -120,4 +90,4 @@ def influxdb(
         broker = Broker(url, api_key)
         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)
+        print_grpc_error(rpc_error)

{remotivelabs_cli-0.2.3 → remotivelabs_cli-0.3.1}/cli/broker/files.py

@@ -7,8 +7,8 @@ import grpc
 import typer
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
-from cli.errors import ErrorPrinter
 from cli.typer import typer_utils
+from cli.utils.console import print_generic_error, print_grpc_error, print_success
 
 from .lib.broker import Broker
 
@@ -23,9 +23,9 @@ def reload_configuration(
     try:
         broker = Broker(url, api_key)
         broker.reload_config()
-        print("Configuration successfully reloaded")
+        print_success("Configuration reloaded")
     except grpc.RpcError as err:
-        ErrorPrinter.print_grpc_error(err)
+        print_grpc_error(err)
 
 
 @app.command()
@@ -42,12 +42,12 @@ def delete(
         broker = Broker(url, api_key)
 
         if len(path) == 0:
-            print("At least one path must be suppled")
+            print_generic_error("At least one path must be suppled")
             raise typer.Exit(1)
 
         broker.delete_files(path, exit_on_failure)
     except grpc.RpcError as err:
-        ErrorPrinter.print_grpc_error(err)
+        print_grpc_error(err)
 
 
 @app.command()
@@ -72,12 +72,12 @@ def download(
             if output != "":
                 output_file = output
             if os.path.exists(output_file):
-                print(f"File already exist {output_file}, please use another output file name")
+                print_generic_error(f"File already exist {output_file}, please use another output file name")
             else:
                 broker.download(path, output_file)
-                print(f"Successfully saved {output_file}")
+                print_success(f"{output_file} saved")
     except grpc.RpcError as err:
-        ErrorPrinter.print_grpc_error(err)
+        print_grpc_error(err)
 
 
 @app.command()
@@ -102,19 +102,19 @@ def upload(
                 path = "./"  ## Does not work otherwise
 
             if not os.path.exists(path):
-                print(f"File {path} does not exist")
+                print_generic_error(f"File {path} does not exist")
                 raise typer.Exit(1)
 
             broker = Broker(url, api_key)
 
             if os.path.isdir(path):
                 broker.upload_folder(path)
-                print(f"Successfully uploaded {path}")
+                print_success(f"{path} uploaded")
             else:
                 output_file = os.path.basename(path)
                 if output != "":
                     output_file = output
                 broker.upload(path, output_file)
-                print(f"Successfully uploaded {path}")
+                print_success(f"{path} uploaded")
     except grpc.RpcError as err:
-        ErrorPrinter.print_grpc_error(err)
+        print_grpc_error(err)