remotivelabs-cli 0.0.42__py3-none-any.whl → 0.1.0a2__py3-none-any.whl

cli/cloud/brokers.py

@@ -10,14 +10,13 @@ import typer
 import websocket
 
 from cli.typer import typer_utils
-
-from .rest_helper import RestHelper as Rest
+from cli.utils.rest_helper import RestHelper as Rest
 
 app = typer_utils.create_typer()
 
 
 @app.command("list", help="Lists brokers in project")
-def list(project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT")) -> None:  # pylint: disable=W0622
+def list(project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT")) -> None:
     Rest.handle_get(f"/api/project/{project}/brokers")
 
 
@@ -94,7 +93,7 @@ def logs(
     def on_message(_wsapp: Any, message: str) -> None:
         print(message)
 
-    def on_error(_wsapp: Any, err: str) -> None:  # pylint: disable=W0613
+    def on_error(_wsapp: Any, err: str) -> None:
         print("EXAMPLE error encountered: ", err)
 
     Rest.ensure_auth_token()

cli/cloud/cloud_cli.py

@@ -1,21 +1,21 @@
 import typer
 
 from cli.cloud import auth, brokers, configs, organisations, projects, recordings, sample_recordings, service_accounts, storage
-from cli.cloud.rest_helper import RestHelper
 from cli.typer import typer_utils
+from cli.utils.rest_helper import RestHelper
 
 app = typer_utils.create_typer()
 
 
-@app.command(help="List licenses for an organisation")
+@app.command(help="List licenses for an organization")
 def licenses(
-    organisation: str = typer.Option(..., help="Organisation ID", envvar="REMOTIVE_CLOUD_ORGANISATION"),
+    organization: str = typer.Option(..., help="Organization ID", envvar="REMOTIVE_CLOUD_ORGANIZATION"),
     filter_option: str = typer.Option("all", help="all, valid, expired"),
 ) -> None:
-    RestHelper.handle_get(f"/api/bu/{organisation}/licenses", {"filter": filter_option})
+    RestHelper.handle_get(f"/api/bu/{organization}/licenses", {"filter": filter_option})
 
 
-app.add_typer(organisations.app, name="organisations", help="Manage organisations")
+app.add_typer(organisations.app, name="organizations", help="Manage organizations")
 app.add_typer(projects.app, name="projects", help="Manage projects")
 app.add_typer(auth.app, name="auth")
 app.add_typer(brokers.app, name="brokers", help="Manage cloud broker lifecycle")

cli/cloud/configs.py

@@ -8,8 +8,7 @@ import typer
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
 from cli.typer import typer_utils
-
-from .rest_helper import RestHelper as Rest
+from cli.utils.rest_helper import RestHelper as Rest
 
 app = typer_utils.create_typer()
 

cli/cloud/organisations.py

@@ -1,12 +1,111 @@
+from __future__ import annotations
+
 import json
+from dataclasses import dataclass
+from typing import List, Optional
+
+import typer
+from rich.console import Console
+from rich.table import Table
 
-from cli.cloud.rest_helper import RestHelper
+from cli.errors import ErrorPrinter
+from cli.settings import settings
 from cli.typer import typer_utils
+from cli.utils.rest_helper import RestHelper
 
+console = Console(stderr=False)
 app = typer_utils.create_typer()
 
 
-@app.command(name="list", help="List your available organisations")
+@dataclass
+class Organisation:
+    display_name: str
+    uid: str
+
+
+def _prompt_choice(choices: List[Organisation]) -> Optional[Organisation]:
+    table = Table("#", "Name", "Uid", "Default")
+
+    token = settings.get_active_token_file()
+    config = settings.get_cli_config()
+
+    current_default_org = config.accounts[token.account.email].default_organization if token is not None else None
+
+    for idx, choice in enumerate(choices, start=1):
+        table.add_row(
+            f"[yellow]{idx}",
+            f"[bold]{choice.display_name}[/bold]",
+            choice.uid,
+            ":thumbsup:" if current_default_org is not None and current_default_org == choice.uid else "",
+        )
+    console.print(table)
+
+    typer.echo("")
+    selection = typer.prompt(f"Enter the number(# 1-{len(choices)}) of the organization to select (or q to quit)")
+
+    if selection == "q":
+        return None
+    try:
+        index = int(selection) - 1
+        if 0 <= index < len(choices):
+            return choices[index]
+        raise ValueError
+    except ValueError:
+        typer.echo("Invalid choice, please try again")
+        return _prompt_choice(choices)
+
+
+@app.command("default")
+def select_default_org(
+    organization_uid: str = typer.Argument(None, help="Organization uid or empty to select one"),
+    get: bool = typer.Option(False, help="Print current default organization"),
+) -> None:
+    do_select_default_org(organization_uid, get)
+
+
+def do_select_default_org(organisation_uid: Optional[str] = None, get: bool = False) -> None:
+    r"""
+    Set default organization for the currently activated user, empty to choose from available organizations or organization uid as argument
+
+    remotive cloud organizations default my_org \[set specific org uid]
+    remotive cloud organizations default \[select one from prompt]
+    remotive cloud organizations default --get \[print current default]
+
+    Note that service-accounts does Not have permission to list organizations and will get a 403 Forbidden response so you must
+    select the organization uid as argument
+    """
+    if get:
+        default_organisation = settings.get_cli_config().get_active_default_organisation()
+        if default_organisation is not None:
+            console.print(default_organisation)
+        else:
+            console.print("No default organization set")
+    elif organisation_uid is not None:
+        settings.set_default_organisation(organisation_uid)
+    else:
+        account = settings.get_cli_config().get_active()
+        if account is not None:
+            token = settings.get_token_file(account.credentials_name)
+            if token.type != "authorized_user":
+                ErrorPrinter.print_hint(
+                    "You must supply the organization name as argument when using a service-account since the "
+                    "service-account is not allowed to list"
+                )
+                return
+
+        r = RestHelper.handle_get("/api/bu", return_response=True)
+        orgs = r.json()
+        orgs = [Organisation(display_name=o["organisation"]["displayName"], uid=o["organisation"]["uid"]) for o in orgs]
+
+        selected = _prompt_choice(orgs)
+
+        if selected is not None:
+            settings.get_cli_config()
+            typer.echo(f"Default organisation: {selected.display_name} (uid: {selected.uid})")
+            settings.set_default_organisation(selected.uid)
+
+
+@app.command(name="list", help="List your available organizations")
 def list_orgs() -> None:
     r = RestHelper.handle_get("/api/bu", return_response=True)
     orgs = [{"uid": org["organisation"]["uid"], "displayName": org["organisation"]["displayName"]} for org in r.json()]

cli/cloud/projects.py

@@ -3,15 +3,14 @@ import json
 import typer
 
 from cli.typer import typer_utils
-
-from .rest_helper import RestHelper as Rest
+from cli.utils.rest_helper import RestHelper as Rest
 
 app = typer_utils.create_typer()
 
 
 @app.command(name="list", help="List your projects")
-def list_projects(organisation: str = typer.Option(..., help="Organisation ID", envvar="REMOTIVE_CLOUD_ORGANISATION")) -> None:
-    r = Rest.handle_get(url=f"/api/bu/{organisation}/me", return_response=True)
+def list_projects(organization: str = typer.Option(..., help="Organization ID", envvar="REMOTIVE_CLOUD_ORGANIZATION")) -> None:
+    r = Rest.handle_get(url=f"/api/bu/{organization}/me", return_response=True)
     if r is None:
         return
 
@@ -28,7 +27,7 @@ def list_projects(organisation: str = typer.Option(..., help="Organisation ID",
 @app.command(name="create")
 def create_project(
     project_uid: str = typer.Argument(help="Project UID"),
-    organisation: str = typer.Option(..., help="Organisation ID", envvar="REMOTIVE_CLOUD_ORGANISATION"),
+    organization: str = typer.Option(..., help="Organization ID", envvar="REMOTIVE_CLOUD_ORGANIZATION"),
     project_display_name: str = typer.Option(default="", help="Project display name"),
 ) -> None:
     create_project_req = {
@@ -37,7 +36,7 @@ def create_project(
         "description": "",
     }
 
-    Rest.handle_post(url=f"/api/bu/{organisation}/project", body=json.dumps(create_project_req))
+    Rest.handle_post(url=f"/api/bu/{organization}/project", body=json.dumps(create_project_req))
 
 
 @app.command(name="delete")

cli/cloud/recordings.py

@@ -19,11 +19,11 @@ from typing_extensions import Annotated
 from cli.cloud.uri import URI
 from cli.errors import ErrorPrinter
 from cli.typer import typer_utils
+from cli.utils.rest_helper import RestHelper as Rest
+from cli.utils.rest_helper import err_console
 
 from ..broker.lib.broker import Broker
 from .recordings_playback import app as playback_app
-from .rest_helper import RestHelper as Rest
-from .rest_helper import err_console
 
 app = typer_utils.create_typer()
 app.add_typer(playback_app, name="playback")
@@ -129,7 +129,6 @@ def mount(  # noqa: C901
     transformation_name: str = typer.Option("default", help="Specify a custom signal transformation to use"),
     project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
 ) -> None:
-    # pylint: disable=R0912
     Rest.ensure_auth_token()
 
     Rest.handle_get(f"/api/project/{project}/files/recording/{recording_session}", return_response=True)
@@ -230,7 +229,7 @@ def delete_recording_file(
 
 
 @app.command()
-def upload(  # noqa: C901
+def upload(  # noqa: C901, PLR0912, PLR0915
     path: Path = typer.Argument(
         ...,
         exists=True,
@@ -244,7 +243,6 @@ def upload(  # noqa: C901
     project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
     recording_session: Optional[str] = typer.Option(default=None, help="Optional existing recording to upload file to"),
 ) -> None:
-    # pylint: disable=R0912,R0914,R0915
     """
     Uploads a recording to RemotiveCloud.
     Except for recordings from RemotiveBroker you can also upload Can ASC (.asc), Can BLF(.blf) and  Can LOG (.log, .txt)
@@ -281,8 +279,7 @@ def upload(  # noqa: C901
         return
 
     # Exact same as in cloud console
-    def get_processing_message(step: str) -> str:
-        # pylint: disable=R0911
+    def get_processing_message(step: str) -> str:  # noqa: PLR0911
         if step == "REQUESTED":
             return "Preparing file..."
         if step == "VALIDATING":
@@ -333,9 +330,9 @@ def upload(  # noqa: C901
         err_console.print(f":boom: [bold red]Got status code[/bold red]: {upload_response.status_code} {upload_response.text}")
 
 
-# TODO - Change to use Path for directory  # pylint: disable=W0511
+# TODO - Change to use Path for directory
 @app.command()
-def upload_broker_configuration(  # noqa: C901
+def upload_broker_configuration(
     directory: Path = typer.Argument(
         ...,
         exists=True,
@@ -353,8 +350,6 @@ def upload_broker_configuration(  # noqa: C901
     """
     Uploads a broker configuration directory
     """
-    # pylint: disable=R0914,R0915
-
     # Must end with /
 
     #
@@ -431,7 +426,7 @@ def upload_broker_configuration(  # noqa: C901
         path = file["local_path"]
         url = upload_urls[key]
         headers = {"Content-Type": "application/x-www-form-urlencoded"}
-        r = requests.put(url, open(path, "rb"), headers=headers, timeout=60)  # pylint: disable=R1732
+        r = requests.put(url, open(path, "rb"), headers=headers, timeout=60)
         if r.status_code != 200:
             print("Failed to upload broker configuration")
             print(r.status_code)
@@ -529,11 +524,9 @@ def stop(
     _do_change_playback_mode("stop", recording_session, broker, project)
 
 
-# pylint: disable-next=C0301
-def _do_change_playback_mode(
+def _do_change_playback_mode(  # noqa: PLR0912
     mode: str, recording_session: str, broker_name: Optional[str], project: str, seconds: Optional[int] = None
-) -> None:  # noqa: C901
-    # pylint: disable=R0912,R0914,R0915
+) -> None:
     response = Rest.handle_get(f"/api/project/{project}/files/recording/{recording_session}", return_response=True)
     if response is None:
         return

cli/cloud/recordings_playback.py

@@ -15,10 +15,10 @@ from rich import print as rich_print
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
 from cli.errors import ErrorPrinter
+from cli.utils.rest_helper import RestHelper as Rest
 
 from ..broker.lib.broker import Broker, SubscribableSignal
 from ..typer import typer_utils
-from .rest_helper import RestHelper as Rest
 
 app = typer_utils.create_typer(
     help="""
@@ -101,9 +101,8 @@ def read_scripted_code_file(file_path: Path) -> bytes:
         return file.read()
 
 
-# pylint: disable=R0913
 @app.command()
-def subscribe(
+def subscribe(  # noqa: PLR0913
     recording_session: str = typer.Argument(..., help="Recording session id", envvar="REMOTIVE_CLOUD_RECORDING_SESSION"),
     broker: str = typer.Option(None, help="Broker to use"),
     signal: List[str] = typer.Option(None, help="Signal names to subscribe to, mandatory when not using script"),
@@ -156,12 +155,12 @@ def subscribe(
     except grpc.RpcError as rpc_error:
         ErrorPrinter.print_grpc_error(rpc_error)
 
-    except Exception as e:  # pylint: disable=W0718
+    except Exception as e:
         ErrorPrinter.print_generic_error(str(e))
         sys.exit(1)
 
 
-def _do_change_playback_mode(  # noqa: C901
+def _do_change_playback_mode(  # noqa: C901, PLR0913, PLR0912
     mode: str,
     recording_session: str,
     brokerstr: str,
@@ -169,8 +168,7 @@ def _do_change_playback_mode(  # noqa: C901
     seconds: int | None = None,
     progress_on_play: bool = False,
     repeat: bool = False,
-) -> None:  # noqa: C901
-    # pylint: disable=R0913,R0912
+) -> None:
     response = Rest.handle_get(f"/api/project/{project}/files/recording/{recording_session}", return_response=True)
     if response is None:
         return
@@ -247,7 +245,7 @@ def _verify_recording_on_broker(broker: Broker, recording_session: str, mode: st
                 ErrorPrinter.print_hint(f"remotive cloud recordings mount {recording_session} --project {project}")
                 sys.exit(1)
     except grpc.RpcError as rpc_error:
-        if rpc_error.code() == grpc.StatusCode.NOT_FOUND:  # pylint: disable=no-member
+        if rpc_error.code() == grpc.StatusCode.NOT_FOUND:
             ErrorPrinter.print_generic_error(f"You must use mount to prepare a recording before you can use {mode}")
             ErrorPrinter.print_hint(f"remotive cloud recordings mount {recording_session} --project {project}")
         else:

cli/cloud/sample_recordings.py

@@ -3,8 +3,7 @@ import json
 import typer
 
 from cli.typer import typer_utils
-
-from .rest_helper import RestHelper as Rest
+from cli.utils.rest_helper import RestHelper as Rest
 
 app = typer_utils.create_typer()
 
@@ -18,7 +17,7 @@ def do_import(
 
 
 @app.command("list")
-def list() -> None:  # pylint: disable=W0622
+def list() -> None:
     """
     List available sample recordings
     """

cli/cloud/service_account_tokens.py

@@ -4,13 +4,12 @@ import typer
 
 from cli.settings import settings
 from cli.typer import typer_utils
-
-from .rest_helper import RestHelper as Rest
+from cli.utils.rest_helper import RestHelper as Rest
 
 app = typer_utils.create_typer()
 
 
-# TODO: add add interactive flag to set target directory # pylint: disable=fixme
+# TODO: add add interactive flag to set target directory
 @app.command(name="create", help="Create and download a new service account access token")
 def create(
     expire_in_days: int = typer.Option(default=365, help="Number of this token is valid"),
@@ -23,7 +22,7 @@ def create(
         body=json.dumps({"daysUntilExpiry": expire_in_days}),
     )
 
-    sat = settings.add_service_account_token(service_account, response.text)
+    sat = settings.add_service_account_token(response.text)
     print(f"Service account access token added: {sat.name}")
     print("\033[93m This file contains secrets and must be kept safe")
 
@@ -36,10 +35,27 @@ def list_tokens(
     Rest.handle_get(f"/api/project/{project}/admin/accounts/{service_account}/keys")
 
 
+@app.command(name="describe", help="Describe service account access token")
+def describe(
+    name: str = typer.Argument(..., help="Access token name"),
+    service_account: str = typer.Option(..., help="Service account name"),
+    project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
+) -> None:
+    Rest.handle_get(f"/api/project/{project}/admin/accounts/{service_account}/keys/{name}")
+
+
 @app.command(name="revoke", help="Revoke service account access token")
 def revoke(
     name: str = typer.Argument(..., help="Access token name"),
+    delete: bool = typer.Option(True, help="Also deletes the token after revocation"),
     service_account: str = typer.Option(..., help="Service account name"),
     project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
 ) -> None:
-    Rest.handle_delete(f"/api/project/{project}/admin/accounts/{service_account}/keys/{name}")
+    res = Rest.handle_get(f"/api/project/{project}/admin/accounts/{service_account}/keys/{name}", return_response=True)
+    if not res.json()["revoked"]:
+        Rest.handle_patch(f"/api/project/{project}/admin/accounts/{service_account}/keys/{name}/revoke", quiet=True)
+    if delete:
+        Rest.handle_delete(f"/api/project/{project}/admin/accounts/{service_account}/keys/{name}", quiet=True)
+        token_with_name = [token for token in settings.list_service_account_tokens() if token.name == name]
+        if len(token_with_name) > 0:
+            settings.remove_token_file(name)

cli/cloud/service_accounts.py

@@ -6,9 +6,9 @@ from typing import List
 import typer
 
 from cli.typer import typer_utils
+from cli.utils.rest_helper import RestHelper as Rest
 
 from . import service_account_tokens
-from .rest_helper import RestHelper as Rest
 
 app = typer_utils.create_typer()
 
@@ -18,7 +18,27 @@ def list_service_accounts(project: str = typer.Option(..., help="Project ID", en
     Rest.handle_get(f"/api/project/{project}/admin/accounts")
 
 
-@app.command(name="create", help="Create service account")
+ROLES_DESCRIPTION = """
+    [bold]Supported roles [/bold]
+    project/admin          - Full project support, view, edit, delete and manage users
+    project/user           - View, edit, upload, delete but no admin
+    project/viewer         - View only
+    project/storageCreator - Can upload to storage but not view, overwrite or delete
+    org/topologyRunner     - Can start RemotiveTopology
+"""
+
+
+@app.command(
+    name="create",
+    help=f"""
+    Create a new service account with one or more roles.
+
+    [bold]Must only use lowercase letters, digits, or dashes, and must not contain -- or end with a dash.[/bold]
+
+    remotive cloud service-accounts create --role project/user --role project/storageCreator
+    {ROLES_DESCRIPTION}
+    """,
+)
 def create_service_account(
     name: str,
     role: List[str] = typer.Option(..., help="Roles to apply"),
@@ -28,9 +48,17 @@ def create_service_account(
     Rest.handle_post(url=f"/api/project/{project}/admin/accounts", body=json.dumps(data))
 
 
-@app.command(name="update", help="Update service account")
+@app.command(
+    name="update",
+    help=f"""
+    Update an existing service account with one or more roles.
+
+    remotive cloud service-accounts update --role project/user --role project/storageCreator
+    {ROLES_DESCRIPTION}
+    """,
+)
 def update_service_account(
-    service_account: str = typer.Option(..., help="Service account name"),
+    service_account: str = typer.Argument(..., help="Service account name"),
     role: List[str] = typer.Option(..., help="Roles to apply"),
     project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
 ) -> None:

cli/cloud/storage/cmd.py

@@ -3,13 +3,13 @@ import sys
 import typer
 from typing_extensions import Annotated
 
-from cli.cloud.rest_helper import RestHelper as Rest
 from cli.cloud.storage.copy import copy
 from cli.cloud.storage.uri_or_path import UriOrPath
 from cli.cloud.storage.uri_or_path import uri as uri_parser
 from cli.cloud.uri import URI, InvalidURIError, JoinURIError
 from cli.errors import ErrorPrinter
 from cli.typer import typer_utils
+from cli.utils.rest_helper import RestHelper as Rest
 
 HELP = """
 Manage files ([yellow]Beta feature not available for all customers[/yellow])

cli/cloud/storage/copy.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 import json
 from pathlib import Path
 
-from cli.cloud.rest_helper import RestHelper as Rest
 from cli.cloud.resumable_upload import upload_signed_url
 from cli.cloud.uri import URI
+from cli.utils.rest_helper import RestHelper as Rest
 
 _RCS_STORAGE_PATH = "/api/project/{project}/files/storage{path}"
 
@@ -73,9 +73,8 @@ def _download(source: URI, dest: Path, project: str, overwrite: bool = False) ->
         # create a target file name if destination is a dir
         dest = dest / source.filename
 
-    else:
-        if not dest.parent.is_dir() or not dest.parent.exists():
-            raise FileNotFoundError(f"Destination directory {dest.parent} does not exist")
+    elif not dest.parent.is_dir() or not dest.parent.exists():
+        raise FileNotFoundError(f"Destination directory {dest.parent} does not exist")
 
     if dest.exists() and not overwrite:
         raise FileExistsError(f"Destination file {dest} already exists")

cli/connect/connect.py

@@ -17,7 +17,7 @@ app = typer_utils.create_typer()
 
 
 @app.command()
-def protopie(  # pylint: disable=R0913
+def protopie(  # noqa: PLR0913
     config: Path = typer.Option(
         None,
         exists=True,

cli/connect/protopie/protopie.py

@@ -1,26 +1,25 @@
 # type: ignore
-# pylint: skip-file
 from __future__ import annotations
 
 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  # type: ignore
+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  # type: ignore
+from socketio.exceptions import ConnectionError as SocketIoConnectionError
 
 from cli.broker.lib.broker import SubscribableSignal
 from cli.errors import ErrorPrinter
 from cli.settings import settings
 
-global PP_CONNECT_APP_NAME
 PP_CONNECT_APP_NAME = "RemotiveBridge"
 
 io = socketio.Client()
@@ -34,13 +33,13 @@ x_api_key: str
 broker: Any
 
 
-@io.on("connect")  # type: ignore
+@io.on("connect")
 def on_connect() -> None:
     print("Connected to ProtoPie Connect")
     io.emit("ppBridgeApp", {"name": PP_CONNECT_APP_NAME})
     io.emit("PLUGIN_STARTED", {"name": PP_CONNECT_APP_NAME})
 
-    global is_connected
+    global is_connected  # noqa: PLW0603
     is_connected = True
 
 
@@ -90,7 +89,7 @@ def _connect_to_broker(
     signals, namespaces, sub = get_signals_and_namespaces(config, signals_to_subscribe_to)
 
     def on_signals(frame: SignalsInFrame) -> None:
-        global _has_received_signal
+        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:")
             _has_received_signal = True
@@ -151,10 +150,9 @@ def grpc_connect(
     except Exception as e:
         print(traceback.format_exc())
         err_console.print(f":boom: {e}")
-        # exit(1)
 
 
-def do_connect(
+def do_connect(  # noqa: PLR0913
     address: str,
     broker_url: str,
     api_key: Union[str, None],
@@ -163,9 +161,9 @@ def do_connect(
     expression: Union[str, None],
     on_change_only: bool = False,
 ) -> None:
-    global broker
-    global x_api_key
-    global config_path
+    global broker  # noqa: PLW0603
+    global x_api_key  # noqa: PLW0603
+    global config_path  # noqa: PLW0603
     broker = broker_url
 
     if broker_url.startswith("https"):
@@ -188,8 +186,8 @@ def do_connect(
     except SocketIoConnectionError as e:
         err_console.print(":boom: [bold red]Failed to connect to ProtoPie Connect[/bold red]")
         err_console.print(e)
-        exit(1)
+        sys.exit(1)
     except Exception as e:
         err_console.print(":boom: [bold red]Unexpected error[/bold red]")
         err_console.print(e)
-        exit(1)
+        sys.exit(1)

cli/errors.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
+
 import os
 import sys
+from typing import Optional
 
 import grpc
 from rich.console import Console
@@ -31,8 +34,10 @@ class ErrorPrinter:
         err_console.print(f":point_right: [bold]{message}[/bold]")
 
     @staticmethod
-    def print_generic_error(message: str) -> None:
+    def print_generic_error(message: str, exit_code: Optional[int] = None) -> None:
         err_console.print(f":boom: [bold red]Failed[/bold red]: {message}")
+        if exit_code is not None:
+            sys.exit(exit_code)
 
     @staticmethod
     def print_generic_message(message: str) -> None: