remotivelabs-cli 0.3.0__tar.gz → 0.3.2__tar.gz

{remotivelabs_cli-0.3.0 → remotivelabs_cli-0.3.2}/PKG-INFO

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

remotivelabs_cli-0.3.2/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.2/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.3.0 → remotivelabs_cli-0.3.2}/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.3.0 → remotivelabs_cli-0.3.2}/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)

{remotivelabs_cli-0.3.0 → remotivelabs_cli-0.3.2}/cli/broker/lib/broker.py

@@ -27,14 +27,11 @@ import remotivelabs.broker._generated.traffic_api_pb2 as traffic_api
 import remotivelabs.broker._generated.traffic_api_pb2_grpc as traffic_api_grpc
 import typer
 from google.protobuf.json_format import MessageToDict
-from rich.console import Console
 
 from cli.broker.lib.helper import act_on_scripted_signal, act_on_signal, create_channel
 from cli.broker.lib.signalcreator import SignalCreator
-from cli.errors import ErrorPrinter
 from cli.settings import settings
-
-err_console = Console(stderr=True)
+from cli.utils.console import print_generic_error, print_hint, print_success
 
 
 @dataclass
@@ -89,7 +86,7 @@ class Broker:
                 os.environ["ACCESS_TOKEN"] = "false"
                 self.intercept_channel = create_channel(url, None, None)
         else:
-            err_console.print("Option --api-key will is deprecated and will be removed. Use access access tokens by logging in with cli.")
+            print_hint("Option --api-key will is deprecated and will be removed. Use access access tokens by logging in with cli.")
             os.environ["ACCESS_TOKEN"] = "false"
             self.intercept_channel = create_channel(url, api_key, None)
 
@@ -103,7 +100,7 @@ class Broker:
         err_cnt = 0
         for mode in status.playbackInfo:
             if mode.playbackMode.errorMessage:
-                print(mode.playbackMode.errorMessage)
+                print_generic_error(mode.playbackMode.errorMessage)
                 err_cnt = err_cnt + 1
         if err_cnt > 0:
             raise typer.Exit(1)
@@ -253,7 +250,7 @@ class Broker:
         config = network_api.FramesDistributionConfig(namespace=common.NameSpace(name=namespace))
         frame_distribution_stream = self.network_stub.SubscribeToFramesDistribution(config)
         for frame in frame_distribution_stream:
-            f = MessageToDict(frame, including_default_value_fields=True, preserving_proto_field_name=True)
+            f = MessageToDict(frame, preserving_proto_field_name=True)
             callback(f)
 
     def pause(self, namespace: str, path: str, silent: bool = False) -> traffic_api.PlaybackInfos:
@@ -331,10 +328,10 @@ class Broker:
 
             for r in response:
                 if r["data"]:
-                    print(f"Successfully received traffic on {r['namespace']}")
+                    print_success(f"Received traffic on {r['namespace']}")
                     keep_running = False
                 elif not wait_for_traffic or (not keep_running and not keep_running_during_recording):
-                    print(f"Namespace {r['namespace']} did not receive any traffic")
+                    print_generic_error(f"Namespace {r['namespace']} did not receive any traffic")
 
     def upload(self, file: str, dest: str) -> None:
         sha256 = get_sha256(file)
@@ -343,7 +340,7 @@ class Broker:
             try:
                 self.system_stub.UploadFile(upload_iterator, compression=grpc.Compression.Gzip)
             except grpc.RpcError as rpc_error:
-                print(f"Failed to upload file - {rpc_error.details()} ({rpc_error.code()})")
+                print_generic_error(f"Failed to upload file - {rpc_error.details()} ({rpc_error.code()})")
                 raise typer.Exit(1)
 
     def delete_files(self, path: List[str], exit_on_faliure: bool) -> None:
@@ -353,7 +350,7 @@ class Broker:
                     system_api.FileDescriptions(fileDescriptions=[system_api.FileDescription(path=file.replace(ntpath.sep, posixpath.sep))])
                 )
             except grpc.RpcError as rpc_error:
-                print(f"Failed to delete file - {rpc_error.details()} ({rpc_error.code()})")
+                print_generic_error(f"Failed to delete file - {rpc_error.details()} ({rpc_error.code()})")
                 if exit_on_faliure:
                     raise typer.Exit(1)
 
@@ -374,7 +371,7 @@ class Broker:
         except grpc.RpcError as rpc_error:
             if delegate_err:
                 raise rpc_error
-            print(f"Failed to download file - {rpc_error.details()} ({rpc_error.code()})")
+            print_generic_error(f"Failed to download file - {rpc_error.details()} ({rpc_error.code()})")
             # There will be an empty file if the download fails so remove that one here
             os.remove(dest)
             raise typer.Exit(1)
@@ -384,11 +381,11 @@ class Broker:
             request = common.Empty()
             response = self.system_stub.ReloadConfiguration(request, timeout=60000)
             if response.errorMessage:
-                print(f"Failed to reload config: {response.errorMessage}")
+                print_generic_error(f"Failed to reload config: {response.errorMessage}")
                 raise typer.Exit(1)
             # br.helper.reload_configuration(system_stub=self.system_stub)
         except grpc.RpcError as rpc_error:
-            print(f"Failed to reload configuration - {rpc_error.details()} ({rpc_error.code()})")
+            print_generic_error(f"Failed to reload configuration - {rpc_error.details()} ({rpc_error.code()})")
             raise typer.Exit(1)
 
     def list_namespaces(self) -> List[str]:
@@ -412,7 +409,6 @@ class Broker:
                 ):
                     metadata_dict = MessageToDict(
                         finfo.signalInfo.metaData,
-                        including_default_value_fields=True,
                         preserving_proto_field_name=True,
                     )
                     sig_dict = {
@@ -430,7 +426,6 @@ class Broker:
 
                     metadata_dict = MessageToDict(
                         sinfo.metaData,
-                        including_default_value_fields=True,
                         preserving_proto_field_name=True,
                     )
                     sig_dict = {
@@ -485,7 +480,7 @@ class Broker:
             if ns not in existing_ns:
                 ns_not_matching.append(ns)
         if len(ns_not_matching) > 0:
-            ErrorPrinter.print_hint(f"Namespace(s) {ns_not_matching} does not exist on broker. Namespaces found on broker: {existing_ns}")
+            print_hint(f"Namespace(s) {ns_not_matching} does not exist on broker. Namespaces found on broker: {existing_ns}")
             sys.exit(1)
 
         available_signals = list(filter(verify_namespace, existing_signals))  # type: ignore
@@ -495,7 +490,7 @@ class Broker:
         signals_subscribed_to_but_does_not_exist = set(subscribed_signals) - set(map(lambda s: s["signal"], signals_to_subscribe_to))
 
         if len(signals_subscribed_to_but_does_not_exist) > 0:
-            ErrorPrinter.print_hint(f"One or more signals you subscribed to does not exist {signals_subscribed_to_but_does_not_exist}")
+            print_hint(f"One or more signals you subscribed to does not exist {signals_subscribed_to_but_does_not_exist}")
             sys.exit(1)
 
         return list(map(lambda s: SubscribableSignal(s["signal"], s["namespace"]), signals_to_subscribe_to))

{remotivelabs_cli-0.3.0 → remotivelabs_cli-0.3.2}/cli/broker/lib/helper.py

@@ -18,6 +18,8 @@ import remotivelabs.broker._generated.system_api_pb2 as system_api
 import remotivelabs.broker._generated.system_api_pb2_grpc as system_api_grpc
 from grpc_interceptor import ClientCallDetails, ClientInterceptor
 
+from cli.utils.console import print_generic_error
+
 log = getLogger(__name__)
 
 
@@ -221,15 +223,13 @@ def act_on_signal(  # noqa: PLR0913
 
     except grpc.RpcError as e:
         # Only try to cancel if cancel was not already attempted
-        # pylint: disable=no-member
         if e.code() != grpc.StatusCode.CANCELLED:
             try:
                 subscripton.cancel()
-                print("A gRPC error occurred:")
-                print(e)
+                print_generic_error("A gRPC error occurred:")
+                print_generic_error(str(e))
             except grpc.RpcError:
                 pass
-    # pylint: disable=protected-access, bad-except-order
     except grpc._channel._Rendezvous as err:  # type:ignore[attr-defined]
         log.error(err)
     # reload, alternatively non-existing signal
@@ -266,12 +266,11 @@ def act_on_scripted_signal(  # noqa: PLR0913
     except grpc.RpcError as e:
         try:
             subscription.cancel()
-            print("A gRPC error occurred:")
-            print(e)
+            print_generic_error("A gRPC error occurred:")
+            print_generic_error(str(e))
         except grpc.RpcError:
             pass
 
-    # pylint: disable=protected-access, bad-except-order
     except grpc._channel._Rendezvous as err:  # type:ignore[attr-defined]
         log.error(err)
     # reload, alternatively non-existing signal

{remotivelabs_cli-0.3.0 → remotivelabs_cli-0.3.2}/cli/broker/license_flows.py

@@ -7,14 +7,12 @@ from typing import Union
 import grpc
 import requests
 import typer
-from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
 from cli.broker.lib.broker import Broker, LicenseInfo
+from cli.utils.console import print_unformatted_to_stderr
 from cli.utils.rest_helper import RestHelper as Rest
 
-console = Console(stderr=True)
-
 
 class LicenseFlow:
     def describe_with_url(self, url: str) -> LicenseInfo:
@@ -35,7 +33,7 @@ class LicenseFlow:
         return b.get_license()
 
     def request_with_url_with_internet(self, url: str) -> None:
-        console.print("This requires internet connection from your computer during the entire licensing process")
+        print_unformatted_to_stderr("This requires internet connection from your computer during the entire licensing process")
 
         email = LicenseFlow.__try_authenticate_and_get_email_from_cloud()
 
@@ -52,7 +50,7 @@ class LicenseFlow:
             if not apply:
                 return
 
-        console.print(
+        print_unformatted_to_stderr(
             ":point_right: [bold yellow]This will request a new license or use an existing license if "
             "this hardware has already been licensed[/bold yellow]"
         )
@@ -66,7 +64,7 @@ class LicenseFlow:
         with use_progress("Applying license to broker..."):
             new_license = broker_to_license.apply_license(license_data_b64)
         if new_license.valid:
-            console.print(f":thumbsup: Successfully applied license, it remains valid until {new_license.expires}")
+            print_unformatted_to_stderr(f":thumbsup: Successfully applied license, it remains valid until {new_license.expires}")
 
     def request_with_hotspot(self, url: Union[str, None] = "http://192.168.4.1:50051") -> None:
         """
@@ -76,7 +74,7 @@ class LicenseFlow:
         if url is None:
             url = "http://192.168.4.1:50051"
 
-        console.print(
+        print_unformatted_to_stderr(
             "Licensing a broker over its wifi hotspot will require you to switch between internet connectivity "
             "and remotivelabs-xxx wifi hotspot"
         )
@@ -95,7 +93,7 @@ class LicenseFlow:
             if not apply:
                 return
 
-        console.print(
+        print_unformatted_to_stderr(
             ":point_right: [bold yellow]This will request a new license or use an existing license if "
             "this hardware has already been licensed[/bold yellow]"
         )
@@ -110,7 +108,7 @@ class LicenseFlow:
             progress_label="Applying license to broker...  Make sure to switch back to remotivelabs-xxx wifi hotspot",
         )
         new_license = broker_to_license.apply_license(license_data_b64)
-        console.print(f":thumbsup: Successfully applied license, expires {new_license.expires}")
+        print_unformatted_to_stderr(f":thumbsup: Successfully applied license, expires {new_license.expires}")
 
     @staticmethod
     def __try_connect_to_broker(url: str, progress_label: str, on_error_progress_label: Union[str, None] = None) -> Broker:
@@ -127,9 +125,9 @@ class LicenseFlow:
                         )
                     time.sleep(1)
         if on_error_progress_label is None:
-            console.print(f":white_check_mark: {progress_label}")
+            print_unformatted_to_stderr(f":white_check_mark: {progress_label}")
         else:
-            console.print(f":white_check_mark: {on_error_progress_label}")
+            print_unformatted_to_stderr(f":white_check_mark: {on_error_progress_label}")
         return broker_to_license
 
     @staticmethod
@@ -141,7 +139,7 @@ class LicenseFlow:
                     break
                 except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
                     time.sleep(1)
-        console.print(":white_check_mark: Fetching user info from cloud... Make sure you are connected to internet")
+        print_unformatted_to_stderr(":white_check_mark: Fetching user info from cloud... Make sure you are connected to internet")
         if r is None:
             return ""
         return str(r.json()["email"])
@@ -159,7 +157,7 @@ class LicenseFlow:
                     break
                 except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
                     time.sleep(1)
-        console.print(f":white_check_mark: {progress_label}")
+        print_unformatted_to_stderr(f":white_check_mark: {progress_label}")
         return bytes(license_data_b64)
 
 

{remotivelabs_cli-0.3.0 → remotivelabs_cli-0.3.2}/cli/broker/playback.py

@@ -5,8 +5,8 @@ from typing import Dict, List
 import grpc
 import typer
 
-from cli.errors import ErrorPrinter
 from cli.typer import typer_utils
+from cli.utils.console import print_generic_error, print_generic_message, print_grpc_error, print_success
 
 from .lib.broker import Broker
 
@@ -16,7 +16,7 @@ app = typer_utils.create_typer(help=help)
 def recording_and_namespace(recording: str) -> Dict[str, str]:
     splitted = recording.split("::")
     if len(splitted) != 2:
-        print("Invalid --recording option, expected file_name::namespace")
+        print_generic_error("Invalid --recording option, expected file_name::namespace")
         raise typer.Exit(1)
     return {"recording": splitted[0], "namespace": splitted[1]}
 
@@ -39,10 +39,10 @@ def play(
     try:
         broker = Broker(url, api_key)
         status = broker.play(rec)
-        print(status)
+        # TODO: use log instead of print for debug information?
+        print_generic_message(str(status))
     except grpc.RpcError as err:
-        ErrorPrinter.print_grpc_error(err)
-    # print(status)
+        print_grpc_error(err)
 
 
 @app.command()
@@ -64,9 +64,9 @@ def stop(
     try:
         broker = Broker(url, api_key)
         broker.stop_play(rec)
-        print("Successfully stopped recording")
+        print_success("Recording stopped")
     except grpc.RpcError as err:
-        ErrorPrinter.print_grpc_error(err)
+        print_grpc_error(err)
 
 
 @app.command()
@@ -87,9 +87,9 @@ def pause(
     try:
         broker = Broker(url, api_key)
         broker.pause_play(rec)
-        print("Successfully paused recording")
+        print_success("Recording paused")
     except grpc.RpcError as err:
-        ErrorPrinter.print_grpc_error(err)
+        print_grpc_error(err)
 
 
 @app.command()
@@ -115,4 +115,4 @@ def seek(
         broker = Broker(url, api_key)
         broker.seek(rec, int(seconds * 1000000))
     except grpc.RpcError as err:
-        ErrorPrinter.print_grpc_error(err)
+        print_grpc_error(err)

{remotivelabs_cli-0.3.0 → remotivelabs_cli-0.3.2}/cli/broker/record.py

@@ -5,8 +5,8 @@ from typing import List
 import grpc
 import typer
 
-from cli.errors import ErrorPrinter
 from cli.typer import typer_utils
+from cli.utils.console import print_grpc_error, print_success
 
 from .lib.broker import Broker
 
@@ -24,7 +24,7 @@ def start(
         broker = Broker(url, api_key)
         broker.record_multiple(namespace, filename)
     except grpc.RpcError as rpc_error:
-        ErrorPrinter.print_grpc_error(rpc_error)
+        print_grpc_error(rpc_error)
 
 
 @app.command()
@@ -37,6 +37,6 @@ def stop(
     try:
         broker = Broker(url, api_key)
         broker.stop_multiple(namespace, filename)
-        print("Successfully stopped recording")
+        print_success("Recording stopped")
     except grpc.RpcError as rpc_error:
-        ErrorPrinter.print_grpc_error(rpc_error)
+        print_grpc_error(rpc_error)

{remotivelabs_cli-0.3.0 → remotivelabs_cli-0.3.2}/cli/broker/scripting.py

@@ -5,10 +5,9 @@ from string import Template
 from typing import List
 
 import typer
-from rich import print as rich_print
 
-from cli.errors import ErrorPrinter
 from cli.typer import typer_utils
+from cli.utils.console import print_generic_message, print_hint
 
 app = typer_utils.create_typer(
     rich_markup_mode="rich",
@@ -20,10 +19,9 @@ app = typer_utils.create_typer(
 
 def write(signal_name: str, script: str) -> None:
     path = f"{signal_name}.lua"
-    f = open(path, "w")
-    f.write(script)
-    f.close()
-    print(f"Secret token written to {path}")
+    with open(path, "w") as f:
+        f.write(script)
+    print_generic_message(f"Secret token written to {path}")
 
 
 @app.command("new-script")
@@ -35,7 +33,7 @@ def new_script(
     def to_subscribable_signal(sig: str) -> tuple[str, str]:
         arr = sig.split(":")
         if len(arr) != 2:
-            ErrorPrinter.print_hint(f"--input-signal must have format namespace:signal ({sig})")
+            print_hint(f"--input-signal must have format namespace:signal ({sig})")
             sys.exit(1)
         return arr[0], arr[1]
 
@@ -121,7 +119,6 @@ end
 
     script = template.substitute(
         local_signals=local_signals,
-        # signle_input_signal=signals_to_subscribe_to[0][1],  # Take one signal and use signal name in tuple
         subscribe_pattern=subscribe_pattern,
         output_signal=output_signal,
     )
@@ -129,4 +126,4 @@ end
     if save:
         write(output_signal, script)
     else:
-        rich_print(script)
+        print_generic_message(script)