systemlink-cli 1.13.12__tar.gz → 1.13.14__tar.gz

{systemlink_cli-1.13.12 → systemlink_cli-1.13.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: systemlink-cli
-Version: 1.13.12
+Version: 1.13.14
 Summary: SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates.
 License-File: LICENSE
 Author: Fred Visser

{systemlink_cli-1.13.12 → systemlink_cli-1.13.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "systemlink-cli"
-version = "1.13.12"
+version = "1.13.14"
 description = "SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates."
 authors = ["Fred Visser <fred.visser@emerson.com>"]
 packages = [{ include = "slcli" }]

{systemlink_cli-1.13.12 → systemlink_cli-1.13.14}/slcli/_version.py

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

{systemlink_cli-1.13.12 → systemlink_cli-1.13.14}/slcli/testmonitor_click.py

@@ -219,9 +219,12 @@ def _warn_if_large_dataset(
     product_substitutions: List[Any],
     order_by: Optional[str] = None,
     descending: bool = False,
-) -> None:
+) -> Optional[int]:
     """Check dataset size and warn user if fetching large number of items.
 
+    Returns the total count of matching items, or None if the check failed.
+    Callers can use a zero return value to short-circuit expensive queries.
+
     Args:
         endpoint: API endpoint ("query-products" or "query-results").
         filter_expr: Optional Dynamic LINQ filter expression.
@@ -230,6 +233,9 @@ def _warn_if_large_dataset(
         product_substitutions: Product filter substitutions (for results only).
         order_by: Field to order by (included in count check for consistency).
         descending: Whether results should be in descending order.
+
+    Returns:
+        Total count of matching items, or None if the probe request failed.
     """
     url = f"{_get_testmonitor_base_url()}/{endpoint}"
     payload: Dict[str, Any] = {
@@ -266,9 +272,10 @@ def _warn_if_large_dataset(
                 f"ℹ️  Fetching {total_count} items...",
                 err=True,
             )
+        return total_count
     except Exception:
         # If count check fails, proceed without warning
-        pass
+        return None
 
 
 def _query_all_products(
@@ -1132,8 +1139,9 @@ def register_testmonitor_commands(cli: Any) -> None:
                     )
                     click.echo(json.dumps(summary_stats, indent=2))
                 else:
-                    # Check total count first to warn about large datasets
-                    _warn_if_large_dataset(
+                    # Probe total count: warns for large datasets, short-circuits
+                    # when zero results match (avoids the full paginated query).
+                    total = _warn_if_large_dataset(
                         endpoint="query-results",
                         filter_expr=filter_expr,
                         substitutions=merged_subs,
@@ -1142,15 +1150,19 @@ def register_testmonitor_commands(cli: Any) -> None:
                         order_by=order_by,
                         descending=descending,
                     )
-                    results = _query_all_results(
-                        filter_expr,
-                        merged_subs,
-                        product_filter_expr,
-                        product_subs,
-                        order_by,
-                        descending,
-                        take=take,
-                    )
+
+                    if total == 0:
+                        results: List[Dict[str, Any]] = []
+                    else:
+                        results = _query_all_results(
+                            filter_expr,
+                            merged_subs,
+                            product_filter_expr,
+                            product_subs,
+                            order_by,
+                            descending,
+                            take=take,
+                        )
 
                     mock_resp: Any = FilteredResponse({"results": results})
                     UniversalResponseHandler.handle_list_response(

{systemlink_cli-1.13.12 → systemlink_cli-1.13.14}/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)