remotivelabs-cli 0.2.3__py3-none-any.whl → 0.3.1__py3-none-any.whl

cli/connect/protopie/protopie.py

@@ -5,27 +5,22 @@ import json
 import os
 import sys
 import time
-import traceback
 from pathlib import Path
 from typing import Any, Dict, List, Tuple, Union
 
 import grpc
 import socketio
-from remotivelabs.broker.sync import BrokerException, Client, SignalIdentifier, SignalsInFrame
-from rich import print as pretty_print
-from rich.console import Console
 from socketio.exceptions import ConnectionError as SocketIoConnectionError
 
 from cli.broker.lib.broker import SubscribableSignal
-from cli.errors import ErrorPrinter
+from cli.broker.lib.client import BrokerException, Client, SignalIdentifier, SignalsInFrame
 from cli.settings import settings
+from cli.utils.console import print_generic_error, print_generic_message, print_success, print_unformatted_to_stderr
 
 PP_CONNECT_APP_NAME = "RemotiveBridge"
 
 io = socketio.Client()
 
-err_console = Console(stderr=True)
-
 _has_received_signal = False
 is_connected = False
 config_path: Path
@@ -35,7 +30,7 @@ broker: Any
 
 @io.on("connect")
 def on_connect() -> None:
-    print("Connected to ProtoPie Connect")
+    print_success("Connected to ProtoPie Connect")
     io.emit("ppBridgeApp", {"name": PP_CONNECT_APP_NAME})
     io.emit("PLUGIN_STARTED", {"name": PP_CONNECT_APP_NAME})
 
@@ -72,8 +67,8 @@ def get_signal_name(expression: str, s_name: str) -> str:
             sig_name = eval(f"s_name.{expression}")
             return str(sig_name)
         except Exception as e:
-            ErrorPrinter.print_generic_error(f"Failed to evaluate your python expression {expression}")
-            err_console.print(e)
+            print_generic_error(f"Failed to evaluate your python expression {expression}")
+            print_unformatted_to_stderr(e)
             # This was the only way I could make this work, exiting on another thread than main
             os._exit(1)
     else:
@@ -91,7 +86,7 @@ def _connect_to_broker(
     def on_signals(frame: SignalsInFrame) -> None:
         global _has_received_signal  # noqa: PLW0603
         if not _has_received_signal:
-            pretty_print("Bridge-app is properly receiving signals, you are good to go :thumbsup:")
+            print_generic_message("Bridge-app is properly receiving signals, you are good to go :thumbsup:")
             _has_received_signal = True
 
         for s in frame:
@@ -114,42 +109,42 @@ def grpc_connect(
     on_signals: Any, signals_to_subscribe_to: Union[List[SignalIdentifier], None] = None, on_change_only: bool = False
 ) -> None:
     try:
-        pretty_print("Connecting and subscribing to broker...")
+        print_generic_message("Connecting and subscribing to broker...")
         subscription = None
         client = Client(client_id="cli")
         client.connect(url=broker, api_key=x_api_key)
         client.on_signals = on_signals
 
         if signals_to_subscribe_to is None:
-            print("No sigs")
+            # TODO: use logs instead of print?
+            print_generic_error("No signals to subscribe to")
             return
         subscription = client.subscribe(signals_to_subscribe_to=signals_to_subscribe_to, changed_values_only=on_change_only)
-        pretty_print("Subscription to broker completed")
-        pretty_print("Waiting for signals...")
+        print_generic_message("Subscription to broker completed")
+        print_generic_message("Waiting for signals...")
 
         while True:
             time.sleep(1)
 
     except grpc.RpcError as e:
-        err_console.print(":boom: [red]Problems connecting or subscribing[/red]")
+        print_generic_error("Problems connecting or subscribing")
         if isinstance(e, grpc.Call):
-            print(f"{e.code()} - {e.details()}")
+            print_generic_error(f"{e.code()} - {e.details()}")
         else:
-            print(e)
+            print_generic_error(e)
 
     except BrokerException as e:
-        print(e)
+        print_generic_error(e)
         if subscription is not None:
             subscription.cancel()
 
     except KeyboardInterrupt:
-        print("Keyboard interrupt received. Closing subscription.")
+        print_generic_message("Keyboard interrupt received. Closing subscription.")
         if subscription is not None:
             subscription.cancel()
 
     except Exception as e:
-        print(traceback.format_exc())
-        err_console.print(f":boom: {e}")
+        print_generic_error(e)
 
 
 def do_connect(  # noqa: PLR0913
@@ -168,7 +163,7 @@ def do_connect(  # noqa: PLR0913
 
     if broker_url.startswith("https"):
         if api_key is None:
-            print("No --api-key, reading token from file")
+            print_generic_message("No --api-key, reading token from file")
             x_api_key = settings.get_active_token_secret()
         else:
             x_api_key = api_key
@@ -176,18 +171,15 @@ def do_connect(  # noqa: PLR0913
         x_api_key = api_key
     try:
         io.connect(address)
-        # if config is None:
-        #    raise ValueError("Config is None")
         config_path = config
         while is_connected is None:
             time.sleep(1)
-        # if expression is not None:
         _connect_to_broker(signals_to_subscribe_to=signals, config=config, expression=expression, on_change_only=on_change_only)
     except SocketIoConnectionError as e:
-        err_console.print(":boom: [bold red]Failed to connect to ProtoPie Connect[/bold red]")
-        err_console.print(e)
+        print_generic_error("Failed to connect to ProtoPie Connect")
+        print_unformatted_to_stderr(e)
         sys.exit(1)
     except Exception as e:
-        err_console.print(":boom: [bold red]Unexpected error[/bold red]")
-        err_console.print(e)
+        print_generic_error("Unexpected error")
+        print_unformatted_to_stderr(e)
         sys.exit(1)

cli/remotive.py

@@ -3,16 +3,13 @@ from __future__ import annotations
 import os
 
 import typer
-from rich import print as rich_print
-from rich.console import Console
 from trogon import Trogon
 from typer.main import get_group
 
-from cli.broker.brokers import app as broker_app
-from cli.cloud.cloud_cli import app as cloud_app
+from cli.broker import app as broker_app
+from cli.cloud import app as cloud_app
 from cli.connect.connect import app as connect_app
-from cli.settings import settings
-from cli.settings.core import Settings
+from cli.settings import Settings, settings
 from cli.settings.migration.migrate_all_token_files import migrate_any_legacy_tokens
 from cli.settings.migration.migrate_config_file import migrate_config_file
 from cli.settings.migration.migrate_legacy_dirs import migrate_legacy_settings_dirs
@@ -20,8 +17,7 @@ from cli.tools.tools import app as tools_app
 from cli.topology.cmd import app as topology_app
 from cli.typer import typer_utils
 from cli.utils import versions
-
-err_console = Console(stderr=True)
+from cli.utils.console import print_generic_error, print_generic_message
 
 
 def is_featue_flag_enabled(env_var: str) -> bool:
@@ -49,7 +45,7 @@ def version_callback(value: bool) -> None:
 
 def test_callback(value: int) -> None:
     if value:
-        rich_print(value)
+        print_generic_message(str(value))
         raise typer.Exit()
 
 
@@ -73,7 +69,7 @@ def run_migrations(settings: Settings) -> None:
     migrate_config_file(settings.config_file_path, settings)
 
     if has_migrated_tokens:
-        err_console.print("Migrated old credentials and configuration files, you may need to login again or activate correct credentials")
+        print_generic_error("Migrated old credentials and configuration files, you may need to login again or activate correct credentials")
 
 
 def set_default_org_as_env(settings: Settings) -> None:
@@ -82,7 +78,7 @@ def set_default_org_as_env(settings: Settings) -> None:
     This has to be done early before it is read
     """
     if "REMOTIVE_CLOUD_ORGANIZATION" not in os.environ:
-        active_account = settings.get_cli_config().get_active_account()
+        active_account = settings.get_active_account()
         if active_account and active_account.default_organization:
             os.environ["REMOTIVE_CLOUD_ORGANIZATION"] = active_account.default_organization
 
@@ -113,21 +109,15 @@ def tui(ctx: typer.Context) -> None:
 
 
 app.add_typer(broker_app, name="broker", help="Manage a single broker - local or cloud")
-app.add_typer(
-    cloud_app,
-    name="cloud",
-    help="Manage resources in RemotiveCloud",
-)
+app.add_typer(cloud_app, name="cloud", help="Manage resources in RemotiveCloud")
 app.add_typer(connect_app, name="connect", help="Integrations with other systems")
 app.add_typer(tools_app, name="tools")
+app.add_typer(
+    topology_app,
+    name="topology",
+    help="""
+Interact and manage RemotiveTopology resources
 
-if is_featue_flag_enabled("REMOTIVE_TOPOLOGY_ENABLED"):
-    app.add_typer(
-        topology_app,
-        name="topology",
-        help="""
-    RemotiveTopology actions
-
-    Read more at https://docs.remotivelabs.com/docs/remotive-topology
-    """,
-    )
+Read more at https://docs.remotivelabs.com/docs/remotive-topology
+""",
+)

cli/settings/__init__.py

@@ -1,14 +1,13 @@
 from cli.settings.config_file import Account, ConfigFile
 from cli.settings.config_file import dumps as dumps_config_file
 from cli.settings.config_file import loads as loads_config_file
-from cli.settings.core import InvalidSettingsFilePathError, Settings, TokenNotFoundError, settings
+from cli.settings.core import InvalidSettingsFilePathError, Settings, settings
 from cli.settings.token_file import TokenFile
 from cli.settings.token_file import dumps as dumps_token_file
 from cli.settings.token_file import loads as loads_token_file
 
 __all__ = [
     "settings",
-    "TokenNotFoundError",
     "InvalidSettingsFilePathError",
     "Settings",
     "TokenFile",

cli/settings/config_file.py

@@ -10,6 +10,8 @@ from cli.settings.token_file import TokenFile
 class Account(BaseModel):
     """
     Account represents an account in the configuration file.
+
+    TODO: Add email field to Account
     """
 
     credentials_file: str