systemlink-cli 1.13.11__tar.gz → 1.13.13__tar.gz

{systemlink_cli-1.13.11 → systemlink_cli-1.13.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: systemlink-cli
-Version: 1.13.11
+Version: 1.13.13
 Summary: SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates.
 License-File: LICENSE
 Author: Fred Visser
@@ -18,7 +18,7 @@ Requires-Dist: pygments (>=2.20.0)
 Requires-Dist: pyyaml (>=6.0.3,<7.0.0)
 Requires-Dist: questionary (>=2.1.1,<3.0.0)
 Requires-Dist: requests (>=2.32.4,<3.0.0)
-Requires-Dist: rich (>=13.7,<15)
+Requires-Dist: rich (>=15,<16)
 Requires-Dist: rich-click (>=1.8,<2)
 Requires-Dist: tabulate (>=0.10.0,<0.11.0)
 Requires-Dist: truststore (>=0.9,<0.11)

{systemlink_cli-1.13.11 → systemlink_cli-1.13.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "systemlink-cli"
-version = "1.13.11"
+version = "1.13.13"
 description = "SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates."
 authors = ["Fred Visser <fred.visser@emerson.com>"]
 packages = [{ include = "slcli" }]
@@ -38,7 +38,7 @@ watchdog = "^6.0.0"
 pyyaml = "^6.0.3"
 questionary = "^2.1.1"
 packaging = ">=21.0"
-rich = ">=13.7,<15"
+rich = ">=15,<16"
 rich-click = ">=1.8,<2"
 cryptography = ">=46.0.7"
 pygments = ">=2.20.0"

{systemlink_cli-1.13.11 → systemlink_cli-1.13.13}/slcli/_version.py

@@ -1,4 +1,4 @@
 """Version information for slcli."""
 
 # This file is auto-generated. Do not edit manually.
-__version__ = "1.13.11"
+__version__ = "1.13.13"

{systemlink_cli-1.13.11 → systemlink_cli-1.13.13}/slcli/utils.py

@@ -65,24 +65,79 @@ def check_readonly_mode(operation: str = "this operation") -> None:
         sys.exit(ExitCodes.PERMISSION_DENIED)
 
 
+def _extract_response_error_message(exc: Exception) -> Optional[str]:
+    """Extract a human-readable error message from an HTTP error response body.
+
+    Attempts to parse the response JSON and extract the error message from
+    common SystemLink error formats (e.g., ``{"error": {"message": "..."}}``)
+    or a top-level ``"message"`` field.
+
+    Args:
+        exc: The exception, expected to be a ``requests.HTTPError`` with a response.
+
+    Returns:
+        The extracted message string, or ``None`` if unavailable.
+    """
+    response = getattr(exc, "response", None)
+    if response is None:
+        return None
+    try:
+        body = response.json()
+    except (ValueError, AttributeError):
+        return None
+
+    # SystemLink standard: {"error": {"message": "..."}}
+    error_obj = body.get("error") if isinstance(body, dict) else None
+    if isinstance(error_obj, dict):
+        msg = error_obj.get("message")
+        if msg:
+            return str(msg)
+
+    # Fallback: top-level {"message": "..."}
+    if isinstance(body, dict):
+        msg = body.get("message")
+        if msg:
+            return str(msg)
+
+    return None
+
+
+def _extract_response_status_code(exc: Exception) -> Optional[int]:
+    """Extract the HTTP status code from an exception response, if present."""
+    response = getattr(exc, "response", None)
+    status_code = getattr(response, "status_code", None)
+    return status_code if isinstance(status_code, int) else None
+
+
 def handle_api_error(exc: Exception) -> None:
     """Handle API errors with appropriate exit codes and consistent formatting.
 
+    When the exception originates from an HTTP response that contains a JSON
+    error body, the server-provided message is displayed instead of the generic
+    HTTP status line so that users get actionable feedback.
+
     Args:
         exc: The exception to handle
     """
-    error_msg = str(exc).lower()
-    if "not found" in error_msg:
-        click.echo(f"✗ Resource not found: {exc}", err=True)
+    # Try to get a detailed message from the response body first
+    detail = _extract_response_error_message(exc)
+    display_msg = detail if detail else str(exc)
+    status_code = _extract_response_status_code(exc)
+
+    error_msg = display_msg.lower()
+    if status_code == 404 or "not found" in error_msg:
+        click.echo(f"✗ Resource not found: {display_msg}", err=True)
         sys.exit(ExitCodes.NOT_FOUND)
-    elif "permission" in error_msg or "unauthorized" in error_msg or "forbidden" in error_msg:
-        click.echo(f"✗ Permission denied: {exc}", err=True)
+    elif status_code in (401, 403) or (
+        "permission" in error_msg or "unauthorized" in error_msg or "forbidden" in error_msg
+    ):
+        click.echo(f"✗ Permission denied: {display_msg}", err=True)
         sys.exit(ExitCodes.PERMISSION_DENIED)
     elif "network" in error_msg or "connection" in error_msg:
-        click.echo(f"✗ Network error: {exc}", err=True)
+        click.echo(f"✗ Network error: {display_msg}", err=True)
         sys.exit(ExitCodes.NETWORK_ERROR)
     else:
-        click.echo(f"✗ Error: {exc}", err=True)
+        click.echo(f"✗ Error: {display_msg}", err=True)
         sys.exit(ExitCodes.GENERAL_ERROR)