globus-cli 3.28.0__tar.gz → 3.28.2__tar.gz

{globus_cli-3.28.0/src/globus_cli.egg-info → globus_cli-3.28.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: globus-cli
-Version: 3.28.0
+Version: 3.28.2
 Summary: Globus CLI
 Author-email: Stephen Rosen <sirosen@globus.org>
 Project-URL: homepage, https://github.com/globus/globus-cli

{globus_cli-3.28.0 → globus_cli-3.28.2}/pyproject.toml

@@ -120,6 +120,5 @@ module = [
     "globus_cli.services.transfer.recursive_ls",
     "globus_cli.termio",
     "globus_cli.termio.printer",
-    "globus_cli.termio.errors",
     "globus_cli.termio.awscli_text",
 ]

{globus_cli-3.28.0 → globus_cli-3.28.2}/src/globus_cli/exception_handling/hooks.py

@@ -64,7 +64,18 @@ _DEFAULT_CONSENT_REAUTH_MESSAGE = (
 
 @sdk_error_handler(
     error_class="GlobusAPIError",
-    condition=lambda err: outformat_is_json() and err.raw_json is not None,
+    condition=lambda err: err.raw_json is None,
+)
+def null_data_error_handler(exception: globus_sdk.GlobusAPIError) -> None:
+    write_error_info(
+        "GlobusAPINullDataError",
+        [PrintableErrorField("error_type", exception.__class__.__name__)],
+    )
+
+
+@sdk_error_handler(
+    error_class="GlobusAPIError",
+    condition=lambda err: outformat_is_json(),
 )
 def json_error_handler(exception: globus_sdk.GlobusAPIError) -> None:
     click.echo(
@@ -358,14 +369,35 @@ def flows_error_hook(exception: globus_sdk.FlowsAPIError) -> None:
             details = textwrap.fill(details, width=80)
         detail_fields = [PrintableErrorField("detail", details, multiline=True)]
     # if it's a list of objects, wrap them into a multiline detail field
-    else:
-        detail_fields = [
-            PrintableErrorField(
-                "detail",
-                "\n".join(_pretty_json(detail, compact=True) for detail in details),
-                multiline=True,
-            )
-        ]
+    elif isinstance(details, list):
+        num_errors = len(details)
+        if all((isinstance(d, dict) and "loc" in d and "msg" in d) for d in details):
+            detail_strings = [
+                (
+                    ((data["type"] + " ") if "type" in data else "")
+                    + f"{_jsonpath_from_pydantic_loc(data['loc'])}: {data['msg']}"
+                )
+                for data in details
+            ]
+            if num_errors == 1:
+                detail_fields = [PrintableErrorField("detail", detail_strings[0])]
+            else:
+                detail_fields = [
+                    PrintableErrorField("detail", f"{num_errors} errors"),
+                    PrintableErrorField(
+                        "errors",
+                        "\n".join(detail_strings),
+                        multiline=True,
+                    ),
+                ]
+        else:
+            detail_fields = [
+                PrintableErrorField(
+                    "detail",
+                    "\n".join(_pretty_json(detail, compact=True) for detail in details),
+                    multiline=True,
+                )
+            ]
 
     write_error_info(
         "Flows API Error",

{globus_cli-3.28.0 → globus_cli-3.28.2}/src/globus_cli/termio/errors.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 
 import click
@@ -13,17 +15,19 @@ class PrintableErrorField:
 
     TEXT_PREFIX = "Globus CLI Error:"
 
-    def __init__(self, name, value, multiline=False):
+    def __init__(
+        self, name: str, value: str | int | None, multiline: bool = False
+    ) -> None:
         self.multiline = multiline
         self.name = str(name)
         self.raw_value = str(value)
         self.value = self._format_value(self.raw_value)
 
     @property
-    def _text_prefix_len(self):
+    def _text_prefix_len(self) -> int:
         return len(self.TEXT_PREFIX)
 
-    def _format_value(self, val):
+    def _format_value(self, val: str) -> str:
         """
         formats a value to be good for textmode printing
         val must be unicode
@@ -38,10 +42,10 @@ class PrintableErrorField:
         return val
 
 
-def write_error_info(error_name, fields):
+def write_error_info(error_name: str, fields: list[PrintableErrorField]) -> None:
     if outformat_is_json():
         # dictify joined tuple lists and dump to json string
-        click.style(
+        message = click.style(
             json.dumps(
                 dict(
                     [("error_name", error_name)]

{globus_cli-3.28.0 → globus_cli-3.28.2}/src/globus_cli/version.py

@@ -7,7 +7,7 @@ if t.TYPE_CHECKING:
 
 # single source of truth for package version,
 # see https://packaging.python.org/en/latest/single_source_version/
-__version__ = "3.28.0"
+__version__ = "3.28.2"
 
 # app name to send as part of SDK requests
 app_name = f"Globus CLI v{__version__}"

{globus_cli-3.28.0 → globus_cli-3.28.2/src/globus_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: globus-cli
-Version: 3.28.0
+Version: 3.28.2
 Summary: Globus CLI
 Author-email: Stephen Rosen <sirosen@globus.org>
 Project-URL: homepage, https://github.com/globus/globus-cli