simulo 0.24.0__tar.gz → 0.24.1__tar.gz

{simulo-0.24.0/src/simulo.egg-info → simulo-0.24.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simulo
-Version: 0.24.0
+Version: 0.24.1
 Summary: Simulo SDK and CLI — define robotics simulation and training apps in Python and run them on the Simulo cloud.
 Author-email: Simulo Team <team@simulo.ai>
 License: BSD-3-Clause

{simulo-0.24.0 → simulo-0.24.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simulo"
-version = "0.24.0"
+version = "0.24.1"
 description = "Simulo SDK and CLI — define robotics simulation and training apps in Python and run them on the Simulo cloud."
 readme = "PYPI.md"
 requires-python = ">=3.11"

{simulo-0.24.0 → simulo-0.24.1}/src/simulo/_client/cli.py

@@ -635,6 +635,19 @@ _MACHINE_UUID_RE = re.compile(
 )
 _MAX_CLI_ERROR_CHARS = 2048
 
+#: Clean, human-worded renderings for account/organization state error codes
+#: that reach the CLI verbatim from the wire (``code: message``) otherwise.
+#: Shared between ``_safe_cli_error_text`` (the general path: ``jobs``,
+#: ``cancel``, ``view``, ``run``, ``whoami``, ...) and ``_friendly_asset_error``
+#: (the asset-catalog surface, which wraps errors in its own ``AssetApiHTTPError``
+#: rather than ``http.HttpHTTPError``, so it cannot share the first function's
+#: isinstance check) so a person sees the identical message regardless of which
+#: command surfaced the error.
+_ACCOUNT_SUSPENDED_MESSAGE = "Your Simulo account has been suspended. Contact Simulo support to restore access."
+_ORGANIZATION_DEACTIVATED_MESSAGE = (
+    "This organization has been deactivated. Its owner can reactivate it from organization settings."
+)
+
 
 def _canonical_uuid_text(value: Any) -> Optional[str]:
     """Return one exact legacy UUID in canonical form, or ``None``."""
@@ -682,7 +695,13 @@ def _safe_cli_error_text(value: Any) -> str:
     if (isinstance(value, http.HttpHTTPError) and value.code == "account_suspended") or (
         isinstance(value, credentials.TokenRefreshError) and value.code == "account_suspended"
     ):
-        text = "Your Simulo account has been suspended. Contact Simulo support to restore access."
+        text = _ACCOUNT_SUSPENDED_MESSAGE
+    elif isinstance(value, http.HttpHTTPError) and value.code == "organization_deactivated":
+        # Unlike suspension, deactivation never disables Cognito: a stale
+        # credential still refreshes fine, and it's the org-scoped API call
+        # that returns this 403. There is deliberately no
+        # ``credentials.TokenRefreshError`` counterpart here.
+        text = _ORGANIZATION_DEACTIVATED_MESSAGE
     else:
         text = str(value)
     # A legacy UUID-prefix ambiguity is the one named compatibility exception
@@ -5729,9 +5748,21 @@ def _friendly_asset_error(exc: AssetApiHTTPError) -> str:
     The server's message leads (it already speaks user language); the quota
     case appends the catalog's required "two ways out" (delete or
     upgrade). Unrecognized codes render as the standard ``code: message``.
-    Every matched code is a shared interfaces constant, so a control-plane rename cannot
-    silently degrade this copy by drifting from a hand-typed literal here.
+    Every matched ``ASSET_*`` code is a shared interfaces constant, so a
+    control-plane rename cannot silently degrade this copy by drifting from a
+    hand-typed literal here. ``account_suspended`` and
+    ``organization_deactivated`` are the two exceptions: they are account/org
+    states, not asset-catalog concepts, so they have no shared constant here
+    either (``_safe_cli_error_text`` matches them the same way) — every asset
+    command reaches ``AssetApiHTTPError`` instead of ``http.HttpHTTPError``
+    (see ``asset_api._translate``), so it cannot share that function's
+    isinstance-gated branches and needs its own. Render the identical
+    hand-worded message either function would produce, not the raw code.
     """
+    if exc.code == "account_suspended":
+        return _ACCOUNT_SUSPENDED_MESSAGE
+    if exc.code == "organization_deactivated":
+        return _ORGANIZATION_DEACTIVATED_MESSAGE
     if exc.code == ASSET_STORAGE_QUOTA_EXCEEDED_CODE:
         return (
             f"{exc.message}\n"

{simulo-0.24.0 → simulo-0.24.1/src/simulo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simulo
-Version: 0.24.0
+Version: 0.24.1
 Summary: Simulo SDK and CLI — define robotics simulation and training apps in Python and run them on the Simulo cloud.
 Author-email: Simulo Team <team@simulo.ai>
 License: BSD-3-Clause