rucio-clients 38.2.0__py3-none-any.whl → 38.4.0__py3-none-any.whl

rucio/client/baseclient.py

@@ -38,7 +38,7 @@ from requests.status_codes import codes
 from rucio import version
 from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool, config_get_int, config_has_section
-from rucio.common.constants import DEFAULT_VO
+from rucio.common.constants import DEFAULT_VO, HTTPMethod
 from rucio.common.exception import CannotAuthenticate, ClientProtocolNotFound, ClientProtocolNotSupported, ConfigNotFound, MissingClientParameter, MissingModuleException, NoAuthInformation, ServerConnectionException
 from rucio.common.extra import import_extras
 from rucio.common.utils import build_url, get_tmp_dir, my_key_generator, parse_response, setup_logger, ssh_sign, wlcg_token_discovery
@@ -440,14 +440,14 @@ class BaseClient:
         self.logger.warning("Waiting {}s due to reason: {} ".format(sleep_time, reason))
         time.sleep(sleep_time)
 
-    def _send_request(self, url, headers=None, type_='GET', data=None, params=None, stream=False, get_token=False,
+    def _send_request(self, url, method, headers=None, data=None, params=None, stream=False, get_token=False,
                       cert=None, auth=None, verify=None):
         """
         Helper method to send requests to the rucio server. Gets a new token and retries if an unauthorized error is returned.
 
         :param url: the http url to use.
         :param headers: additional http headers to send.
-        :param type_: the http request type to use.
+        :param method: the http request type to use.
         :param data: post data.
         :param params: (optional) Dictionary or bytes to be sent in the url query string.
         :param get_token: (optional) if it is called from a _get_token function.
@@ -469,28 +469,28 @@ class BaseClient:
         if verify is None:
             verify = self.ca_cert or False  # Maybe unnecessary but make sure to convert "" -> False
 
-        self.logger.debug("HTTP request: %s %s" % (type_, url))
+        self.logger.debug("HTTP request: %s %s" % (method.value, url))
         for h, v in hds.items():
             if h == 'X-Rucio-Auth-Token':
                 v = "[hidden]"
             self.logger.debug("HTTP header:  %s: %s" % (h, v))
-        if type_ != "GET" and data:
+        if method != HTTPMethod.GET and data:
             text = self._reduce_data(data)
             self.logger.debug("Request data (length=%d): [%s]" % (len(data), text))
 
         result = None
         for retry in range(self.AUTH_RETRIES + 1):
             try:
-                if type_ == 'GET':
+                if method == HTTPMethod.GET:
                     result = self.session.get(url, headers=hds, verify=verify, timeout=self.timeout, params=params, stream=True, cert=cert, auth=auth)
-                elif type_ == 'PUT':
+                elif method == HTTPMethod.PUT:
                     result = self.session.put(url, headers=hds, data=data, verify=verify, timeout=self.timeout)
-                elif type_ == 'POST':
+                elif method == HTTPMethod.POST:
                     result = self.session.post(url, headers=hds, data=data, verify=verify, timeout=self.timeout, stream=stream)
-                elif type_ == 'DEL':
+                elif method == HTTPMethod.DELETE:
                     result = self.session.delete(url, headers=hds, data=data, verify=verify, timeout=self.timeout)
                 else:
-                    self.logger.debug("Unknown request type %s. Request was not sent" % (type_,))
+                    self.logger.debug("Unknown request type %s. Request was not sent" % (method,))
                     return None
                 self.logger.debug("HTTP Response: %s %s" % (result.status_code, result.reason))
                 if result.status_code in STATUS_CODES_TO_RETRY:
@@ -537,7 +537,7 @@ class BaseClient:
 
         url = build_url(self.auth_host, path='auth/userpass')
 
-        result = self._send_request(url, headers=headers, get_token=True)
+        result = self._send_request(url, method=HTTPMethod.GET, headers=headers, get_token=True)
 
         if not result:
             # result is either None or not OK.
@@ -590,7 +590,7 @@ class BaseClient:
             return False
 
         request_refresh_url = build_url(self.auth_host, path='auth/oidc_refresh')
-        refresh_result = self._send_request(request_refresh_url, get_token=True)
+        refresh_result = self._send_request(request_refresh_url,method=HTTPMethod.GET, get_token=True)
         if refresh_result.status_code == codes.ok:
             if 'X-Rucio-Auth-Token-Expires' not in refresh_result.headers or \
                     'X-Rucio-Auth-Token' not in refresh_result.headers:
@@ -644,7 +644,7 @@ class BaseClient:
         request_auth_url = build_url(self.auth_host, path='auth/oidc')
         # requesting authorization URL specific to the user & Rucio OIDC Client
         self.logger.debug("Initial auth URL request headers %s to files" % str(headers))
-        oidc_auth_res = self._send_request(request_auth_url, headers=headers, get_token=True)
+        oidc_auth_res = self._send_request(request_auth_url, method=HTTPMethod.GET, headers=headers, get_token=True)
         self.logger.debug("Response headers %s and text %s" % (str(oidc_auth_res.headers), str(oidc_auth_res.text)))
         # with the obtained authorization URL we will contact the Identity Provider to get to the login page
         if 'X-Rucio-OIDC-Auth-URL' not in oidc_auth_res.headers:
@@ -665,7 +665,7 @@ class BaseClient:
                                            \nthe Rucio authentication server for a token.")
                 print("----------------------------------------------")
                 while time.time() - start < timeout:
-                    result = self._send_request(auth_url, headers=headers, get_token=True)
+                    result = self._send_request(auth_url, method=HTTPMethod.GET, headers=headers, get_token=True)
                     if 'X-Rucio-Auth-Token' in result.headers and result.status_code == codes.ok:
                         break
                     time.sleep(2)
@@ -675,7 +675,7 @@ class BaseClient:
                 while count < 3:
                     fetchcode = input()
                     fetch_url = build_url(self.auth_host, path='auth/oidc_redirect', params=fetchcode)
-                    result = self._send_request(fetch_url, headers=headers, get_token=True)
+                    result = self._send_request(fetch_url, method=HTTPMethod.GET, headers=headers, get_token=True)
                     if 'X-Rucio-Auth-Token' in result.headers and result.status_code == codes.ok:
                         break
                     else:
@@ -688,11 +688,11 @@ class BaseClient:
                   + "your password with any 3rd party application, therefore, \n"  # NOQA: W503
                   + "we strongly discourage you from following this --oidc-auto approach.")  # NOQA: W503
             print("-------------------------------------------------------------------------")
-            auth_res = self._send_request(auth_url, get_token=True)
+            auth_res = self._send_request(auth_url, method=HTTPMethod.GET, get_token=True)
             # getting the login URL and logging in the user
             login_url = auth_res.url
             start = time.time()
-            result = self._send_request(login_url, type_='POST', data=userpass)
+            result = self._send_request(login_url, method=HTTPMethod.POST, data=userpass)
 
             # if the Rucio OIDC Client configuration does not match the one registered at the Identity Provider
             # the user will get an OAuth error
@@ -714,7 +714,7 @@ class BaseClient:
                 self.logger.warning('Automatically authorising request of the following info on behalf of user: %s',
                                     str(form_data))
                 # authorizing info request on behalf of the user until he/she revokes this authorization !
-                result = self._send_request(result.url, type_='POST', data=form_data)
+                result = self._send_request(result.url, method=HTTPMethod.POST, data=form_data)
 
         if not result:
             self.logger.error('Cannot retrieve authentication token!')
@@ -767,7 +767,7 @@ class BaseClient:
         else:
             cert = (client_cert, client_key)
 
-        result = self._send_request(url, get_token=True, cert=cert)
+        result = self._send_request(url, method=HTTPMethod.GET, get_token=True, cert=cert)
 
         # Note a response object for a failed request evaluates to false, so we cannot
         # use "not result" here
@@ -802,7 +802,7 @@ class BaseClient:
 
         url = build_url(self.auth_host, path='auth/ssh_challenge_token')
 
-        result = self._send_request(url, get_token=True)
+        result = self._send_request(url, method=HTTPMethod.GET, get_token=True)
 
         if not result:
             self.logger.error('cannot get ssh_challenge_token')
@@ -825,7 +825,7 @@ class BaseClient:
 
         url = build_url(self.auth_host, path='auth/ssh')
 
-        result = self._send_request(url, headers=headers, get_token=True)
+        result = self._send_request(url, method=HTTPMethod.GET, headers=headers, get_token=True)
 
         if not result:
             self.logger.error('Cannot retrieve authentication token!')
@@ -851,7 +851,7 @@ class BaseClient:
 
         url = build_url(self.auth_host, path='auth/gss')
 
-        result = self._send_request(url, get_token=True, auth=HTTPKerberosAuth())
+        result = self._send_request(url, method=HTTPMethod.GET, get_token=True, auth=HTTPKerberosAuth())
 
         if not result:
             self.logger.error('Cannot retrieve authentication token!')
@@ -876,12 +876,12 @@ class BaseClient:
         url = build_url(self.auth_host, path='auth/saml')
 
         result = None
-        saml_auth_result = self._send_request(url, get_token=True)
+        saml_auth_result = self._send_request(url, method=HTTPMethod.GET, get_token=True)
         if saml_auth_result.headers['X-Rucio-Auth-Token']:
             return saml_auth_result.headers['X-Rucio-Auth-Token']
         saml_auth_url = saml_auth_result.headers['X-Rucio-SAML-Auth-URL']
-        result = self._send_request(saml_auth_url, type_='POST', data=userpass, verify=False)
-        result = self._send_request(url, get_token=True)
+        result = self._send_request(saml_auth_url, method=HTTPMethod.POST, data=userpass, verify=False)
+        result = self._send_request(url, method=HTTPMethod.GET, get_token=True)
 
         if not result:
             self.logger.error('Cannot retrieve authentication token!')

rucio/client/configclient.py

@@ -18,6 +18,7 @@ from typing import Any, Optional
 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
 
 
@@ -54,7 +55,7 @@ class ConfigClient(BaseClient):
 
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return r.json()
         else:
@@ -90,7 +91,7 @@ class ConfigClient(BaseClient):
         Note:
         ------
         The format of the /config endpoint was recently changed. We migrated from performing a PUT on
-        "/config/<section>/<option>/<value>" to sending the parameters using a json-encoded body.
+        "/config/{section}/{option}/{value}" to sending the parameters using a json-encoded body.
         This was done to fix multiple un-wanted side effects related to how the middleware treats
         values encoded in a path.
         For a smooth transition, we allow both cases for now, but we should migrate to only passing
@@ -104,11 +105,11 @@ class ConfigClient(BaseClient):
                     option: value
                 }
             })
-            r = self._send_request(url, type_='POST', data=data)
+            r = self._send_request(url, method=HTTPMethod.POST, data=data)
         else:
             path = '/'.join([self.CONFIG_BASEURL, section, option, value])
             url = build_url(choice(self.list_hosts), path=path)
-            r = self._send_request(url, type_='PUT')
+            r = self._send_request(url, method=HTTPMethod.PUT)
 
         if r.status_code == codes.created:
             return True
@@ -140,7 +141,30 @@ class ConfigClient(BaseClient):
         path = '/'.join([self.CONFIG_BASEURL, section, option])
         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
+        else:
+            exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
+            raise exc_cls(exc_msg)
+
+    def delete_config_section(self, section: str):
+        """
+        Delete a whole section from the config
+
+        Parameters
+        ----------
+        section :
+            The name of the section.
+
+        Returns
+        -------
+            True if option was removed successfully.
+        """
+        path = '/'.join([self.CONFIG_BASEURL, section])
+        url = build_url(choice(self.list_hosts), path=path)
+        r = self._send_request(url, method=HTTPMethod.DELETE)
 
         if r.status_code == codes.ok:
             return True

rucio/client/credentialclient.py

@@ -15,6 +15,7 @@
 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
 
 
@@ -60,7 +61,7 @@ class CredentialClient(BaseClient):
         params['op'] = operation
         params['url'] = url
         rurl = build_url(choice(self.list_hosts), path=path, params=params)
-        r = self._send_request(rurl, type_='GET')
+        r = self._send_request(rurl, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             return r.text

rucio/client/didclient.py

@@ -20,6 +20,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.exception import DeprecationError
 from rucio.common.utils import build_url, date_to_str, render_json
 
@@ -28,7 +29,6 @@ if TYPE_CHECKING:
 
 
 class DIDClient(BaseClient):
-
     """DataIdentifier client class for working with data identifiers"""
 
     DIDS_BASEURL = 'dids'
@@ -64,7 +64,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), 'dids', 'search'])
 
         # stringify dates.
-        if isinstance(filters, dict):   # backwards compatibility for filters as single {}
+        if isinstance(filters, dict):  # backwards compatibility for filters as single {}
             filters = [filters]
         for or_group in filters:
             for key, value in or_group.items():
@@ -80,7 +80,7 @@ class DIDClient(BaseClient):
 
         url = build_url(choice(self.list_hosts), path=path, params=payload)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             dids = self._load_json_data(r)
@@ -148,7 +148,7 @@ class DIDClient(BaseClient):
             data['dids'] = dids
         if rse:
             data['rse'] = rse
-        r = self._send_request(url, type_='POST', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=render_json(**data))
         if r.status_code == codes.created:
             return True
         else:
@@ -161,7 +161,7 @@ class DIDClient(BaseClient):
         """
         path = '/'.join([self.DIDS_BASEURL])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=render_json(dids))
+        r = self._send_request(url, method=HTTPMethod.POST, data=render_json(dids))
         if r.status_code == codes.created:
             return True
         else:
@@ -245,7 +245,8 @@ class DIDClient(BaseClient):
         lifetime :
             DID's lifetime (in seconds).
         """
-        return self.add_did(scope=scope, name=name, did_type='CONTAINER', statuses=statuses, meta=meta, rules=rules, lifetime=lifetime)
+        return self.add_did(scope=scope, name=name, did_type='CONTAINER', statuses=statuses, meta=meta, rules=rules,
+                            lifetime=lifetime)
 
     def add_containers(self, cnts: "Sequence[dict[str, Any]]") -> bool:
         """
@@ -284,7 +285,7 @@ class DIDClient(BaseClient):
         data: dict[str, Any] = {'dids': dids}
         if rse:
             data['rse'] = rse
-        r = self._send_request(url, type_='POST', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=render_json(**data))
         if r.status_code == codes.created:
             return True
         else:
@@ -313,7 +314,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'dids'])
         url = build_url(choice(self.list_hosts), path=path)
         data = {'dids': dids}
-        r = self._send_request(url, type_='DEL', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.DELETE, data=render_json(**data))
         if r.status_code == codes.ok:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -339,7 +340,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, 'attachments'])
         url = build_url(choice(self.list_hosts), path=path)
         data = {'ignore_duplicate': ignore_duplicate, 'attachments': attachments}
-        r = self._send_request(url, type_='POST', data=dumps(data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(data))
         if r.status_code in (codes.ok, codes.no_content, codes.created):
             return True
 
@@ -482,9 +483,9 @@ class DIDClient(BaseClient):
         return self.attach_dids(scope=scope, name=name, dids=cnts)
 
     def list_content(
-        self,
-        scope: str,
-        name: str
+            self,
+            scope: str,
+            name: str
     ) -> "Iterator[dict[str, Any]]":
         """
         List data identifier contents.
@@ -499,7 +500,7 @@ class DIDClient(BaseClient):
 
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'dids'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -524,7 +525,7 @@ class DIDClient(BaseClient):
 
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'dids', 'history'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -555,7 +556,7 @@ class DIDClient(BaseClient):
             payload['long'] = True
         url = build_url(choice(self.list_hosts), path=path, params=payload)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -576,7 +577,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, 'bulkfiles'])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='POST', data=dumps(data), stream=True)
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(data), stream=True)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -613,7 +614,7 @@ class DIDClient(BaseClient):
         elif dynamic:
             params['dynamic_depth'] = 'FILE'
         url = build_url(choice(self.list_hosts), path=path, params=params)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return next(self._load_json_data(r))
         else:
@@ -642,7 +643,7 @@ class DIDClient(BaseClient):
         url = build_url(choice(self.list_hosts), path=path)
         payload = {}
         payload['plugin'] = plugin
-        r = self._send_request(url, type_='GET', params=payload)
+        r = self._send_request(url, method=HTTPMethod.GET, params=payload)
         if r.status_code == codes.ok:
             meta = self._load_json_data(r)
             return next(meta)
@@ -670,7 +671,7 @@ class DIDClient(BaseClient):
         data = {'dids': dids, 'inherit': inherit, 'plugin': plugin}
         path = '/'.join([self.DIDS_BASEURL, 'bulkmeta'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=dumps(data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(data))
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -703,7 +704,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'meta', key])
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'value': value, 'recursive': recursive})
-        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
         else:
@@ -734,7 +735,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'meta'])
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'meta': meta, 'recursive': recursive})
-        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
         else:
@@ -760,7 +761,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, 'bulkdidsmeta'])
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'dids': dids, 'recursive': recursive})
-        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
         else:
@@ -788,7 +789,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'status'])
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps(kwargs)
-        r = self._send_request(url, type_='PUT', data=data)
+        r = self._send_request(url, method=HTTPMethod.PUT, data=data)
         if r.status_code in (codes.ok, codes.no_content, codes.created):
             return True
 
@@ -833,7 +834,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'meta'])
         url = build_url(choice(self.list_hosts), path=path, params={'key': key})
 
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
         if r.status_code == codes.ok:
             return True
         else:
@@ -858,7 +859,7 @@ class DIDClient(BaseClient):
 
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'rules'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -883,7 +884,7 @@ class DIDClient(BaseClient):
 
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'associated_rules'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -907,7 +908,7 @@ class DIDClient(BaseClient):
 
         path = '/'.join([self.DIDS_BASEURL, guid, 'guid'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -941,7 +942,7 @@ class DIDClient(BaseClient):
             payload['recursive'] = True
         url = build_url(choice(self.list_hosts), path=path, params=payload)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -967,7 +968,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'parents'])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -1007,7 +1008,7 @@ class DIDClient(BaseClient):
             'nbfiles': str(nbfiles)
         })
         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
         else:
@@ -1025,7 +1026,7 @@ class DIDClient(BaseClient):
         """
         path = '/'.join([self.DIDS_BASEURL, 'resurrect'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=dumps(dids))
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(dids))
         if r.status_code == codes.created:
             return True
         else:
@@ -1049,7 +1050,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.ARCHIVES_BASEURL, quote_plus(scope), quote_plus(name), 'files'])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)

rucio/client/diracclient.py

@@ -18,6 +18,7 @@ from typing import TYPE_CHECKING, Any, Literal, Optional
 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:
@@ -113,7 +114,7 @@ class DiracClient(BaseClient):
 
         r = self._send_request(
             url,
-            type_='POST',
+            method=HTTPMethod.POST,
             data=dumps({'lfns': lfns, 'ignore_availability': ignore_availability, 'parents_metadata': parents_metadata})
         )
 

rucio/client/exportclient.py

@@ -17,6 +17,7 @@ from typing import Any
 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, parse_response
 
 
@@ -83,7 +84,7 @@ class ExportClient(BaseClient):
         path = '/'.join([self.EXPORT_BASEURL])
         url = build_url(choice(self.list_hosts), path=path, params=payload)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return parse_response(r.text)
         else:

rucio/client/importclient.py

@@ -17,6 +17,7 @@ from typing import Any
 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, render_json
 
 
@@ -37,7 +38,7 @@ class ImportClient(BaseClient):
         path = '/'.join([self.IMPORT_BASEURL])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='POST', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=render_json(**data))
         if r.status_code == codes.created:
             return r.text
         else:

rucio/client/lifetimeclient.py

@@ -18,6 +18,7 @@ from typing import TYPE_CHECKING, Any, Optional
 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, render_json
 
 if TYPE_CHECKING:
@@ -81,7 +82,7 @@ class LifetimeClient(BaseClient):
             params['states'] = exception_id
         url = build_url(choice(self.list_hosts), path=path, params=params)
 
-        result = self._send_request(url)
+        result = self._send_request(url, method=HTTPMethod.GET)
         if result.status_code == codes.ok:
             lifetime_exceptions = self._load_json_data(result)
             return lifetime_exceptions
@@ -133,7 +134,7 @@ class LifetimeClient(BaseClient):
         path = self.LIFETIME_BASEURL + '/'
         url = build_url(choice(self.list_hosts), path=path)
         data = {'dids': dids, 'account': account, 'pattern': pattern, 'comments': comments, 'expires_at': expires_at}
-        result = self._send_request(url, type_='POST', data=render_json(**data))
+        result = self._send_request(url, method=HTTPMethod.POST, data=render_json(**data))
         if result.status_code == codes.created:
             return loads(result.text)
         exc_cls, exc_msg = self._get_exception(headers=result.headers, status_code=result.status_code, data=result.content)

rucio/client/lockclient.py

@@ -18,6 +18,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, render_json
 
 if TYPE_CHECKING:
@@ -50,7 +51,7 @@ class LockClient(BaseClient):
         path = '/'.join([self.LOCKS_BASEURL, quote_plus(scope), quote_plus(name)])
         url = build_url(choice(self.list_hosts), path=path, params={'did_type': 'dataset'})
 
-        result = self._send_request(url)
+        result = self._send_request(url, method=HTTPMethod.GET)
         if result.status_code == codes.ok:   # pylint: disable-msg=E1101
             locks = self._load_json_data(result)
             return locks
@@ -87,7 +88,7 @@ class LockClient(BaseClient):
         path = '/'.join([self.LOCKS_BASEURL, "bulk_locks_for_dids"])
         url = build_url(choice(self.list_hosts), path=path)
 
-        result = self._send_request(url, type_='POST', data=render_json(dids=dids))
+        result = self._send_request(url, method=HTTPMethod.POST, data=render_json(dids=dids))
         if result.status_code == codes.ok:   # pylint: disable-msg=E1101
             out = []
             for lock in self._load_json_data(result):
@@ -113,7 +114,7 @@ class LockClient(BaseClient):
         path = '/'.join([self.LOCKS_BASEURL, rse])
         url = build_url(choice(self.list_hosts), path=path, params={'did_type': 'dataset'})
 
-        result = self._send_request(url)
+        result = self._send_request(url, method=HTTPMethod.GET)
         if result.status_code == codes.ok:   # pylint: disable-msg=E1101
             locks = self._load_json_data(result)
             return locks