remotivelabs-cli 0.3.4__py3-none-any.whl → 0.3.5__py3-none-any.whl

cli/broker/signals.py

@@ -198,7 +198,7 @@ def namespaces(
 
 @app.command()
 def frame_distribution(
-    url: str = typer.Option(..., help="Broker URL", envvar="REMOTIVE_BROKER_URL"),
+    url: str = typer.Option(DEFAULT_GRPC_URL, help="Broker URL", envvar="REMOTIVE_BROKER_URL"),
     api_key: str = typer.Option(None, help="Cloud Broker API-KEY or access token", envvar="REMOTIVE_BROKER_API_KEY"),
     namespace: str = typer.Option(..., help="Namespace"),
 ) -> None:

cli/settings/core.py

@@ -22,6 +22,10 @@ CONFIG_DIR_PATH = Path.home() / ".config" / "remotive"
 CLI_CONFIG_FILE_NAME = "config.json"
 CLI_INTERNAL_STATE_FILE_NAME = "app-state.json"
 
+TOKEN_ENV = "REMOTIVE_CLOUD_AUTH_TOKEN"
+# Deprecated in favour of name used in topology-cli
+DEPR_TOKEN_ENV = "REMOTIVE_CLOUD_ACCESS_TOKEN"
+
 
 class InvalidSettingsFilePathError(Exception):
     """Raised when trying to access an invalid settings file or file path"""
@@ -91,8 +95,15 @@ class Settings:
 
     def get_active_token(self) -> str | None:
         """
-        Get the token secret for the current active account
+        Get the token secret for the current active account or token specified by env variable
         """
+
+        token = os.environ[DEPR_TOKEN_ENV] if DEPR_TOKEN_ENV in os.environ else None
+        if not token:
+            token = os.environ[TOKEN_ENV] if TOKEN_ENV in os.environ else None
+        if token:
+            return token
+
         token_file = self.get_active_token_file()
         return token_file.token if token_file else None
 

cli/utils/rest_helper.py

@@ -85,6 +85,7 @@ class RestHelper:
         TODO: remove setting org, as we already set the default organization as env in remotive.py?
         TODO: don't sys.exit, raise error instead
         """
+
         if "REMOTIVE_CLOUD_ORGANIZATION" not in os.environ:
             active_account = settings.get_active_account()
             if active_account:
@@ -94,7 +95,8 @@ class RestHelper:
 
         token = access_token
         if not token:
-            token = os.environ.get("REMOTIVE_CLOUD_ACCESS_TOKEN", settings.get_active_token())
+            token = settings.get_active_token()
+
             if not token:
                 if quiet:
                     return

{remotivelabs_cli-0.3.4.dist-info → remotivelabs_cli-0.3.5.dist-info}/METADATA

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

{remotivelabs_cli-0.3.4.dist-info → remotivelabs_cli-0.3.5.dist-info}/RECORD

@@ -15,7 +15,7 @@ cli/broker/licenses.py,sha256=jIuLB2qBGflzSjm952CBnErpzs7iIkmEgx9L8GDAPNc,4021
 cli/broker/playback.py,sha256=1N8jTTgd2rw3VRbpyzP3I-06ritceeYxc_uEKst-8j8,4110
 cli/broker/record.py,sha256=FjpeCbd1pUcDcpgF7QGLuBpecv4x4BFOGwELO8De3go,1440
 cli/broker/scripting.py,sha256=lD8GuoVa8Ku4E2BUAq-USfMqG4utZMRgr61jePogykM,3747
-cli/broker/signals.py,sha256=1xldsY3SVcVp-EEsrd6_uoBjrTRMSEONHpOA6SmWxJ4,8245
+cli/broker/signals.py,sha256=ldZerF4DngjDHsPjI5s90SjBhFhCqUaGgmF9baEz574,8258
 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=lv9D0Q7G1RgI2IO1vkz_VVBA_STCPmdJax3QkeiMwg4,3968
@@ -44,7 +44,7 @@ cli/connect/protopie/protopie.py,sha256=0S-GCNiWpTvXzJEsFSht9HoziSzu_6hXZMvTp4xA
 cli/remotive.py,sha256=EwgjtTjR5EmGo39PFpbF74v2nm3K2E9A1kon89R2KiE,3854
 cli/settings/__init__.py,sha256=JsMr0E_hsM6IRHYeJUrlLBGyKnPdR4cDJd08-TjX274,665
 cli/settings/config_file.py,sha256=QwsrVGB7JTqFNXlLkbWVcRSveW0HsKzU6Jl8mHqjdO8,3586
-cli/settings/core.py,sha256=_UNs3B0t1AhuwciMNWsHFWZMV9kTEkoSlmow8QlkeXw,10999
+cli/settings/core.py,sha256=9VpnjRxMhJ6MooX3N_qWqR3cD6yjLjn7sMvbySUuAR4,11405
 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=S8kyn3ZXbkej2TRLPcVDcYpvk2iW6kGo38OIutEZayo,2217
@@ -64,11 +64,11 @@ cli/typer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/typer/typer_utils.py,sha256=eUrVOEOKY_MnfiJMAxvEurP1Q79z9pq83mJjocP8lhI,686
 cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/utils/console.py,sha256=JF39S9oS1lehFexjdLQKp17oINNvFZJLg_M2SDCjkvA,1754
-cli/utils/rest_helper.py,sha256=ZHc7TMNVa07kJWDQ_OEoeaGhzYu8BinSXJJX8R_wX_8,14135
+cli/utils/rest_helper.py,sha256=fGfA2PE5AL86xs03Q9xXUyAmgBMfjSQjV1I2n_UQWqs,14090
 cli/utils/time.py,sha256=TEKcNZ-pQoJ7cZ6hQmVD0sTRwRm2rBy51-MuDNdO4S4,296
 cli/utils/versions.py,sha256=mHs_BCk0-wwPfCHIIQBlpFkgipSWkw9jUaZ-USH8ODY,3824
-remotivelabs_cli-0.3.4.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.3.4.dist-info/METADATA,sha256=ROqIXVSgE__Tey6UbKorZorckyXtHcvSRc21IeMQqEE,1521
-remotivelabs_cli-0.3.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-remotivelabs_cli-0.3.4.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.3.4.dist-info/RECORD,,
+remotivelabs_cli-0.3.5.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
+remotivelabs_cli-0.3.5.dist-info/METADATA,sha256=9lhOIqBbAc_vIRppm-Q1W67JW4DcwcyMQUcGs7aRoHQ,1521
+remotivelabs_cli-0.3.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+remotivelabs_cli-0.3.5.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
+remotivelabs_cli-0.3.5.dist-info/RECORD,,