rucio 38.2.0__tar.gz → 38.4.0__tar.gz

{rucio-38.2.0 → rucio-38.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio
-Version: 38.2.0
+Version: 38.4.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-38.2.0 → rucio-38.4.0}/lib/rucio/cli/bin_legacy/rucio.py

@@ -449,7 +449,6 @@ def list_dids(args, client, logger, console, spinner):
     """
 
     filters = {}
-    type_ = 'collection'
     table_data = []
 
     try:
@@ -482,19 +481,17 @@ def list_dids(args, client, logger, console, spinner):
         else:
             table_data.append([f"{did['scope']}:{did['name']}", did['did_type']])
 
-    if cli_config == 'rich':
-        if args.short:
-            table = generate_table([[did] for did, _ in table_data], headers=['SCOPE:NAME'], col_alignments=['left'])
-        else:
-            table = generate_table(table_data, headers=['SCOPE:NAME', '[DID TYPE]'], col_alignments=['left', 'left'])
-        spinner.stop()
-        print_output(table, console=console, no_pager=args.no_pager)
+    if args.short:
+        for did, _ in table_data:
+            print(did)
     else:
-        if args.short:
-            for did, _ in table_data:
-                print(did)
+        if cli_config == 'rich':
+            table = generate_table(table_data, headers=['SCOPE:NAME', '[DID TYPE]'], col_alignments=['left', 'left'])
+            spinner.stop()
+            print_output(table, console=console, no_pager=args.no_pager)
         else:
             print(tabulate(table_data, tablefmt=tablefmt, headers=['SCOPE:NAME', '[DID TYPE]']))
+
     return SUCCESS
 
 
@@ -657,19 +654,17 @@ def list_content(args, client, logger, console, spinner):
             else:
                 table_data.append([f"{content['scope']}:{content['name']}", content['type'].upper()])
 
-    if cli_config == 'rich':
-        if args.short:
-            table = generate_table([[did] for did, _ in table_data], headers=['SCOPE:NAME'], col_alignments=['left'])
-        else:
-            table = generate_table(table_data, headers=['SCOPE:NAME', '[DID TYPE]'], col_alignments=['left', 'left'])
-        spinner.stop()
-        print_output(table, console=console, no_pager=args.no_pager)
+    if args.short:
+        for did, dummy in table_data:
+            print(did)
     else:
-        if args.short:
-            for did, dummy in table_data:
-                print(did)
+        if cli_config == 'rich':
+            table = generate_table(table_data, headers=['SCOPE:NAME', '[DID TYPE]'], col_alignments=['left', 'left'])
+            spinner.stop()
+            print_output(table, console=console, no_pager=args.no_pager)
         else:
             print(tabulate(table_data, tablefmt=tablefmt, headers=['SCOPE:NAME', '[DID TYPE]']))
+
     return SUCCESS
 
 
@@ -1011,6 +1006,8 @@ def download(args, client, logger, console, spinner):
         items = []
         if args.dids:
             for did in args.dids:
+                if args.scope:
+                    did = f"{args.scope}:{did}"
                 item = {'did': did}
                 item.update(item_defaults)
                 items.append(item)
@@ -1043,9 +1040,15 @@ def download(args, client, logger, console, spinner):
         item_defaults['did'] = did_str
         if args.rses is None:
             logger.warning("No RSE was given, selecting one.")
+            if not args.scope:
+                scope = did_str.split(':')[0]
+                did = did_str.split(':')[-1]
+            else:
+                scope = args.scope
+                did = did_str.split(':')[-1]
 
             replicas = client.list_replicas(
-                [{"scope": did_str.split(':')[0], "name": did_str.split(':')[-1]}],
+                [{"scope": scope, "name": did}],
                 schemes=args.protocol,
                 ignore_availability=False,
                 client_location=detect_client_location(),
@@ -2473,7 +2476,7 @@ You can filter by key/value, e.g.::
         selected_parser.add_argument('--trace_taskid', '--trace-taskid', new_option_string='--trace-taskid', dest='trace_taskid', action=StoreAndDeprecateWarningAction, default=os.environ.get('RUCIO_TRACE_TASKID', None), help=argparse.SUPPRESS)
         selected_parser.add_argument('--trace_usrdn', '--trace-usrdn', new_option_string='--trace-usrdn', dest='trace_usrdn', action=StoreAndDeprecateWarningAction, default=os.environ.get('RUCIO_TRACE_USRDN', None), help=argparse.SUPPRESS)
         selected_parser.add_argument('--filter', dest='filter', action='store', help='Filter files by key-value pairs like guid=2e2232aafac8324db452070304f8d745.')
-        selected_parser.add_argument('--scope', dest='scope', action='store', help='Scope if you are using the filter option and no full DID.')
+        selected_parser.add_argument('--scope', dest='scope', action='store', help='Scope to use as a filter or to use with DID names.')
         selected_parser.add_argument('--metalink', dest='metalink_file', action='store', help='Path to a metalink file.')
         selected_parser.add_argument('--deactivate-file-download-exceptions', dest='deactivate_file_download_exceptions', action='store_true', help='Does not raise NoFilesDownloaded, NotAllFilesDownloaded or incorrect number of output queue files Exception.')  # NOQA: E501
         selected_parser.add_argument('--replica-selection', dest='sort', action='store', help='Select the best replica using a replica sorting algorithm provided by replica sorter (e.g., random, geoip).')

{rucio-38.2.0 → rucio-38.4.0}/lib/rucio/cli/command.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 import importlib
 import signal
+import sys
 import time
 
 import click
@@ -61,6 +62,16 @@ class LazyGroup(click.Group):
             raise ValueError(f"Lazy loading of {import_path} failed by returning " "a non-command object")
         return cmd_object
 
+    @exception_handler
+    def _invoke_with_handler(self, ctx: click.Context):
+        return super().invoke(ctx)
+
+    def invoke(self, ctx: click.Context):
+        result = self._invoke_with_handler(ctx)
+        if result not in (None, 0):
+            sys.exit(1 if result != 2 else 2)
+        return result
+
 
 @click.group(
     cls=LazyGroup,
@@ -87,7 +98,7 @@ class LazyGroup(click.Group):
 @click.option("--ca-certificate", help="CA certificate to verify peer against (SSL)")
 @click.option("--certificate", help="Client certificate file")
 @click.option("--client-key", help="Client key for x509 Authentication")
-@click.option("--config", help="The Rucio configuration file to use")
+@click.option("--config", help="The Rucio configuration file to use", envvar="RUCIO_CONFIG")
 @click.option("-H", "--host", help="The Rucio API host")
 # oidc auth
 @click.option("--oidc-user", help="OIDC username")
@@ -146,33 +157,32 @@ class LazyGroup(click.Group):
 @click.version_option(version.version_string(), message="%(prog)s %(version)s")
 # Hidden options at the end
 @click.option("--no-pager", is_flag=True, default=False, hidden=True)
-@exception_handler
 @click.pass_context
 def main(
-    ctx,
-    config,
-    verbose,
-    host,
-    auth_host,
-    issuer,
-    auth_strategy,
-    timeout,
-    user_agent,
-    vo,
-    no_pager,
-    user,
-    password,
-    oidc_user,
-    oidc_password,
-    oidc_scope,
-    oidc_audience,
-    oidc_auto,
-    oidc_polling,
-    oidc_refresh_lifetime,
-    oidc_issuer,
-    certificate,
-    client_key,
-    ca_certificate,
+    ctx: click.Context,
+    config: str,
+    verbose: bool,
+    host: str,
+    auth_host: str,
+    issuer: str,
+    auth_strategy: str,
+    timeout: float,
+    user_agent: str,
+    vo: str,
+    no_pager: bool,
+    user: str,
+    password: str,
+    oidc_user: str,
+    oidc_password: str,
+    oidc_scope: str,
+    oidc_audience: str,
+    oidc_auto: str,
+    oidc_polling: str,
+    oidc_refresh_lifetime: str,
+    oidc_issuer: str,
+    certificate: str,
+    client_key: str,
+    ca_certificate: str,
 ):
     ctx.ensure_object(Arguments)
     ctx.obj.start_time = time.time()

{rucio-38.2.0 → rucio-38.4.0}/lib/rucio/cli/config.py

@@ -27,18 +27,17 @@ def config():
 @click.option("-s", "--section", help="Filter by sections")
 @click.option("-k", "--key", help="Show key's value, section required.")
 @click.pass_context
-def list_(ctx, section, key):
+def list_(ctx: click.Context, section: str, key: str):
     """List the sections or content of sections in the rucio.cfg"""
     get_config(Arguments({"no_pager": ctx.obj.no_pager, "section": section, "key": key}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
 
 
-# TODO Change to only add new fields and cannot modify an existing field
 @config.command("add")
 @click.option("-s", "--section", help="Section name", required=True)
 @click.option('--key', help='Attribute key', required=True)
 @click.option('--value', help='Attribute value', required=True)
 @click.pass_context
-def add_(ctx, section, key, value):
+def add_(ctx: click.Context, section: str, key: str, value: str):
     """
     Add a new key/value to a section.
 
@@ -46,6 +45,12 @@ def add_(ctx, section, key, value):
     Example, Add a key to an existing section:
         $ rucio config add --section my-section --key key --value value
     """
+    has_option = ctx.obj.client.get_config().get(section, {}).get(key) is not None
+    if has_option:
+        msg = f"Config already has field {section}: {key}, please use \n\
+            rucio config update --section {section} --key {key} --value {value}"
+        raise ValueError(msg)
+
     args = Arguments({"no_pager": ctx.obj.no_pager, "section": section, "option": key, "value": value})
     set_config_option(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
 
@@ -54,7 +59,7 @@ def add_(ctx, section, key, value):
 @click.option("-s", "--section", help="Section", required=True)
 @click.option("-k", "--key", help="Key in section", required=True)
 @click.pass_context
-def remove(ctx, section, key):
+def remove(ctx: click.Context, section: str, key: str):
     """Remove the section.key from the config."""
     args = Arguments({"no_pager": ctx.obj.no_pager, "section": section, "option": key})
     delete_config_option(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
@@ -66,7 +71,17 @@ def show(ctx):
     """Show a single sections options"""
 
 
-# TODO Change this so that it only modifies existing fields
-def update():
+@config.command("update")
+@click.option("-s", "--section", required=True)
+@click.option("-k", "--key", help='Attribute key', required=True)
+@click.option("-v", "--value", help='Attribute value', required=True)
+@click.pass_context
+def update(ctx: click.Context, section: str, key: str, value: str):
     """Modify an existing command"""
-    pass
+    has_option = ctx.obj.client.get_config().get(section, {}).get(key) is not None
+    if has_option:
+        ctx.obj.client.set_config_option(section, key, value)
+    else:
+        msg = f"{section} {key} not present. Please use \n\
+            rucio config add --section {section} --key {key} --value {value}"
+        raise ValueError(msg)

{rucio-38.2.0 → rucio-38.4.0}/lib/rucio/cli/did.py

@@ -34,8 +34,8 @@ def did():
     are used: ";" represents the logical OR operator; "," represents the logical AND operator',
     """,
 )  # TODO Shorten this help and make supplying this easier
-@click.option("--short", is_flag=True, default=False, help="Dump the list of DIDs")
-@click.argument("did-pattern", nargs=-1)
+@click.option("--short", is_flag=True, default=False, help="Just dump the list of DIDs.")
+@click.argument("did-pattern", nargs=-1, required=True)
 @click.option("--parent", default=False, is_flag=True, help="List the parents of the DID - must use a full DID scope and name")
 @click.pass_context
 def list_(ctx, did_pattern, recursive, filter_, short, parent):

{rucio-38.2.0 → rucio-38.4.0}/lib/rucio/cli/download.py

@@ -52,7 +52,7 @@ from rucio.common.config import config_get_float
 @click.option("--trace-taskid", default=os.environ.get("RUCIO_TRACE_TASKID", None), hidden=True)
 @click.option("--trace-usrdn", default=os.environ.get("RUCIO_TRACE_USRDN", None), hidden=True)
 @click.option("--filter", help="Filter files by key-value pairs like guid=2e2232aafac8324db452070304f8d745.")
-@click.option("--scope", help="Scope if you are using the filter option and no full DID.")
+@click.option("--scope", help="Scope to use as a filter or to use with DID names.")
 @click.option("--metalink", help="Path to a metalink file.")
 @click.option("--no-show-download-exceptions", default=False, is_flag=True, help="Does not raise NoFilesDownloaded, NotAllFilesDownloaded or incorrect number of output queue files Exception.")  # NOQA: E501
 @click.option("--replica-selection", help="Select the best replica using a replica sorting algorithm provided by replica sorter (e.g., random, geoip).")

{rucio-38.2.0 → rucio-38.4.0}/lib/rucio/cli/opendata.py

@@ -16,8 +16,11 @@ import json
 from typing import TYPE_CHECKING, Optional
 
 import click
+from rich.text import Text
+from tabulate import tabulate
 
 from rucio.cli.utils import JSONType
+from rucio.client.richclient import CLITheme, generate_table, get_cli_config, print_output
 from rucio.common.constants import OPENDATA_DID_STATE_LITERAL_LIST
 from rucio.common.utils import extract_scope
 
@@ -26,6 +29,8 @@ if TYPE_CHECKING:
 
     from rucio.common.constants import OPENDATA_DID_STATE_LITERAL
 
+cli_config = get_cli_config()
+
 
 def is_valid_json(s: str) -> bool:
     try:
@@ -50,15 +55,42 @@ def opendata_did() -> None:
               help="Filter on Opendata state")
 @click.option("--public", required=False, is_flag=True, default=False,
               help="Perform request against the public endpoint")
+@click.option("--short", is_flag=True, default=False, help="Dump the list of Opendata DIDs")
 @click.pass_context
-def list_opendata_dids(ctx: "Context", state: Optional["OPENDATA_DID_STATE_LITERAL"], public: bool) -> None:
+def list_opendata_dids(ctx: "Context", state: Optional["OPENDATA_DID_STATE_LITERAL"], public: bool,
+                       short: bool) -> None:
     """
     List Opendata DIDs, optionally filtered by state and public/private access
     """
 
     client = ctx.obj.client
-    result = client.list_opendata_dids(state=state, public=public)
-    print(json.dumps(result, indent=4, sort_keys=True, ensure_ascii=False))
+    spinner = ctx.obj.spinner
+
+    dids_list = client.list_opendata_dids(state=state, public=public)
+
+    table_data = []
+
+    if cli_config == 'rich':
+        spinner.update(status='Fetching Opendata DIDs')
+        spinner.start()
+
+    for did in dids_list["dids"]:
+        if cli_config == 'rich':
+            table_data.append([f"{did['scope']}:{did['name']}",
+                               Text(did['state'], style=CLITheme.OPENDATA_DID_STATE.get(did['state'], 'default'))])
+        else:
+            table_data.append([f"{did['scope']}:{did['name']}", did['state']])
+
+    if short:
+        for did, _ in table_data:
+            print(did)
+    else:
+        if cli_config == 'rich':
+            table = generate_table(table_data, headers=['SCOPE:NAME', '[STATE]'], col_alignments=['left', 'left'])
+            spinner.stop()
+            print_output(table, console=ctx.obj.console, no_pager=ctx.obj.no_pager)
+        else:
+            print(tabulate(table_data, tablefmt="psql", headers=['SCOPE:NAME', '[STATE]']))
 
 
 @opendata_did.command("add")
@@ -101,12 +133,31 @@ def get_opendata_did(ctx: "Context", did: str, files: bool, meta: bool, public:
     """
 
     client = ctx.obj.client
+    spinner = ctx.obj.spinner
+    console = ctx.obj.console
+
     scope, name = extract_scope(did)
-    result = client.get_opendata_did(scope=scope, name=name, public=public,
-                                     include_files=files, include_metadata=meta,
-                                     include_doi=True)
-    # TODO: pretty print using tables, etc
-    print(json.dumps(result, indent=4, sort_keys=True, ensure_ascii=False))
+    info = client.get_opendata_did(scope=scope, name=name, public=public,
+                                   include_files=files, include_metadata=meta,
+                                   include_doi=True)
+
+    output = []
+    if cli_config == 'rich':
+        spinner.update(status='Fetching Opendata DID stats')
+        spinner.start()
+        keyword_styles = {**CLITheme.BOOLEAN, **CLITheme.OPENDATA_DID_STATE}
+
+        table_data = [(k, Text(str(v), style=keyword_styles.get(str(v), 'default'))) for (k, v) in
+                      sorted(info.items())]
+        table = generate_table(table_data, row_styles=['none'], col_alignments=['left', 'left'])
+        output.append(table)
+    else:
+        table = [(k + ':', str(v)) for (k, v) in sorted(info.items())]
+        print(tabulate(table, tablefmt='plain', disable_numparse=True))
+
+    if cli_config == 'rich':
+        spinner.stop()
+        print_output(*output, console=console, no_pager=ctx.obj.no_pager)
 
 
 @opendata_did.command("update")
@@ -124,9 +175,26 @@ def update_opendata_did(ctx: "Context", did: str, meta: Optional[str],
     Update an existing Opendata DID in the Opendata catalog.
     """
 
-    client = ctx.obj.client
     if not any([meta, state, doi]):
         raise ValueError("At least one of --meta, --state, or --doi must be provided.")
 
+    client = ctx.obj.client
+    spinner = ctx.obj.spinner
+    console = ctx.obj.console
+
     scope, name = extract_scope(did)
-    client.update_opendata_did(scope=scope, name=name, meta=meta, state=state, doi=doi)
+    info = client.update_opendata_did(scope=scope, name=name, meta=meta, state=state, doi=doi)
+
+    if cli_config == 'rich':
+        spinner.update(status='Fetching Opendata DID stats')
+        spinner.start()
+        keyword_styles = {**CLITheme.BOOLEAN, **CLITheme.OPENDATA_DID_STATE}
+
+        table_data = [(k, Text(str(v), style=keyword_styles.get(str(v), 'default'))) for (k, v) in
+                      sorted(info.items())]
+        table = generate_table(table_data, row_styles=['none'], col_alignments=['left', 'left'])
+        spinner.stop()
+        print_output(table, console=console, no_pager=ctx.obj.no_pager)
+    else:
+        table = [(k + ':', str(v)) for (k, v) in sorted(info.items())]
+        print(tabulate(table, tablefmt='plain', disable_numparse=True))

{rucio-38.2.0 → rucio-38.4.0}/lib/rucio/cli/utils.py

@@ -57,7 +57,19 @@ def exception_handler(function):
     def new_funct(*args, **kwargs):
         try:
             return function(*args, **kwargs)
-        except InputValidationError as error:
+        except click.exceptions.Exit as error:
+            # Exit is evoked every time click ends a program without running anything
+            # This error is raised when the help menu is called
+            logger.debug("Exited click context")
+            if ("-h" not in sys.argv) or ("--help" not in sys.argv):
+                return error.exit_code
+            return SUCCESS
+        except click.MissingParameter as error:
+            error.show()
+            msg = f"{error}. Please check the command help (-h/--help)."
+            logger.error(msg)
+            return 2  # Always return an error 2 for an incorrect specification
+        except (InputValidationError, click.exceptions.UsageError) as error:
             logger.error(error)
             logger.debug("This means that one you provided an invalid combination of parameters, or incorrect types. Please check the command help (-h/--help).")
             return FAILURE

{rucio-38.2.0 → rucio-38.4.0}/lib/rucio/client/accountclient.py

@@ -19,6 +19,7 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 if TYPE_CHECKING:
@@ -59,7 +60,7 @@ class AccountClient(BaseClient):
         path = '/'.join([self.ACCOUNTS_BASEURL, account])
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url, type_='POST', data=data)
+        res = self._send_request(url, method=HTTPMethod.POST, data=data)
         if res.status_code == codes.created:
             return True
         exc_cls, exc_msg = self._get_exception(headers=res.headers, status_code=res.status_code, data=res.content)
@@ -88,7 +89,7 @@ class AccountClient(BaseClient):
         path = '/'.join([self.ACCOUNTS_BASEURL, account])
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url, type_='DEL')
+        res = self._send_request(url, method=HTTPMethod.DELETE)
 
         if res.status_code == codes.ok:
             return True
@@ -118,7 +119,7 @@ class AccountClient(BaseClient):
         path = '/'.join([self.ACCOUNTS_BASEURL, account])
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url)
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             acc = self._load_json_data(res)
             return next(acc)
@@ -152,7 +153,7 @@ class AccountClient(BaseClient):
         path = '/'.join([self.ACCOUNTS_BASEURL, account])
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url, type_='PUT', data=data)
+        res = self._send_request(url, method=HTTPMethod.PUT, data=data)
 
         if res.status_code == codes.ok:
             return True
@@ -199,7 +200,7 @@ class AccountClient(BaseClient):
             for key in filters:
                 params[key] = filters[key]
 
-        res = self._send_request(url, params=params)
+        res = self._send_request(url, method=HTTPMethod.GET, params=params)
 
         if res.status_code == codes.ok:
             accounts = self._load_json_data(res)
@@ -263,7 +264,7 @@ class AccountClient(BaseClient):
 
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url, type_='POST', data=data)
+        res = self._send_request(url, method=HTTPMethod.POST, data=data)
 
         if res.status_code == codes.created:
             return True
@@ -300,7 +301,7 @@ class AccountClient(BaseClient):
 
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url, type_='DEL', data=data)
+        res = self._send_request(url, method=HTTPMethod.DELETE, data=data)
 
         if res.status_code == codes.ok:
             return True
@@ -319,7 +320,7 @@ class AccountClient(BaseClient):
         """
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'identities'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url)
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             identities = self._load_json_data(res)
             return identities
@@ -340,7 +341,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'rules'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return self._load_json_data(res)
         else:
@@ -385,7 +386,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'limits', 'global', quote_plus(rse_expression)])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return next(self._load_json_data(res))
         exc_cls, exc_msg = self._get_exception(headers=res.headers, status_code=res.status_code, data=res.content)
@@ -403,7 +404,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'limits', 'global'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return next(self._load_json_data(res))
         exc_cls, exc_msg = self._get_exception(headers=res.headers, status_code=res.status_code, data=res.content)
@@ -421,7 +422,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'limits', 'local'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return next(self._load_json_data(res))
         exc_cls, exc_msg = self._get_exception(headers=res.headers, status_code=res.status_code, data=res.content)
@@ -441,7 +442,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'limits', 'local', rse])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return next(self._load_json_data(res))
         exc_cls, exc_msg = self._get_exception(headers=res.headers, status_code=res.status_code, data=res.content)
@@ -463,7 +464,7 @@ class AccountClient(BaseClient):
         else:
             path = '/'.join([self.ACCOUNTS_BASEURL, account, 'usage', 'local'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return self._load_json_data(res)
         else:
@@ -486,7 +487,7 @@ class AccountClient(BaseClient):
         else:
             path = '/'.join([self.ACCOUNTS_BASEURL, account, 'usage', 'global'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return self._load_json_data(res)
         else:
@@ -506,7 +507,7 @@ class AccountClient(BaseClient):
         """
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'usage/history', rse])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return next(self._load_json_data(res))
         else:
@@ -524,7 +525,7 @@ class AccountClient(BaseClient):
         """
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'attr/'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return self._load_json_data(res)
         else:
@@ -548,7 +549,7 @@ class AccountClient(BaseClient):
         data = dumps({'key': key, 'value': value})
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'attr', key])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='POST', data=data)
+        res = self._send_request(url, method=HTTPMethod.POST, data=data)
         if res.status_code == codes.created:
             return True
         else:
@@ -569,7 +570,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'attr', key])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='DEL', data=None)
+        res = self._send_request(url, method=HTTPMethod.DELETE, data=None)
         if res.status_code == codes.ok:
             return True
         else:

{rucio-38.2.0 → rucio-38.4.0}/lib/rucio/client/accountlimitclient.py

@@ -19,6 +19,7 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 
@@ -123,7 +124,7 @@ class AccountLimitClient(BaseClient):
         path = '/'.join([self.ACCOUNTLIMIT_BASEURL, 'local', account, rse])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
 
         if r.status_code == codes.created:
             return True
@@ -160,7 +161,7 @@ class AccountLimitClient(BaseClient):
         path = '/'.join([self.ACCOUNTLIMIT_BASEURL, 'local', account, rse])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
 
         if r.status_code == codes.ok:
             return True
@@ -196,7 +197,7 @@ class AccountLimitClient(BaseClient):
         path = '/'.join([self.ACCOUNTLIMIT_BASEURL, 'global', account, quote_plus(rse_expression)])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
 
         if r.status_code == codes.created:
             return True
@@ -233,7 +234,7 @@ class AccountLimitClient(BaseClient):
         path = '/'.join([self.ACCOUNTLIMIT_BASEURL, 'global', account, quote_plus(rse_expression)])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
 
         if r.status_code == codes.ok:
             return True