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

cli/utils/rest_helper.py

@@ -16,7 +16,7 @@ from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn, wrap_file
 
 from cli.errors import ErrorPrinter
-from cli.settings import TokenNotFoundError, settings
+from cli.settings import settings
 from cli.utils import versions
 
 err_console = Console(stderr=True)
@@ -86,27 +86,22 @@ class RestHelper:
     def ensure_auth_token(quiet: bool = False, access_token: Optional[str] = None) -> None:
         # TODO: remove this? We already set the default organization as env in remotive.py
         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:
                 org = active_account.default_organization
                 if org:
                     os.environ["REMOTIVE_CLOUD_ORGANIZATION"] = org
 
-        token = None
+        token = access_token
+        if not token:
+            token = os.environ.get("REMOTIVE_CLOUD_ACCESS_TOKEN", settings.get_active_token())
+            if not token:
+                if quiet:
+                    return
+                ErrorPrinter.print_hint("you are not logged in, please login using [green]remotive cloud auth login[/green]")
+                sys.exit(1)
 
-        if access_token is None:
-            if "REMOTIVE_CLOUD_ACCESS_TOKEN" in os.environ:
-                token = os.environ["REMOTIVE_CLOUD_ACCESS_TOKEN"]
-            else:
-                try:
-                    token = settings.get_active_token()
-                except TokenNotFoundError:
-                    if quiet:
-                        return
-                    ErrorPrinter.print_hint("you are not logged in, please login using [green]remotive cloud auth login[/green]")
-                    sys.exit(1)
-
-        RestHelper.__headers["Authorization"] = f"Bearer {token.strip() if token is not None else access_token}"
+        RestHelper.__headers["Authorization"] = f"Bearer {token.strip()}"
 
     @staticmethod
     def handle_get(  # noqa: PLR0913

cli/utils/versions.py

@@ -5,7 +5,6 @@ import json
 import os
 import platform
 import urllib.request
-from datetime import timedelta
 from importlib import metadata as importlib_metadata
 from importlib.metadata import version as python_project_version
 
@@ -85,26 +84,17 @@ def check_for_update(settings: Settings) -> None:
     # Make it possible to disable update check, i.e in CI
     if os.environ.get("PYTHON_DISABLE_UPDATE_CHECK"):
         return
-    project = "remotivelabs-cli"
+
+    # Check if we are allowed to perform an update check
+    if not settings.should_perform_update_check():
+        return
 
     # Determine current version
+    project = "remotivelabs-cli"
     cur = cli_version() or _installed_version(project)
     if not cur:
         return  # unknown version → skip silently
 
-    state = settings.get_state_file()
-    if not state.last_update_check_time:
-        if os.environ.get("RUNS_IN_DOCKER"):
-            # To prevent that we always check update in docker due to ephemeral disks we write an "old" check if the state
-            # is missing. If no disk is mounted we will never get the update check but if its mounted properly we will get
-            # it on the second attempt. This is good enough
-            last_update_check_time = (datetime.datetime.now() - timedelta(hours=10)).isoformat()
-            settings.set_last_update_check_time(last_update_check_time)
-            return
-
-    elif not state.should_perform_update_check():
-        return
-
     # We end up here if last_update_check_time is None or should_perform_update_check is true
     include_prereleases = Version(cur).is_prerelease or Version(cur).is_devrelease
 

{remotivelabs_cli-0.2.3.dist-info → remotivelabs_cli-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: remotivelabs-cli
-Version: 0.2.3
+Version: 0.3.0
 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.2.3.dist-info → remotivelabs_cli-0.3.0.dist-info}/RECORD

@@ -5,28 +5,32 @@ cli/broker/brokers.py,sha256=lfO0oAuOwLiJkuNIusXCnOGrxEKGvQjy75LMY9jP5-Y,3234
 cli/broker/export.py,sha256=rr6OGZmkbqVUljy-gluC2CeRDKbI_p41EhleT3lcgXQ,4481
 cli/broker/files.py,sha256=JMpyBYfqVX_ppIChDcUuWvCDIQHC8YI6IsljyIL0NZ8,4212
 cli/broker/lib/__about__.py,sha256=xnZ5V6ZcHW9dhWLWdMzVjYJbEnMKpeXm0_S_mbNzypE,141
-cli/broker/lib/broker.py,sha256=Qu6OuKt0P4aFPRSbmcdXUly9iQrnDgUcHTjVJzahTCQ,25006
+cli/broker/lib/broker.py,sha256=W7wp21nvXWm96y5LvSVmRIi3wiNtOFA8Bx-al8CVEIQ,26420
+cli/broker/lib/client.py,sha256=2Nwrd_PY1gqQNqkWc9QTJVFDMAZebAzVnCFUTqiArwE,8540
+cli/broker/lib/helper.py,sha256=ECwygqZHFkRhV-h4EVOUOkOVgXnmsuJP4OnIJtarh7c,9316
+cli/broker/lib/signalcreator.py,sha256=CDInuSAmNrOlEya_br8CGZR1VNAXY7CXkF9s3mQUpHk,8201
 cli/broker/license_flows.py,sha256=du5SSAdzr2VZeORWoAgbYrfi-mpnDUQfIVpfAJK6CSM,7216
 cli/broker/licenses.py,sha256=jIuLB2qBGflzSjm952CBnErpzs7iIkmEgx9L8GDAPNc,4021
 cli/broker/playback.py,sha256=fO-ZvzmB3ZzanmD1L09PeKkabx35uKsELMM-h-5brSE,4023
 cli/broker/record.py,sha256=rVjvyWRSWNFtthZZkZeZZGvZdmhDB_qmYcrCocCJxY4,1445
 cli/broker/scripting.py,sha256=LFLdaBNxe2sfpcxhDmRlAbEorjL3SJZNK-zEdLQ9ySU,3854
 cli/broker/signals.py,sha256=MFj_bOLIxHY1v3XPkKk6n8U3JLaY8nrXHahRQaVse6s,8207
-cli/cloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cli/cloud/__init__.py,sha256=xFaDg2zho_glvDBDB0_8HRNICVwHeYFEz-yMhzTcCjI,987
 cli/cloud/auth/__init__.py,sha256=MtQ01-n8CgZb9Y_SvxwZUgj44Yo0dFAU3_XwhQiUYtw,54
-cli/cloud/auth/cmd.py,sha256=gLmfjIN9Vrytk9BwGH1cq4WeeryOfwTTnQ4yuZrbRcs,2757
-cli/cloud/auth/login.py,sha256=dX6M5ysE0n9Zg3gVT7hJbChxTsmuba-Z-1Or6DCFYis,11511
-cli/cloud/auth_tokens.py,sha256=ubY5KndOKGr0G5a1QCXOaCQ2OPBM3BkkIWCG-WmLKCI,12513
+cli/cloud/auth/cmd.py,sha256=buLqfd9JGg8ziR749nNhaeXfMZTstIsrYvAib7kBQrU,3872
+cli/cloud/auth/login.py,sha256=cS860pSMuw8aN6PAmtMxLDSkFEaFRjghTodLQNUHB2A,11466
+cli/cloud/auth_tokens.py,sha256=K94lC6QLAuiADZYk0k-4iYabz9AGl_rNFj02xlKeNZs,5148
 cli/cloud/brokers.py,sha256=QTA9bmaK06LKEccF6IBgWBonC4VFrKwFQBsACX_IzYw,3896
-cli/cloud/cloud_cli.py,sha256=q-oiaLcKC-BRamXfIFGn-BskRmJ3utA7-tI39lSs3Cs,1309
 cli/cloud/configs.py,sha256=uv46nUoGXOr99smQHahv_ageDv6bGYfUnlRlxcS5D9A,5125
-cli/cloud/organisations.py,sha256=YF8HiF-dRz-FeCxjKFmFqm81SLI0FTUKM2SGCxMPfwY,4075
+cli/cloud/licenses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cli/cloud/licenses/cmd.py,sha256=zq-Cc5OdftDyUR4dDqGnCmeNF62XR_kYC3mYXEKFZCw,477
+cli/cloud/organisations.py,sha256=IYpcWwczuWfgY1WqM9d6duXu7F7KMw4v8koeo_ERhkA,3950
 cli/cloud/projects.py,sha256=ecn5Y8UKhgYnHSJQACUk1GNZt9EF8ug4B-6MCr8rZqM,1487
 cli/cloud/recordings.py,sha256=In2fKX668CPsEVBAy7zkU92lEnmu3UcnqiVrqsvLNDQ,24961
 cli/cloud/recordings_playback.py,sha256=XZoVyujufMQFN2v_Nwsf8tOqn61yLEpAf2z_u5uhXik,11532
 cli/cloud/resumable_upload.py,sha256=8lEIdncJZoTZzNsQVHH3gm_GunxEmN5JbmWX7awy3p4,3713
 cli/cloud/sample_recordings.py,sha256=RmuT-a2iMwGj3LXVcPkV5l66uFcf7nyWyJciUjnYkk4,721
-cli/cloud/service_account_tokens.py,sha256=lZHrja2hIyeXGTNGsxaZ_NlS_iXcyWR_h62H4OYeTMk,2783
+cli/cloud/service_account_tokens.py,sha256=9ffBUM1qXsRaJgOviwINxJl2ndKYKuBr_SXGrcOW3mA,2788
 cli/cloud/service_accounts.py,sha256=AiktZW5QTbT6sAPJi4ubETOqbBDAIt4LOE-TZmIiIkk,2586
 cli/cloud/storage/__init__.py,sha256=ijl9WwU5D4oASbwrFKJurYsBUyzwZCOhcdTQYj-ZSeM,159
 cli/cloud/storage/cmd.py,sha256=UOPpzZeqtqAD2qAbFRGHnbpliq6T_8phKQSxU0EeaqI,2970
@@ -35,33 +39,33 @@ cli/cloud/storage/uri_or_path.py,sha256=DLlyr0RAV-DRlL2C36U-jvUqwiLIlkw7c3mJ7SSG
 cli/cloud/uri.py,sha256=QZCus--KJQlVwGCOzZqiglvj8VvSRKxfVvN33Pilgyg,3616
 cli/connect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/connect/connect.py,sha256=SH2DNTTVLu2dNpk6xIah1-KJZAqrK_7Skt8RKp8Mjh8,4231
-cli/connect/protopie/protopie.py,sha256=ElmrGaV0ivb85wo0gLzCAXZhmSmIDASaCVlF1iQblLI,6532
+cli/connect/protopie/protopie.py,sha256=hd0WBZG7LZXMq4rHU03C-LJ_ZfG6CDkXEgYAJEP78XA,6529
 cli/errors.py,sha256=djODw6sdMJXzOsuAUOP3N13nfmm1sIP3Pe6tllGdozM,1657
-cli/remotive.py,sha256=Fvu6mKU5CPWZZ5WL9UsQqC-LYswb70GBlvpq4J92AVE,4015
-cli/settings/__init__.py,sha256=t1qkaGrJ4xx8WMHlmBTbQ1VdJL4YOcz8VFfRkGa2_jQ,711
-cli/settings/config_file.py,sha256=eWZK8YnuqGMy5rPJEqaX-M8_rnspklECRvES-C6_na4,3548
-cli/settings/core.py,sha256=ch59RiEB_TmyzO7nS5DW1VqkZ5PsDgGXhOs2CxPDxnw,11902
+cli/remotive.py,sha256=kYefDVWw9oiEZtTNor-Dz2qhdMXCaoctu_SE0drpg80,3877
+cli/settings/__init__.py,sha256=JsMr0E_hsM6IRHYeJUrlLBGyKnPdR4cDJd08-TjX274,665
+cli/settings/config_file.py,sha256=QwsrVGB7JTqFNXlLkbWVcRSveW0HsKzU6Jl8mHqjdO8,3586
+cli/settings/core.py,sha256=POnA5bwPNXA5EF9YRjEAZ36GS8A6I-O1vWzLbEDQDXY,10965
 cli/settings/migration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/settings/migration/migrate_all_token_files.py,sha256=xoVvAqn_tGskEW148uf3xZx1mpJKUnERMTcBo0nkCnI,3010
-cli/settings/migration/migrate_config_file.py,sha256=pgkQvRo814p75-lHydwL5aUmPG59TbbME61rL2--nZo,2001
+cli/settings/migration/migrate_config_file.py,sha256=S8kyn3ZXbkej2TRLPcVDcYpvk2iW6kGo38OIutEZayo,2217
 cli/settings/migration/migrate_legacy_dirs.py,sha256=N0t2io3bT_ub8BcVPw1CeQ4eeexRUiu3jXq3DL018OE,1819
 cli/settings/migration/migrate_token_file.py,sha256=Fp7Z_lNqSdoWY05TYwFW2QH8q9QhmB2TYSok6hV1Mic,1530
-cli/settings/migration/migration_tools.py,sha256=P72tuw6-aS_Kd0qn-0ZecplsYxMTu0LTXM5sMSNTVEM,1378
-cli/settings/state_file.py,sha256=QvZIq-OH39RR60Y3HNbuGoJhYyP1Hmi6oE-ejJiO7S8,1566
+cli/settings/migration/migration_tools.py,sha256=BK9zCzBulzQaZuiNkzLgH2SFRmLCYTopv0TXlo_QuK0,1318
+cli/settings/state_file.py,sha256=rN6JNZP9ULZsuossk3M7jPhoIUgogAAcQGs4SJ-rI-4,2162
 cli/settings/token_file.py,sha256=9GZh44eaXtn30EA06mzQ-69yBT06ig03doqfUHisAw0,3921
 cli/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/tools/can/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/tools/can/can.py,sha256=TtP5w8vb0QG4ObNhkWIDpRMdNelirFffoc_lFZy8ePM,2260
 cli/tools/tools.py,sha256=jhLfrFDqkmWV3eBAzNwBf6WgDGrz7sOhgVCia36Twn8,232
-cli/topology/cmd.py,sha256=Fv5HwvHh6Ie29dcEtD1do-Zxg6fUTwlV9zw42ZKUkvc,4036
+cli/topology/cmd.py,sha256=M5WB6wR37MbcVk4I5iyW04XFX9YIYXVYVLTejtEYFGw,3997
 cli/typer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/typer/typer_utils.py,sha256=TaJuK1EtE9Gv3DfmoyHPTNKmhiAimuQCHKxQjnUZ7bs,737
 cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cli/utils/rest_helper.py,sha256=KVoisWqBfEe20dQ6F4n9qYOYPmtGqs5EMMOCmtCjQ8Y,14120
+cli/utils/rest_helper.py,sha256=9MLIMiU3RR9dfZZFpCLxJnw4VXnl1Ga62k5knplDsjg,13881
 cli/utils/time.py,sha256=TEKcNZ-pQoJ7cZ6hQmVD0sTRwRm2rBy51-MuDNdO4S4,296
-cli/utils/versions.py,sha256=9O4wUFcAmEoi1rvKrZDqizSPMJ0HVlcO8k_OtRs8-yA,4438
-remotivelabs_cli-0.2.3.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.2.3.dist-info/METADATA,sha256=eB_R_z5VmO1m_L-eCWqe89e7zIAm_pxVam3uyfMjwBc,1479
-remotivelabs_cli-0.2.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-remotivelabs_cli-0.2.3.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.2.3.dist-info/RECORD,,
+cli/utils/versions.py,sha256=U0nq7M2wrUU9m4IL2_Rg1iST3PKN-leN_Huoe6jP4EQ,3846
+remotivelabs_cli-0.3.0.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
+remotivelabs_cli-0.3.0.dist-info/METADATA,sha256=mSh5ZaTWDlSWLDqquw5vXxz0gLNuSurXgqfgn3LtcV0,1521
+remotivelabs_cli-0.3.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+remotivelabs_cli-0.3.0.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
+remotivelabs_cli-0.3.0.dist-info/RECORD,,

cli/cloud/cloud_cli.py

@@ -1,29 +0,0 @@
-import typer
-
-from cli.cloud import auth, brokers, configs, organisations, projects, recordings, sample_recordings, service_accounts, storage
-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 organization")
-def licenses(
-    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/{organization}/licenses", {"filter": filter_option})
-
-
-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")
-app.add_typer(recordings.app, name="recordings", help="Manage recordings")
-app.add_typer(configs.app, name="signal-databases", help="Manage signal databases")
-app.add_typer(storage.app, name="storage")
-app.add_typer(service_accounts.app, name="service-accounts", help="Manage project service account keys")
-app.add_typer(sample_recordings.app, name="samples", help="Manage sample recordings")
-
-if __name__ == "__main__":
-    app()