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

rucio/client/ruleclient.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:
@@ -110,7 +111,7 @@ class RuleClient(BaseClient):
                       'activity': activity, 'notify': notify, 'purge_replicas': purge_replicas,
                       'ignore_availability': ignore_availability, 'comment': comment, 'ask_approval': ask_approval,
                       'asynchronous': asynchronous, 'delay_injection': delay_injection, 'priority': priority, 'meta': meta})
-        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 loads(r.text)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -140,7 +141,7 @@ class RuleClient(BaseClient):
 
         data = dumps({'purge_replicas': purge_replicas})
 
-        r = self._send_request(url, type_='DEL', data=data)
+        r = self._send_request(url, method=HTTPMethod.DELETE, data=data)
 
         if r.status_code == codes.ok:
             return True
@@ -162,7 +163,7 @@ class RuleClient(BaseClient):
         """
         path = self.RULE_BASEURL + '/' + rule_id
         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 next(self._load_json_data(r))
         else:
@@ -185,7 +186,7 @@ class RuleClient(BaseClient):
         path = self.RULE_BASEURL + '/' + rule_id
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'options': options})
-        r = self._send_request(url, type_='PUT', data=data)
+        r = self._send_request(url, method=HTTPMethod.PUT, data=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)
@@ -216,7 +217,7 @@ class RuleClient(BaseClient):
         path = self.RULE_BASEURL + '/' + rule_id + '/reduce'
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'copies': copies, 'exclude_expression': exclude_expression})
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
         if r.status_code == codes.ok:
             return loads(r.text)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -252,7 +253,7 @@ class RuleClient(BaseClient):
             'rse_expression': rse_expression,
             'override': override,
         })
-        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 loads(r.text)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -273,7 +274,7 @@ class RuleClient(BaseClient):
         path = self.RULE_BASEURL + '/' + rule_id
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'options': {'approve': True}})
-        r = self._send_request(url, type_='PUT', data=data)
+        r = self._send_request(url, method=HTTPMethod.PUT, data=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)
@@ -300,7 +301,7 @@ class RuleClient(BaseClient):
         if reason:
             options['comment'] = reason
         data = dumps({'options': options})
-        r = self._send_request(url, type_='PUT', data=data)
+        r = self._send_request(url, method=HTTPMethod.PUT, data=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)
@@ -321,7 +322,7 @@ class RuleClient(BaseClient):
         """
         path = '/'.join([self.RULE_BASEURL, quote_plus(scope), quote_plus(name), '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(r.headers, r.status_code)
@@ -341,7 +342,7 @@ class RuleClient(BaseClient):
         """
         path = self.RULE_BASEURL + '/' + rule_id + '/analysis'
         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 next(self._load_json_data(r))
         exc_cls, exc_msg = self._get_exception(r.headers, r.status_code)
@@ -361,7 +362,7 @@ class RuleClient(BaseClient):
         """
         path = self.RULE_BASEURL + '/' + rule_id + '/locks'
         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(r.headers, r.status_code)
@@ -382,7 +383,7 @@ class RuleClient(BaseClient):
         filters = filters or {}
         path = self.RULE_BASEURL + '/'
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET', params=filters)
+        r = self._send_request(url, method=HTTPMethod.GET, params=filters)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:

rucio/client/scopeclient.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
 
 
@@ -56,7 +57,7 @@ class ScopeClient(BaseClient):
 
         path = '/'.join([self.SCOPE_BASEURL, account, 'scopes', quote_plus(scope)])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST')
+        r = self._send_request(url, method=HTTPMethod.POST)
         if r.status_code == codes.created:
             return True
         else:
@@ -74,7 +75,7 @@ class ScopeClient(BaseClient):
 
         path = '/'.join(['scopes/'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url)
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             scopes = loads(r.text)
             return scopes
@@ -106,7 +107,7 @@ class ScopeClient(BaseClient):
         path = '/'.join([self.SCOPE_BASEURL, account, 'scopes/'])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url)
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             scopes = loads(r.text)
             return scopes

rucio/client/subscriptionclient.py

@@ -18,6 +18,7 @@ from typing import TYPE_CHECKING, Any, Literal, Optional, Union
 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:
@@ -78,7 +79,7 @@ class SubscriptionClient(BaseClient):
             raise TypeError('replication_rules should be a list')
         data = dumps({'options': {'filter': filter_, 'replication_rules': replication_rules, 'comments': comments,
                                   'lifetime': lifetime, 'retroactive': retroactive, 'dry_run': dry_run, 'priority': priority}})
-        result = self._send_request(url, type_='POST', data=data)
+        result = self._send_request(url, method=HTTPMethod.POST, data=data)
         if result.status_code == codes.created:   # pylint: disable=no-member
             return result.text
         else:
@@ -120,7 +121,7 @@ class SubscriptionClient(BaseClient):
         else:
             path += '/'
         url = build_url(choice(self.list_hosts), path=path)
-        result = self._send_request(url, type_='GET')
+        result = self._send_request(url, method=HTTPMethod.GET)
         if result.status_code == codes.ok:   # pylint: disable=no-member
             return self._load_json_data(result)
         if result.status_code == codes.not_found:
@@ -173,7 +174,7 @@ class SubscriptionClient(BaseClient):
             raise TypeError('replication_rules should be a list')
         data = dumps({'options': {'filter': filter_, 'replication_rules': replication_rules, 'comments': comments,
                                   'lifetime': lifetime, 'retroactive': retroactive, 'dry_run': dry_run, 'priority': priority}})
-        result = self._send_request(url, type_='PUT', data=data)
+        result = self._send_request(url, method=HTTPMethod.PUT, data=data)
         if result.status_code == codes.created:   # pylint: disable=no-member
             return True
         else:
@@ -203,7 +204,7 @@ class SubscriptionClient(BaseClient):
         path = self.SUB_BASEURL + '/' + account + '/' + name  # type: ignore
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'options': {'state': 'I'}})
-        result = self._send_request(url, type_='PUT', data=data)
+        result = self._send_request(url, method=HTTPMethod.PUT, data=data)
         if result.status_code == codes.created:   # pylint: disable=no-member
             return True
         else:
@@ -228,7 +229,7 @@ class SubscriptionClient(BaseClient):
 
         path = '/'.join([self.SUB_BASEURL, account, name, 'rules'])
         url = build_url(choice(self.list_hosts), path=path)
-        result = self._send_request(url, type_='GET')
+        result = self._send_request(url, method=HTTPMethod.GET)
         if result.status_code == codes.ok:   # pylint: disable=no-member
             return self._load_json_data(result)
         else:

rucio/common/constants.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import enum
+import sys
 from collections import namedtuple
 from typing import Literal, get_args
 
@@ -29,6 +30,8 @@ RESERVED_KEYS = ['scope', 'name', 'account', 'did_type', 'is_open', 'monotonic',
 
 DEFAULT_VO = 'def'
 
+DEFAULT_ACTIVITY = 'User Subscriptions'
+
 KEY_TYPES = ['ALL', 'COLLECTION', 'FILE', 'DERIVED']
 # all(container, dataset, file), collection(dataset or container), file, derived(compute from file for collection)
 
@@ -219,3 +222,23 @@ SUPPORTED_SIGN_URL_SERVICES = list(get_args(SUPPORTED_SIGN_URL_SERVICES_LITERAL)
 
 OPENDATA_DID_STATE_LITERAL = Literal['draft', 'public', 'suspended']
 OPENDATA_DID_STATE_LITERAL_LIST = list(get_args(OPENDATA_DID_STATE_LITERAL))
+
+POLICY_ALGORITHM_TYPES_LITERAL = Literal['non_deterministic_pfn', 'scope', 'lfn2pfn', 'pfn2lfn', 'fts3_tape_metadata_plugins', 'fts3_plugins_init', 'auto_approve']
+POLICY_ALGORITHM_TYPES = list(get_args(POLICY_ALGORITHM_TYPES_LITERAL))
+
+# https://github.com/rucio/rucio/issues/7958
+# When Python 3.11 is the minimum supported version, we can use the standard library enum and remove this logic
+if sys.version_info >= (3, 11):
+    from http import HTTPMethod
+else:
+    @enum.unique
+    class HTTPMethod(str, enum.Enum):
+        """HTTP verbs used in Rucio requests."""
+
+        HEAD = "HEAD"
+        OPTIONS = "OPTIONS"
+        PATCH = "PATCH"
+        GET = "GET"
+        POST = "POST"
+        PUT = "PUT"
+        DELETE = "DELETE"

rucio/common/exception.py

@@ -1261,3 +1261,33 @@ class OpenDataInvalidStateUpdate(OpenDataError):
         super(OpenDataInvalidStateUpdate, self).__init__(*args)
         self._message = "Invalid state update attempted on open data entry."
         self.error_code = 119
+
+
+class InvalidPolicyPackageAlgorithmType(RucioException):
+    """
+    Thrown when an unknown algorithm type name is encountered.
+    """
+    def __init__(self, param: str, *args):
+        super(InvalidPolicyPackageAlgorithmType, self).__init__(*args)
+        self._message = f"Invalid policy package algorithm type '{param}'."
+        self.error_code = 120
+
+
+class InvalidAccountType(RucioException):
+    """
+    Thrown when an account is created with an invalid type
+    """
+    def __init__(self, *args):
+        super(InvalidAccountType, self).__init__(*args)
+        self._message = "Cannot create an account with an invalid type."
+        self.error_code = 121
+
+class OpenDataDuplicateDOI(OpenDataError):
+    """
+    Throws when a data identifier with the same DOI already exists in the open data catalog.
+    """
+
+    def __init__(self, doi: str, *args):
+        super(OpenDataDuplicateDOI, self).__init__(*args)
+        self._message = f"Data identifier with the same DOI ({doi}) already exists in the open data catalog."
+        self.error_code = 122

rucio/common/plugins.py

@@ -22,8 +22,8 @@ from packaging.specifiers import SpecifierSet
 
 from rucio.common import config
 from rucio.common.client import get_client_vo
-from rucio.common.constants import DEFAULT_VO
-from rucio.common.exception import InvalidAlgorithmName, PolicyPackageIsNotVersioned, PolicyPackageVersionError
+from rucio.common.constants import DEFAULT_VO, POLICY_ALGORITHM_TYPES, POLICY_ALGORITHM_TYPES_LITERAL
+from rucio.common.exception import InvalidAlgorithmName, InvalidPolicyPackageAlgorithmType, PolicyPackageIsNotVersioned, PolicyPackageVersionError
 from rucio.version import current_version
 
 if TYPE_CHECKING:
@@ -75,9 +75,9 @@ class PolicyPackageAlgorithms:
         - the key is the algorithm type
         - the value is a dictionary of algorithm names and their callables
     """
-    _ALGORITHMS: dict[str, dict[str, 'Callable[..., Any]']] = {}
+    _ALGORITHMS: dict[POLICY_ALGORITHM_TYPES_LITERAL, dict[str, 'Callable[..., Any]']] = {}
     _loaded_policy_modules = False
-    _default_algorithms: dict[str, 'Callable[..., Any]'] = {}
+    _default_algorithms: dict[str, Optional['Callable[..., Any]']] = {}
 
     def __init__(self) -> None:
         if not self._loaded_policy_modules:
@@ -85,12 +85,15 @@ class PolicyPackageAlgorithms:
             self._loaded_policy_modules = True
 
     @classmethod
-    def _get_default_algorithm(cls: type[PolicyPackageAlgorithmsT], algorithm_type: str, vo: str = "") -> Optional['Callable[..., Any]']:
+    def _get_default_algorithm(cls: type[PolicyPackageAlgorithmsT], algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL, vo: str = "") -> Optional['Callable[..., Any]']:
         """
         Gets the default algorithm of this type, if present in the policy package.
         The default algorithm is the function named algorithm_type within the module named algorithm_type.
         Returns None if no default algorithm present.
         """
+        if algorithm_type not in POLICY_ALGORITHM_TYPES:
+            raise InvalidPolicyPackageAlgorithmType(algorithm_type)
+
         # check if default algorithm for this VO is already cached
         type_for_vo = vo + "_" + algorithm_type
         if type_for_vo in cls._default_algorithms:
@@ -102,52 +105,71 @@ class PolicyPackageAlgorithms:
                 vo = ''
             package = cls._get_policy_package_name(vo)
         except (NoOptionError, NoSectionError):
+            cls._default_algorithms[type_for_vo] = default_algorithm
             return default_algorithm
 
         module_name = package + "." + algorithm_type
+        LOGGER.info('Attempting to find algorithm %s in default location %s...' % (algorithm_type, module_name))
         try:
             module = importlib.import_module(module_name)
 
             if hasattr(module, algorithm_type):
                 default_algorithm = getattr(module, algorithm_type)
-                cls._default_algorithms[type_for_vo] = default_algorithm
+        except ModuleNotFoundError:
+            LOGGER.info('Algorithm %s not found in default location %s' % (algorithm_type, module_name))
         except ImportError:
-            LOGGER.info('Policy algorithm module %s could not be loaded' % module_name)
+            LOGGER.info('Algorithm %s found in default location %s, but could not be loaded' % (algorithm_type, module_name))
+        # if the default algorithm is not present, this will store None and we will
+        # not attempt to load the same algorithm again
+        cls._default_algorithms[type_for_vo] = default_algorithm
         return default_algorithm
 
     @classmethod
-    def _get_one_algorithm(cls: type[PolicyPackageAlgorithmsT], algorithm_type: str, name: str) -> 'Callable[..., Any]':
+    def _get_one_algorithm(cls: type[PolicyPackageAlgorithmsT], algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL, name: str) -> 'Callable[..., Any]':
         """
         Get the algorithm from the dictionary of algorithms
         """
+        if algorithm_type not in POLICY_ALGORITHM_TYPES:
+            raise InvalidPolicyPackageAlgorithmType(algorithm_type)
         return cls._ALGORITHMS[algorithm_type][name]
 
     @classmethod
-    def _get_algorithms(cls: type[PolicyPackageAlgorithmsT], algorithm_type: str) -> dict[str, 'Callable[..., Any]']:
+    def _get_algorithms(cls: type[PolicyPackageAlgorithmsT], algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL) -> dict[str, 'Callable[..., Any]']:
         """
         Get the dictionary of algorithms for a given type
         """
+        if algorithm_type not in POLICY_ALGORITHM_TYPES:
+            raise InvalidPolicyPackageAlgorithmType(algorithm_type)
         return cls._ALGORITHMS[algorithm_type]
 
     @classmethod
     def _register(
             cls: type[PolicyPackageAlgorithmsT],
-            algorithm_type: str, algorithm_dict: dict[str, 'Callable[..., Any]']) -> None:
+            algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL,
+            algorithm_dict: dict[str, 'Callable[..., Any]']) -> None:
         """
         Provided a dictionary of callable function,
         and the associated algorithm type,
         register it as one of the valid algorithms.
         """
+        if algorithm_type not in POLICY_ALGORITHM_TYPES:
+            raise InvalidPolicyPackageAlgorithmType(algorithm_type)
+
         if algorithm_type in cls._ALGORITHMS:
             cls._ALGORITHMS[algorithm_type].update(algorithm_dict)
         else:
             cls._ALGORITHMS[algorithm_type] = algorithm_dict
 
     @classmethod
-    def _supports(cls: type[PolicyPackageAlgorithmsT], algorithm_type: str, name: str) -> bool:
+    def _supports(
+            cls: type[PolicyPackageAlgorithmsT],
+            algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL,
+            name: str) -> bool:
         """
         Check if a algorithm is supported by the plugin
         """
+        if algorithm_type not in POLICY_ALGORITHM_TYPES:
+            raise InvalidPolicyPackageAlgorithmType(algorithm_type)
         return name in cls._ALGORITHMS.get(algorithm_type, {})
 
     @classmethod
@@ -196,10 +218,6 @@ class PolicyPackageAlgorithms:
             if hasattr(module, 'get_algorithms'):
                 all_algorithms = module.get_algorithms()
 
-                # for backward compatibility, rename 'surl' to 'non_deterministic_pfn' here
-                if 'surl' in all_algorithms:
-                    all_algorithms['non_deterministic_pfn'] = all_algorithms['surl']
-
                 # check that the names are correctly prefixed for multi-VO
                 if vo:
                     for _, algorithms in all_algorithms.items():

rucio/common/utils.py

@@ -46,7 +46,7 @@ import requests
 from typing_extensions import ParamSpec
 
 from rucio.common.config import config_get, config_get_bool
-from rucio.common.constants import BASE_SCHEME_MAP, DEFAULT_VO
+from rucio.common.constants import BASE_SCHEME_MAP, DEFAULT_VO, POLICY_ALGORITHM_TYPES_LITERAL
 from rucio.common.exception import DIDFilterSyntaxError, DuplicateCriteriaInDIDFilter, InputValidationError, InvalidType, MetalinkJsonParsingError, MissingModuleException, RucioException
 from rucio.common.extra import import_extras
 from rucio.common.plugins import PolicyPackageAlgorithms
@@ -392,7 +392,7 @@ class NonDeterministicPFNAlgorithms(PolicyPackageAlgorithms):
     from policy packages
     """
 
-    _algorithm_type = 'non_deterministic_pfn'
+    _algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL = 'non_deterministic_pfn'
 
     def __init__(self, vo: str = DEFAULT_VO) -> None:
         """
@@ -560,7 +560,7 @@ class ScopeExtractionAlgorithms(PolicyPackageAlgorithms):
     Handle scope extraction algorithms
     """
 
-    _algorithm_type = 'scope'
+    _algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL = 'scope'
 
     def __init__(self, vo: str = DEFAULT_VO) -> None:
         """

rucio/core/config.py

@@ -330,17 +330,19 @@ def remove_section(section: str, *, session: "Session") -> bool:
         return False
     else:
         stmt = select(
+            models.Config.opt,
             models.Config.value
         ).where(
             models.Config.section == section
         )
-        for old in session.execute(stmt).all():
-            old_option = models.ConfigHistory(section=old[0],
-                                              opt=old[1],
-                                              value=old[2])
+        for option, value in session.execute(stmt).all():
+            old_option = models.ConfigHistory(
+                section=section,
+                opt=option,
+                value=value)
             old_option.save(session=session)
-            delete_from_cache(key=CacheKey.has_option(old[0], old[1]))
-            delete_from_cache(key=CacheKey.value(old[0], old[1]))
+            delete_from_cache(key=CacheKey.has_option(section, option))
+            delete_from_cache(key=CacheKey.value(section, option))
 
         stmt = delete(
             models.Config

rucio/core/credential.py

@@ -27,7 +27,7 @@ from google.oauth2.service_account import Credentials
 
 from rucio.common.cache import MemcacheRegion
 from rucio.common.config import config_get, get_rse_credentials
-from rucio.common.constants import RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS, RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL, SUPPORTED_SIGN_URL_SERVICES, SUPPORTED_SIGN_URL_SERVICES_LITERAL, RseAttr
+from rucio.common.constants import RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS, RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL, SUPPORTED_SIGN_URL_SERVICES, SUPPORTED_SIGN_URL_SERVICES_LITERAL, HTTPMethod, RseAttr
 from rucio.common.exception import UnsupportedOperation
 from rucio.core.monitor import MetricManager
 from rucio.core.rse import get_rse_attribute
@@ -51,7 +51,7 @@ def get_signed_url(
     The signed URL will be valid for 1 hour but can be overridden.
 
     :param rse_id: The ID of the RSE that the URL points to.
-    :param service: The service to authorise, either 'gcs', 's3' or 'swift'.
+    :param service: The service to authorize, either 'gcs', 's3' or 'swift'.
     :param operation: The operation to sign, either 'read', 'write', or 'delete'.
     :param url: The URL to sign.
     :param lifetime: Lifetime of the signed URL in seconds.
@@ -69,6 +69,8 @@ def get_signed_url(
     if url is None or url == '':
         raise UnsupportedOperation('URL must not be empty')
 
+    operations_map = {'read': HTTPMethod.GET.value, 'write': HTTPMethod.PUT.value, 'delete': HTTPMethod.DELETE.value}
+
     if lifetime:
         if not isinstance(lifetime, int):
             try:
@@ -88,25 +90,21 @@ def get_signed_url(
         if lifetime is None:
             lifetime = 0
         else:
-            # GCS is timezone-sensitive, don't use UTC
-            # has to be converted to Unixtime
+            # GCS is timezone-sensitive, don't use UTC. Has to be converted to Unix time
             lifetime_datetime = datetime.datetime.now() + datetime.timedelta(seconds=lifetime)
             lifetime = int(time.mktime(lifetime_datetime.timetuple()))
 
         # sign the path only
         path = components.path
 
-        # Map operations
-        operations = {'read': 'GET', 'write': 'PUT', 'delete': 'DELETE'}
-
-        # assemble message to sign
-        to_sign = "%s\n\n\n%s\n%s" % (operations[operation], lifetime, path)
+        # assemble a message to sign
+        to_sign = "%s\n\n\n%s\n%s" % (operations_map[operation], lifetime, path)
 
         # create URL-capable signature
         # first character is always a '=', remove it
         signature = urlencode({'': base64.b64encode(CREDS_GCS.sign_bytes(to_sign))})[1:]
 
-        # assemble final signed URL
+        # assemble the final signed URL
         signed_url = (
             f'https://{host}{path}'
             f'?GoogleAccessId={CREDS_GCS.service_account_email}'
@@ -127,18 +125,18 @@ def get_signed_url(
         # split URL to get hostname, bucket and key
         components = urlparse(url)
         host = components.netloc
-        pathcomponents = components.path.split('/')
+        path_components = components.path.split('/')
         if s3_url_style == "path":
-            if len(pathcomponents) < 3:
+            if len(path_components) < 3:
                 raise UnsupportedOperation('Not a valid Path-Style S3 URL')
-            bucket = pathcomponents[1]
-            key = '/'.join(pathcomponents[2:])
+            bucket = path_components[1]
+            key = '/'.join(path_components[2:])
         elif s3_url_style == "host":
-            hostcomponents = host.split('.')
-            bucket = hostcomponents[0]
-            if len(pathcomponents) < 2:
+            host_components = host.split('.')
+            bucket = host_components[0]
+            if len(path_components) < 2:
                 raise UnsupportedOperation('Not a valid Host-Style S3 URL')
-            key = '/'.join(pathcomponents[1:])
+            key = '/'.join(path_components[1:])
         else:
             raise UnsupportedOperation('Not a valid RSE S3 URL style (allowed values: path|host)')
 
@@ -185,7 +183,7 @@ def get_signed_url(
                 s3op, Params={'Bucket': bucket, 'Key': key}, ExpiresIn=lifetime)
 
     else:  # service == 'swift'
-        # split URL to get hostname and path
+        # split URL to get the hostname and path
         components = urlparse(url)
         host = components.netloc
 
@@ -194,7 +192,7 @@ def get_signed_url(
         if colon >= 0:
             host = host[:colon]
 
-        # use RSE ID to look up key
+        # use RSE ID to look up the key
         cred_name = rse_id
 
         # look up tempurl signing key
@@ -205,12 +203,7 @@ def get_signed_url(
             REGION.set('swift-%s' % cred_name, cred)
         tempurl_key = cred['tempurl_key']
 
-        if operation == 'read':
-            swiftop = 'GET'
-        elif operation == 'write':
-            swiftop = 'PUT'
-        else:
-            swiftop = 'DELETE'
+        swiftop = operations_map[operation]
 
         expires = int(time.time() + lifetime)  # type: ignore (lifetime could be None)
 

rucio/core/did.py

@@ -724,7 +724,7 @@ def __add_collections_to_container(
     for row in session.execute(stmt):
 
         if row.did_scope is None:
-            raise exception.DataIdentifierNotFound("Data identifier '%(scope)s:%(name)s' not found" % row)
+            raise exception.DataIdentifierNotFound(f"Data identifier '{row.scope}:{row.name}' not found")
 
         if row.did_type == DIDType.FILE:
             raise exception.UnsupportedOperation("Adding a file (%s:%s) to a container (%s:%s) is forbidden" % (row.scope, row.name, parent_did.scope, parent_did.name))