remotivelabs-cli 0.3.3__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/topology/cmd.py

@@ -5,10 +5,12 @@ import typer
 from cli.topology.start_trial import (
     MissingOrganizationError,
     NoActiveAccountError,
+    NoOrganizationOrPermissionError,
     NotAuthorizedError,
     NotAuthorizedToStartTrialError,
     NotSignedInError,
     SubscriptionExpiredError,
+    get_organization_and_account,
     start_trial,
 )
 from cli.typer import typer_utils
@@ -30,12 +32,34 @@ def start_trial_cmd(  # noqa: C901
 
     You can read more at https://docs.remotivelabs.com/docs/remotive-topology.
     """
+
     try:
-        subscription = start_trial(organization)
-        if subscription.type == "trial":
-            print_generic_message(f"topology trial active, expires {subscription.end_date}")
-        elif subscription.type == "paid":
-            print_generic_message(f"you already have a topology subscription, expires {subscription.end_date or 'Never'}")
+        (valid_organization, _) = get_organization_and_account(organization_uid=organization)
+        ok_to_start_trial = typer.confirm(
+            f"You are about to start trial of RemotiveTopology for {valid_organization.display_name}"
+            f" (uid={valid_organization.uid}), continue?",
+            default=True,
+        )
+        if not ok_to_start_trial:
+            return
+
+        (subscription, created) = start_trial(organization)
+
+        def print_start_trial_result() -> None:
+            assert subscription.type in ("trial", "paid"), f"Unexpected subscription type: {subscription.type}"
+            kind = None
+            status = None
+            if subscription.type == "trial":
+                status = "started now" if created else "is already active"
+                kind = "trial subscription"
+            elif subscription.type == "paid":
+                status = "started now" if created else "is already started"
+                kind = "subscription"
+
+            end_text = subscription.end_date or "Never"
+            print_generic_message(f"RemotiveTopology {kind} for {valid_organization.display_name} {status}, expires {end_text}")
+
+        print_start_trial_result()
 
     except NotSignedInError:
         print_generic_error(
@@ -46,7 +70,7 @@ def start_trial_cmd(  # noqa: C901
 
     except NoActiveAccountError:
         print_hint(
-            "You have not actived your account, please run [bold]remotive cloud auth activate[/bold] to choose an account"
+            "You have not activated your account, please run [bold]remotive cloud auth activate[/bold] to choose an account"
             "or [bold]remotive cloud auth login[/bold] to sign-in"
         )
         raise typer.Exit(3)
@@ -63,15 +87,25 @@ def start_trial_cmd(  # noqa: C901
         raise typer.Exit(5)
 
     except NotAuthorizedToStartTrialError as e:
-        print_generic_error(f"You are not allowed to start-trial topology in organization {e.organization}")
+        print_generic_error(f"You are not allowed to start-trial topology in organization {e.organization.display_name}.")
         raise typer.Exit(6)
 
     except SubscriptionExpiredError as e:
         if e.subscription.type == "trial":
-            print_generic_error(f"Your Topology trial expired {e.subscription.end_date}, please contact support@remotivelabs.com")
+            print_generic_error(
+                f"RemotiveTopology trial in {e.organization.display_name} expired"
+                f" {e.subscription.end_date}, please contact support@remotivelabs.com"
+            )
             raise typer.Exit(7)
 
-        print_generic_error(f"Your Topology subscription has expired {e.subscription.end_date}, please contact support@remotivelabs.com")
+        print_generic_error(
+            f"RemotiveTopology subscription in {e.organization.display_name} has expired"
+            f" {e.subscription.end_date}, please contact support@remotivelabs.com"
+        )
+        raise typer.Exit(7)
+
+    except NoOrganizationOrPermissionError as e:
+        print_generic_error(f"Organization id {e.organization} does not exist or you do not have permission to access it.")
         raise typer.Exit(7)
 
     except Exception as e:

cli/topology/start_trial.py

@@ -26,6 +26,14 @@ class NotAuthorizedError(Exception):
         self.account = account
 
 
+class NoOrganizationOrPermissionError(Exception):
+    """Raised when the user is trying to access an organization that it does not have access to or it does not exist"""
+
+    def __init__(self, account: Account, organization_uid: str):
+        self.account = account
+        self.organization = organization_uid
+
+
 class MissingOrganizationError(Exception):
     """Raised when the user has not specified an organization and no default organization is set"""
 
@@ -33,7 +41,7 @@ class MissingOrganizationError(Exception):
 class NotAuthorizedToStartTrialError(Exception):
     """Raised when the user is not authorized to start a topology trial"""
 
-    def __init__(self, account: Account, organization: str):
+    def __init__(self, account: Account, organization: Organization):
         self.account = account
         self.organization = organization
 
@@ -41,8 +49,15 @@ class NotAuthorizedToStartTrialError(Exception):
 class SubscriptionExpiredError(Exception):
     """Raised when the subscription has expired"""
 
-    def __init__(self, subscription: Subscription):
+    def __init__(self, subscription: Subscription, organization: Organization):
         self.subscription = subscription
+        self.organization = organization
+
+
+@dataclass
+class Organization:
+    uid: str
+    display_name: str
 
 
 @dataclass
@@ -67,12 +82,7 @@ class Subscription:
         )
 
 
-def start_trial(organization: str | None = None) -> Subscription:
-    """
-    Start a 30 day trial subscription for running RemotiveTopology.
-
-    # TODO: move authentication (and basic authorization) to a logged_in decorator
-    """
+def get_organization_and_account(organization_uid: str | None = None) -> tuple[Organization, Account]:
     active_account = settings.get_active_account()
     active_token_file = settings.get_active_token_file()
 
@@ -84,22 +94,41 @@ def start_trial(organization: str | None = None) -> Subscription:
     if not RestHelper.has_access("/api/whoami"):
         raise NotAuthorizedError(account=active_account)
 
-    valid_org = organization or active_account.default_organization
-    if not valid_org:
+    org_uid = organization_uid or active_account.default_organization
+    if not org_uid:
         raise MissingOrganizationError()
 
-    res = RestHelper.handle_get(f"/api/bu/{valid_org}/features/topology", return_response=True, allow_status_codes=[403, 404])
+    response = RestHelper.handle_get(f"/api/bu/{organization_uid}", return_response=True, allow_status_codes=[403, 404])
+    if response.status_code in (403, 404):
+        raise NoOrganizationOrPermissionError(account=active_account, organization_uid=org_uid)
+
+    display_name = response.json()["displayName"]
+
+    return Organization(uid=org_uid, display_name=display_name), active_account
+
+
+def start_trial(organization_uid: str | None = None) -> tuple[Subscription, bool]:
+    """
+    Start a 30 day trial subscription for running RemotiveTopology,
+    If a trial is already started in this organization, returns the existing trial instead.
+    Returns (subscription, created_now).
+    """
+
+    (organization, active_account) = get_organization_and_account(organization_uid)
+
+    res = RestHelper.handle_get(f"/api/bu/{organization.uid}/features/topology", return_response=True, allow_status_codes=[403, 404])
     if res.status_code == 403:
-        raise NotAuthorizedToStartTrialError(account=active_account, organization=valid_org)
+        raise NotAuthorizedToStartTrialError(account=active_account, organization=organization)
+
+    created_now = False
     if res.status_code == 404:
-        created = RestHelper.handle_post(f"/api/bu/{valid_org}/features/topology", return_response=True)
+        created = RestHelper.handle_post(f"/api/bu/{organization.uid}/features/topology", return_response=True)
         subscription = Subscription.from_dict(created.json())
+        created_now = True
     else:
-        # 200 OK means we already have a valid subscription
         subscription = Subscription.from_dict(res.json())
 
-    # check subscription validity
     if subscription.end_date < datetime.datetime.now().date():
-        raise SubscriptionExpiredError(subscription=subscription)
+        raise SubscriptionExpiredError(subscription=subscription, organization=organization)
 
-    return subscription
+    return subscription, created_now

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.3.dist-info → remotivelabs_cli-0.3.5.dist-info}/METADATA

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

{remotivelabs_cli-0.3.3.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
@@ -58,17 +58,17 @@ cli/tools/can/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/tools/can/can.py,sha256=ovTqzsjJP-z9H5RiJ3f_OXMpELqM3d09JY4JfPpT3-Q,2171
 cli/tools/tools.py,sha256=jhLfrFDqkmWV3eBAzNwBf6WgDGrz7sOhgVCia36Twn8,232
 cli/topology/__init__.py,sha256=MyorYLmC2wAd_z5GdQENEYLgoCiNYgwQ16BOX93IBtI,52
-cli/topology/cmd.py,sha256=vtAw-vIJxf2dogVaqqUm8jRzUJrC7fVuov3sSV7l0sc,3101
-cli/topology/start_trial.py,sha256=GNB2E-Ia18UpXQZ4fViGq5-pRq69vinDBLwzImsz2GY,3414
+cli/topology/cmd.py,sha256=TCSwURxTmAyU4Lvu-Rk8ymPardmAARuFEn-kTckksvw,4408
+cli/topology/start_trial.py,sha256=b0PWAFS9Q67kCLq9zZ-t6vl0c3WMiF4BF4nN5yqyZ-I,4538
 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.3.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.3.3.dist-info/METADATA,sha256=0FN9scMQxaaw_VeK_-S0WwLtDhCRqaprK9IG67O9GMM,1521
-remotivelabs_cli-0.3.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-remotivelabs_cli-0.3.3.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.3.3.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,,