remotivelabs-cli 0.0.39__tar.gz → 0.0.41__tar.gz

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/PKG-INFO

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

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/broker/brokers.py

@@ -11,9 +11,11 @@ from zeroconf import (
     Zeroconf,
 )
 
+from cli.typer import typer_utils
+
 from . import export, files, licenses, playback, record, scripting, signals
 
-app = typer.Typer(rich_markup_mode="rich")
+app = typer_utils.create_typer(rich_markup_mode="rich")
 
 
 @app.callback()

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/broker/export.py

@@ -9,9 +9,10 @@ import typer
 
 from cli.errors import ErrorPrinter
 
+from ..typer import typer_utils
 from .lib.broker import Broker, SubscribableSignal
 
-app = typer.Typer(
+app = typer_utils.create_typer(
     rich_markup_mode="rich",
     help="""
 Export subscribed signals to different formats, currently only InfluxDB line protocol

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/broker/files.py

@@ -8,10 +8,11 @@ import typer
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
 from cli.errors import ErrorPrinter
+from cli.typer import typer_utils
 
 from .lib.broker import Broker
 
-app = typer.Typer(help=help)  # type: ignore
+app = typer_utils.create_typer(help=help)
 
 
 @app.command()

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/broker/licenses.py

@@ -5,9 +5,11 @@ from enum import Enum
 import typer
 from rich import print_json
 
+from cli.typer import typer_utils
+
 from .license_flows import LicenseFlow
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 help_text = """
     More info on our docs page

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/broker/playback.py

@@ -6,10 +6,11 @@ import grpc
 import typer
 
 from cli.errors import ErrorPrinter
+from cli.typer import typer_utils
 
 from .lib.broker import Broker
 
-app = typer.Typer(help=help)  # type: ignore
+app = typer_utils.create_typer(help=help)
 
 
 def recording_and_namespace(recording: str) -> Dict[str, str]:

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/broker/record.py

@@ -6,10 +6,11 @@ import grpc
 import typer
 
 from cli.errors import ErrorPrinter
+from cli.typer import typer_utils
 
 from .lib.broker import Broker
 
-app = typer.Typer(help=help)  # type: ignore
+app = typer_utils.create_typer(help=help)
 
 
 @app.command()

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/broker/scripting.py

@@ -7,8 +7,9 @@ import typer
 from rich import print as rich_print
 
 from cli.errors import ErrorPrinter
+from cli.typer import typer_utils
 
-app = typer.Typer(
+app = typer_utils.create_typer(
     rich_markup_mode="rich",
     help="""
 [Experimental] - Generate template lua script for input and output signals

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/broker/signals.py

@@ -14,10 +14,11 @@ import typer
 from rich import print as rich_rprint
 
 from cli.errors import ErrorPrinter
+from cli.typer import typer_utils
 
 from .lib.broker import Broker, SubscribableSignal
 
-app = typer.Typer(help=help)  # type: ignore
+app = typer_utils.create_typer(help=help)
 
 DEFAULT_GRPC_URL = "http://localhost:50051"
 

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/auth/cmd.py

@@ -1,18 +1,17 @@
 import sys
 
-import typer
-
 from cli.cloud.auth.login import login as do_login
 from cli.cloud.rest_helper import RestHelper as Rest
 from cli.errors import ErrorPrinter
 from cli.settings import TokenNotFoundError, settings
+from cli.typer import typer_utils
 
 from .. import auth_tokens
 
 HELP = """
 Manage how you authenticate with our cloud platform
 """
-app = typer.Typer(help=HELP)
+app = typer_utils.create_typer(help=HELP)
 app.add_typer(auth_tokens.app, name="tokens", help="Manage users personal access tokens")
 
 

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/auth_tokens.py

@@ -1,10 +1,11 @@
 import typer
 
 from cli.settings import settings
+from cli.typer import typer_utils
 
 from .rest_helper import RestHelper as Rest
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 # TODO: add add interactive flag to set target directory # pylint: disable=fixme

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/brokers.py

@@ -9,9 +9,11 @@ import requests
 import typer
 import websocket
 
+from cli.typer import typer_utils
+
 from .rest_helper import RestHelper as Rest
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 @app.command("list", help="Lists brokers in project")

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/cloud_cli.py

@@ -2,8 +2,9 @@ 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
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 @app.command(help="List licenses for an organisation")

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/configs.py

@@ -7,9 +7,11 @@ import requests
 import typer
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
+from cli.typer import typer_utils
+
 from .rest_helper import RestHelper as Rest
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 @app.command("list")

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/organisations.py

@@ -1,11 +1,10 @@
 import json
 import sys
 
-import typer
-
 from cli.cloud.rest_helper import RestHelper
+from cli.typer import typer_utils
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 @app.command(name="list", help="List your available organisations")

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/projects.py

@@ -2,9 +2,11 @@ import json
 
 import typer
 
+from cli.typer import typer_utils
+
 from .rest_helper import RestHelper as Rest
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 @app.command(name="list", help="List your projects")

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/recordings.py

@@ -18,13 +18,14 @@ from typing_extensions import Annotated
 
 from cli.cloud.uri import URI
 from cli.errors import ErrorPrinter
+from cli.typer import typer_utils
 
 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.Typer()
+app = typer_utils.create_typer()
 app.add_typer(playback_app, name="playback")
 
 

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/recordings_playback.py

@@ -17,9 +17,10 @@ from rich.progress import Progress, SpinnerColumn, TextColumn
 from cli.errors import ErrorPrinter
 
 from ..broker.lib.broker import Broker, SubscribableSignal
+from ..typer import typer_utils
 from .rest_helper import RestHelper as Rest
 
-app = typer.Typer(
+app = typer_utils.create_typer(
     help="""
 Support for playback of a recording on a cloud broker, make sure to always mount a recording first
 """
@@ -174,8 +175,8 @@ def _do_change_playback_mode(  # noqa: C901
     if response is None:
         return
     r = json.loads(response.text)
-    recordings: List[Any] = r["recordings"]
-    files = list(map(lambda rec: {"recording": rec["fileName"], "namespace": rec["metadata"]["namespace"]}, recordings))
+    enabled_recordings: List[Any] = [r for r in r["recordings"] if r["enabled"]]
+    files = [{"recording": rec["fileName"], "namespace": rec["metadata"]["namespace"]} for rec in enabled_recordings]
 
     broker_name = brokerstr if brokerstr is not None else "personal"
     response = Rest.handle_get(f"/api/project/{project}/brokers/{broker_name}", return_response=True, allow_status_codes=[404])
@@ -223,7 +224,7 @@ def _track_progress(broker: Broker, repeat: bool, files: List[Any]) -> None:
         def print_progress(offset: int, total: int, current_mode: str) -> None:
             p.update(
                 t,
-                description=f"{(datetime.timedelta(seconds=offset))} " f"/ {(datetime.timedelta(seconds=total))} ({current_mode})",
+                description=f"{(datetime.timedelta(seconds=offset))} / {(datetime.timedelta(seconds=total))} ({current_mode})",
             )
 
         broker.listen_on_playback(repeat, files, print_progress)

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/rest_helper.py

@@ -100,7 +100,7 @@ class RestHelper:
         allow_status_codes: List[int] | None = None,
         progress_label: str = "Fetching...",
         use_progress_indicator: bool = True,
-        timeout: int = 20,
+        timeout: int = 60,
     ) -> requests.Response:
         # pylint: disable=R0913
         # Returns a Response object if succesfull otherwise None

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/sample_recordings.py

@@ -2,9 +2,11 @@ import json
 
 import typer
 
+from cli.typer import typer_utils
+
 from .rest_helper import RestHelper as Rest
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 @app.command(name="import", help="Import sample recording into project")

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/service_account_tokens.py

@@ -3,10 +3,11 @@ import json
 import typer
 
 from cli.settings import settings
+from cli.typer import typer_utils
 
 from .rest_helper import RestHelper as Rest
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 # TODO: add add interactive flag to set target directory # pylint: disable=fixme

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/service_accounts.py

@@ -5,10 +5,12 @@ from typing import List
 
 import typer
 
+from cli.typer import typer_utils
+
 from . import service_account_tokens
 from .rest_helper import RestHelper as Rest
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 @app.command(name="list", help="List service-accounts")

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/cloud/storage/cmd.py

@@ -9,6 +9,7 @@ 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
 
 HELP = """
 Manage files ([yellow]Beta feature not available for all customers[/yellow])
@@ -17,7 +18,7 @@ Copy file from local to remote storage and vice versa, list and delete files.
 
 """
 
-app = typer.Typer(rich_markup_mode="rich", help=HELP)
+app = typer_utils.create_typer(rich_markup_mode="rich", help=HELP)
 
 
 @app.command(name="ls")

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/connect/connect.py

@@ -9,10 +9,11 @@ from typing_extensions import List
 
 from cli.broker.lib.broker import SubscribableSignal
 from cli.errors import ErrorPrinter
+from cli.typer import typer_utils
 
 from .protopie import protopie as ppie
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 @app.command()

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/remotive.py

@@ -11,11 +11,12 @@ from .cloud.cloud_cli import app as cloud_app
 from .connect.connect import app as connect_app
 from .settings.cmd import app as settings_app
 from .tools.tools import app as tools_app
+from .typer import typer_utils
 
 if os.getenv("GRPC_VERBOSITY") is None:
     os.environ["GRPC_VERBOSITY"] = "NONE"
 
-app = typer.Typer(
+app = typer_utils.create_typer(
     rich_markup_mode="rich",
     help="""
 Welcome to RemotiveLabs CLI - Simplify and automate tasks for cloud resources and brokers

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/settings/cmd.py

@@ -2,8 +2,9 @@ import typer
 
 from cli.errors import ErrorPrinter
 from cli.settings.core import TokenNotFoundError, settings
+from cli.typer import typer_utils
 
-app = typer.Typer()
+app = typer_utils.create_typer()
 
 
 @app.command()

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/tools/can/can.py

@@ -4,6 +4,8 @@ import can
 import typer
 from rich.console import Console
 
+from cli.typer import typer_utils
+
 err_console = Console(stderr=True)
 console = Console()
 
@@ -11,7 +13,7 @@ HELP = """
 CAN related tools
 """
 
-app = typer.Typer(help=HELP)
+app = typer_utils.create_typer(help=HELP)
 
 
 @app.command("convert")

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/cli/tools/tools.py

@@ -1,4 +1,4 @@
-import typer
+from cli.typer import typer_utils
 
 from .can.can import app as can_app
 
@@ -6,5 +6,5 @@ HELP_TEXT = """
 CLI tools unrelated to cloud or broker
 """
 
-app = typer.Typer(help=HELP_TEXT)
+app = typer_utils.create_typer(help=HELP_TEXT)
 app.add_typer(can_app, name="can", help="CAN tools")

remotivelabs_cli-0.0.41/cli/typer/typer_utils.py

@@ -0,0 +1,8 @@
+from typing import Any
+
+import typer
+
+
+def create_typer(**kwargs: Any) -> typer.Typer:
+    """Create a Typer instance with default settings."""
+    return typer.Typer(no_args_is_help=True, **kwargs)

{remotivelabs_cli-0.0.39 → remotivelabs_cli-0.0.41}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "remotivelabs-cli"
-version = "0.0.39"
+version = "0.0.41"
 description = "CLI for operating RemotiveCloud and RemotiveBroker"
 authors = ["Johan Rask <johan.rask@remotivelabs.com>"]
 readme = "README.md"