globus-cli 3.28.3__tar.gz → 3.29.0__tar.gz

{globus_cli-3.28.3/src/globus_cli.egg-info → globus_cli-3.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: globus-cli
-Version: 3.28.3
+Version: 3.29.0
 Summary: Globus CLI
 Author-email: Stephen Rosen <sirosen@globus.org>
 Project-URL: homepage, https://github.com/globus/globus-cli
@@ -24,14 +24,13 @@ Requires-Dist: jmespath==1.0.1
 Requires-Dist: packaging>=17.0
 Requires-Dist: typing_extensions>=4.0; python_version < "3.11"
 Requires-Dist: requests<3.0.0,>=2.19.1
-Requires-Dist: cryptography>=3.3.1
 Provides-Extra: test
 Requires-Dist: coverage>=7; extra == "test"
 Requires-Dist: pytest>=7; extra == "test"
 Requires-Dist: pytest-xdist<4; extra == "test"
 Requires-Dist: pytest-timeout<3; extra == "test"
 Requires-Dist: click-type-test==0.0.7; python_version >= "3.10" and extra == "test"
-Requires-Dist: responses==0.25.2; extra == "test"
+Requires-Dist: responses==0.25.3; extra == "test"
 Requires-Dist: ruamel.yaml==0.18.6; extra == "test"
 Requires-Dist: setuptools; python_version >= "3.12" and extra == "test"
 

{globus_cli-3.28.3 → globus_cli-3.29.0}/pyproject.toml

@@ -36,7 +36,6 @@ dependencies = [
     # these are dependencies of the SDK, but they are used directly in the CLI
     # declare them here in case the underlying lib ever changes
     "requests>=2.19.1,<3.0.0",
-    "cryptography>=3.3.1",
 ]
 dynamic = ["version"]
 
@@ -50,7 +49,7 @@ test = [
     "pytest-xdist<4",
     "pytest-timeout<3",
     "click-type-test==0.0.7;python_version>='3.10'",
-    "responses==0.25.2",
+    "responses==0.25.3",
     # loading test fixture data
     "ruamel.yaml==0.18.6",
     # Python 3.12 needs setuptools.
@@ -114,9 +113,6 @@ disallow_untyped_defs = false
 disallow_incomplete_defs = false
 module = [
     "globus_cli.services.gcs",
-    "globus_cli.services.transfer.activation",
-    "globus_cli.services.transfer.client",
-    "globus_cli.services.transfer.delegate_proxy",
     "globus_cli.services.transfer.recursive_ls",
     "globus_cli.termio",
     "globus_cli.termio.printer",

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli/commands/collection/list.py

@@ -4,10 +4,12 @@ import typing as t
 import uuid
 
 import click
+from globus_sdk.paging import Paginator
 
 from globus_cli.login_manager import LoginManager
 from globus_cli.parsing import command, endpoint_id_arg
 from globus_cli.termio import Field, display, formatters
+from globus_cli.utils import PagingWrapper
 
 
 class ChoiceSlugified(click.Choice):
@@ -82,6 +84,14 @@ created-by-me:
         "the ID of the Mapped Collection"
     ),
 )
+@click.option(
+    "--limit",
+    default=25,
+    show_default=True,
+    metavar="N",
+    type=click.IntRange(1),
+    help="The maximum number of results to return.",
+)
 @LoginManager.requires_login("auth", "transfer")
 def collection_list(
     login_manager: LoginManager,
@@ -95,6 +105,7 @@ def collection_list(
         ...,
     ],
     mapped_collection_id: uuid.UUID | None,
+    limit: int,
 ) -> None:
     """
     List the Collections on a given Globus Connect Server v5 Endpoint
@@ -109,9 +120,15 @@ def collection_list(
         params["filter"] = ",".join(filters)
     if include_private_policies:
         params["include"] = "private_policies"
-    res = gcs_client.get_collection_list(**params)
+
+    paginator = Paginator.wrap(gcs_client.get_collection_list)
+    paginated_call = paginator(**params)
+    paging_wrapper = PagingWrapper(
+        paginated_call.items(), json_conversion_key="DATA", limit=limit
+    )
+
     display(
-        res,
+        paging_wrapper,
         text_mode=display.TABLE,
         fields=[
             Field("ID", "id"),
@@ -124,4 +141,5 @@ def collection_list(
             Field("Collection Type", "collection_type"),
             Field("Storage Gateway ID", "storage_gateway_id"),
         ],
+        json_converter=paging_wrapper.json_converter,
     )

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli/commands/endpoint/activate.py

@@ -16,7 +16,7 @@ from globus_cli.termio import display
     "--web",
     is_flag=True,
     default=False,
-    help="Use web activation. Mutually exclusive with --myproxy  and --delegate-proxy.",
+    help="Use web activation. Mutually exclusive with --myproxy.",
 )
 @click.option(
     "--no-browser",
@@ -32,7 +32,7 @@ from globus_cli.termio import display
     "--myproxy",
     is_flag=True,
     default=False,
-    help="Use myproxy activation. Mutually exclusive with --web and --delegate-proxy.",
+    help="Use myproxy activation. Mutually exclusive with --web.",
 )
 @click.option(
     "--myproxy-username",
@@ -50,24 +50,6 @@ from globus_cli.termio import display
         "lifetime which it will use if this value is too high"
     ),
 )
-@click.option(
-    "--delegate-proxy",
-    metavar="X.509_PEM_FILE",
-    help=(
-        "Use delegate proxy activation, takes an X.509 "
-        "certificate in pem format as an argument. Mutually "
-        "exclusive with --web and --myproxy."
-    ),
-)
-@click.option(
-    "--proxy-lifetime",
-    type=int,
-    default=None,
-    help=(
-        "Set a lifetime in hours for the proxy generated with "
-        "--delegate-proxy. [default: 12]"
-    ),
-)
 @click.option(
     "--no-autoactivate",
     is_flag=True,
@@ -83,7 +65,7 @@ from globus_cli.termio import display
     default=False,
     help="Force activation even if endpoint is already activated.",
 )
-@mutex_option_group("--web", "--myproxy", "--delegate-proxy")
+@mutex_option_group("--web", "--myproxy")
 @LoginManager.requires_login("transfer")
 def endpoint_activate(
     login_manager: LoginManager,
@@ -95,15 +77,13 @@ def endpoint_activate(
     myproxy_lifetime: int | None,
     web: bool,
     no_browser: bool,
-    delegate_proxy: str | None,
-    proxy_lifetime: int | None,
     no_autoactivate: bool,
     force: bool,
 ) -> None:
     """
     Activate an endpoint using Autoactivation, Myproxy, Delegate Proxy,
     or Web activation.
-    Note that --web, --delegate-proxy, and --myproxy activation are mutually
+    Note that --web and --myproxy activation are mutually
     exclusive options.
 
     \b
@@ -130,28 +110,13 @@ def endpoint_activate(
     prompted to hide your inputs and keep your password out of your
     command history, but you may pass your password with the hidden
     --myproxy-password or -P options.
-
-    \b
-    To use Delegate Proxy activation use the --delegate-proxy option with a
-    file containing an X.509 certificate as an argument (e.g. an X.509
-    gotten from the myproxy-logon command). This certificate must
-    be a valid credential or proxy credential for the user from an identity
-    provider accepted by the endpoint being activated, and the endpoint must be
-    configured with a gridmap that will match the globus user using this
-    command with the local user the certificate was made to. Note if the X.509
-    is valid, but the endpoint does not recognize the identity provider or the
-    user the error will not be detected until the user attempts to perform an
-    operation on the endpoint.
     """
-    from globus_cli.services.transfer import (
-        activation_requirements_help_text,
-        fill_delegate_proxy_activation_requirements,
-    )
+    from globus_cli.services.transfer import activation_requirements_help_text
 
     transfer_client = login_manager.get_transfer_client()
 
     # validate options
-    if no_autoactivate and not (myproxy or web or delegate_proxy):
+    if no_autoactivate and not (myproxy or web):
         raise click.UsageError(
             "--no-autoactivate requires another activation method be given."
         )
@@ -166,8 +131,6 @@ def endpoint_activate(
         raise click.UsageError("--myproxy-lifetime requires --myproxy.")
     if no_browser and not web:
         raise click.UsageError("--no-browser requires --web.")
-    if proxy_lifetime and not delegate_proxy:
-        raise click.UsageError("--proxy-lifetime requires --delegate-proxy.")
 
     # check if endpoint is already activated unless --force
     if not force:
@@ -261,17 +224,5 @@ def endpoint_activate(
             webbrowser.open(url, new=1)
             res = {"message": "Browser opened to web activation page", "url": url}
 
-    # delegate proxy activation
-    elif delegate_proxy:
-        requirements_data = transfer_client.endpoint_get_activation_requirements(
-            endpoint_id
-        ).data
-        filled_requirements_data = fill_delegate_proxy_activation_requirements(
-            requirements_data, delegate_proxy, lifetime_hours=proxy_lifetime or 12
-        )
-        res = transfer_client.endpoint_activate(
-            endpoint_id, requirements_data=filled_requirements_data
-        )
-
     # output
     display(res, text_mode=display.RAW, response_key="message")

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli/commands/login.py

@@ -10,6 +10,7 @@ from globus_sdk.services.flows import SpecificFlowClient
 
 from globus_cli.login_manager import LoginManager, is_client_login
 from globus_cli.parsing import command, no_local_server_option
+from globus_cli.termio import verbosity
 
 _SHARED_EPILOG = """\
 
@@ -184,7 +185,8 @@ def login_command(
 
     # if not forcing, stop if user already logged in
     if not force and manager.is_logged_in():
-        click.echo(_LOGGED_IN_RESPONSE)
+        if verbosity() >= 0:
+            click.echo(_LOGGED_IN_RESPONSE)
         return
 
     manager.run_login_flow(

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli/parsing/command_state.py

@@ -66,6 +66,35 @@ class CommandState:
     def is_verbose(self) -> bool:
         return self.verbosity > 0
 
+    def is_quiet(self) -> bool:
+        return self.verbosity < 0
+
+    def set_verbosity(self, value: int) -> None:
+        # short-circuit if verbosity is already below 0 -- this makes `--quiet` higher
+        # precedence than `--verbose` regardless of the order of application
+        if self.verbosity < 0:
+            return
+
+        self.verbosity = value
+
+        # min verbosity level: never warn, never log normal events
+        # (covers quiet modes, e.g. `--quiet`)
+        if value <= 0:
+            _warnings.simplefilter("ignore")
+            _setup_logging(level="CRITICAL")
+        # verbosity level 1: warn minimally, log errors
+        elif value == 1:
+            _warnings.simplefilter("once")
+            _setup_logging(level="ERROR")
+        # verbosity level 2: warn once per usage, log info
+        elif value == 2:
+            _warnings.simplefilter("default")
+            _setup_logging(level="INFO")
+        # verbosity level 3+: warn always, log debug
+        elif value >= 3:
+            _warnings.simplefilter("always")
+            _setup_logging(level="DEBUG")
+
 
 def format_option(f: F) -> F:
     def callback(ctx: click.Context, param: click.Parameter, value: t.Any) -> None:
@@ -118,16 +147,13 @@ def format_option(f: F) -> F:
 
 
 def debug_option(f: F) -> F:
-    def callback(ctx: click.Context, param: click.Parameter, value: t.Any) -> None:
-        if not value or ctx.resilient_parsing:
-            # turn off warnings altogether
-            _warnings.simplefilter("ignore")
+    def callback(ctx: click.Context, param: click.Parameter, value: bool) -> None:
+        if not value:
             return
 
-        _warnings.simplefilter("default")
         state = ctx.ensure_object(CommandState)
+        state.set_verbosity(max(state.verbosity, 3))
         state.debug = True
-        _setup_logging(level="DEBUG")
 
     return click.option(
         "--debug",
@@ -140,48 +166,41 @@ def debug_option(f: F) -> F:
 
 
 def verbose_option(f: F) -> F:
-    def callback(ctx: click.Context, param: click.Parameter, value: t.Any) -> None:
+    def callback(ctx: click.Context, param: click.Parameter, value: int) -> None:
         # set state verbosity value from option
         state = ctx.ensure_object(CommandState)
-        state.verbosity = value
+        state.set_verbosity(state.verbosity + value)
 
-        # no verbosity
-        # all warnings are ignored
-        # logging is not turned on
-        if value == 0:
-            _warnings.simplefilter("ignore")
+    return click.option(
+        "--verbose",
+        "-v",
+        count=True,
+        expose_value=False,
+        callback=callback,
+        is_eager=True,
+        help="Control level of output, make it more verbose.",
+    )(f)
 
-        # verbosity level 1
-        # warnings set to once
-        # logging set to error
-        if value == 1:
-            _warnings.simplefilter("once")
-            _setup_logging(level="ERROR")
 
-        # verbosity level 2
-        # warnings set to default
-        # logging set to info
-        if value == 2:
-            _warnings.simplefilter("default")
-            _setup_logging(level="INFO")
+def quiet_option(f: F) -> F:
+    def callback(ctx: click.Context, param: click.Parameter, value: bool) -> None:
+        if not value:
+            return
 
-        # verbosity level 3+
-        # warnings set to always
-        # logging set to debug
-        # sets debug flag to true
-        if value >= 3:
-            _warnings.simplefilter("always")
-            state.debug = True
-            _setup_logging(level="DEBUG")
+        # set state verbosity value from option
+        state = ctx.ensure_object(CommandState)
+        state.set_verbosity(-1)
 
     return click.option(
-        "--verbose",
-        "-v",
-        count=True,
+        "--quiet",
         expose_value=False,
         callback=callback,
+        is_flag=True,
         is_eager=True,
-        help="Control level of output.",
+        help=(
+            "Suppress non-essential output. "
+            "This is higher precedence than `--verbose`."
+        ),
     )(f)
 
 

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli/parsing/param_types/json_strorfile.py

@@ -11,6 +11,9 @@ import click
 from globus_cli.constants import EXPLICIT_NULL, ExplicitNullType
 from globus_cli.types import JsonValue
 
+if t.TYPE_CHECKING:
+    from click.shell_completion import CompletionItem
+
 
 @dataclasses.dataclass
 class ParsedJSONData:
@@ -57,6 +60,13 @@ class JSONStringOrFile(click.ParamType):
     def get_metavar(self, param: click.Parameter) -> str:
         return "[JSON_FILE|JSON|file:JSON_FILE]"
 
+    def shell_complete(
+        self, ctx: click.Context, param: click.Parameter, incomplete: str
+    ) -> list[CompletionItem]:
+        from click.shell_completion import CompletionItem
+
+        return [CompletionItem(incomplete, type="file")]
+
     def get_type_annotation(self, param: click.Parameter) -> type:
         if self.null is not None:
             return t.cast(type, t.Union[ParsedJSONData, ExplicitNullType])

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli/parsing/shared_options/__init__.py

@@ -11,6 +11,7 @@ from globus_cli.parsing.command_state import (
     debug_option,
     format_option,
     map_http_status_option,
+    quiet_option,
     show_server_timing_option,
     verbose_option,
 )
@@ -46,6 +47,7 @@ def common_options(*, disable_options: list[str] | None = None) -> t.Callable[[C
         f = debug_option(f)
         f = show_server_timing_option(f)
         f = verbose_option(f)
+        f = quiet_option(f)
         f = click.help_option("-h", "--help")(f)
 
         # if the format option is being allowed, it needs to be applied to `f`

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli/services/transfer/__init__.py

@@ -10,7 +10,6 @@ from .data import (
     display_name_or_cname,
     iterable_response_to_dict,
 )
-from .delegate_proxy import fill_delegate_proxy_activation_requirements
 from .recursive_ls import RecursiveLsResponse
 
 
@@ -34,7 +33,6 @@ __all__ = (
     "RecursiveLsResponse",
     "supported_activation_methods",
     "activation_requirements_help_text",
-    "fill_delegate_proxy_activation_requirements",
     "display_name_or_cname",
     "iterable_response_to_dict",
     "assemble_generic_doc",

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli/services/transfer/activation.py

@@ -1,4 +1,13 @@
-def supported_activation_methods(res):
+from __future__ import annotations
+
+import uuid
+
+import globus_sdk
+
+
+def supported_activation_methods(
+    res: globus_sdk.GlobusHTTPResponse,
+) -> list[str]:
     """
     Given an activation_requirements document
     returns a list of activation methods supported by this endpoint.
@@ -18,14 +27,12 @@ def supported_activation_methods(res):
         ):
             supported.append("myproxy")
 
-        # delegate_proxy
-        if req["type"] == "delegate_proxy" and req["name"] == "public_key":
-            supported.append("delegate_proxy")
-
     return supported
 
 
-def activation_requirements_help_text(res, ep_id):
+def activation_requirements_help_text(
+    res: globus_sdk.GlobusHTTPResponse, ep_id: str | uuid.UUID
+) -> str:
     """
     Given an activation requirements document and an endpoint_id
     returns a string of help text for how to activate the endpoint
@@ -54,20 +61,6 @@ def activation_requirements_help_text(res, ep_id):
             if "oauth" in methods
             else ""
         ),
-        (
-            "For delegate proxy activation use:\n"
-            "'globus endpoint activate --delegate-proxy "
-            "X.509_PEM_FILE {}'\n".format(ep_id)
-            if "delegate_proxy" in methods
-            else ""
-        ),
-        (
-            "Delegate proxy activation requires an additional dependency on "
-            "cryptography. See the docs for details:\n"
-            "https://docs.globus.org/cli/reference/endpoint_activate/\n"
-            if "delegate_proxy" in methods
-            else ""
-        ),
     ]
 
     return "".join(lines)

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli/services/transfer/client.py

@@ -44,8 +44,13 @@ def _retry_client_consent(ctx: RetryContext) -> RetryCheckResult:
 
 
 class CustomTransferClient(globus_sdk.TransferClient):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self,
+        *,
+        authorizer: globus_sdk.GlobusAuthorizer,
+        app_name: str,
+    ) -> None:
+        super().__init__(authorizer=authorizer, app_name=app_name)
         self.transport.register_retry_check(_retry_client_consent)
 
     # TODO: Remove this function when endpoints natively support recursive ls
@@ -78,7 +83,7 @@ class CustomTransferClient(globus_sdk.TransferClient):
         return RecursiveLsResponse(self, endpoint_id, params, max_depth=depth)
 
     def get_endpoint_w_server_list(
-        self, endpoint_id
+        self, endpoint_id: str | uuid.UUID
     ) -> tuple[
         globus_sdk.GlobusHTTPResponse, str | globus_sdk.IterableTransferResponse
     ]:

{globus_cli-3.28.3 → globus_cli-3.29.0}/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.3"
+__version__ = "3.29.0"
 
 # app name to send as part of SDK requests
 app_name = f"Globus CLI v{__version__}"

{globus_cli-3.28.3 → globus_cli-3.29.0/src/globus_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: globus-cli
-Version: 3.28.3
+Version: 3.29.0
 Summary: Globus CLI
 Author-email: Stephen Rosen <sirosen@globus.org>
 Project-URL: homepage, https://github.com/globus/globus-cli
@@ -24,14 +24,13 @@ Requires-Dist: jmespath==1.0.1
 Requires-Dist: packaging>=17.0
 Requires-Dist: typing_extensions>=4.0; python_version < "3.11"
 Requires-Dist: requests<3.0.0,>=2.19.1
-Requires-Dist: cryptography>=3.3.1
 Provides-Extra: test
 Requires-Dist: coverage>=7; extra == "test"
 Requires-Dist: pytest>=7; extra == "test"
 Requires-Dist: pytest-xdist<4; extra == "test"
 Requires-Dist: pytest-timeout<3; extra == "test"
 Requires-Dist: click-type-test==0.0.7; python_version >= "3.10" and extra == "test"
-Requires-Dist: responses==0.25.2; extra == "test"
+Requires-Dist: responses==0.25.3; extra == "test"
 Requires-Dist: ruamel.yaml==0.18.6; extra == "test"
 Requires-Dist: setuptools; python_version >= "3.12" and extra == "test"
 

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli.egg-info/SOURCES.txt

@@ -248,7 +248,6 @@ src/globus_cli/services/transfer/__init__.py
 src/globus_cli/services/transfer/activation.py
 src/globus_cli/services/transfer/client.py
 src/globus_cli/services/transfer/data.py
-src/globus_cli/services/transfer/delegate_proxy.py
 src/globus_cli/services/transfer/recursive_ls.py
 src/globus_cli/termio/__init__.py
 src/globus_cli/termio/awscli_text.py

{globus_cli-3.28.3 → globus_cli-3.29.0}/src/globus_cli.egg-info/requires.txt

@@ -3,7 +3,6 @@ click<9,>=8.1.4
 jmespath==1.0.1
 packaging>=17.0
 requests<3.0.0,>=2.19.1
-cryptography>=3.3.1
 
 [:python_version < "3.11"]
 typing_extensions>=4.0
@@ -13,7 +12,7 @@ coverage>=7
 pytest>=7
 pytest-xdist<4
 pytest-timeout<3
-responses==0.25.2
+responses==0.25.3
 ruamel.yaml==0.18.6
 
 [test:python_version >= "3.10"]