rucio 37.4.0__py3-none-any.whl → 37.6.0__py3-none-any.whl

rucio/gateway/did.py

@@ -43,11 +43,11 @@ def list_dids(
     vo: str = 'def',
 ) -> 'Iterator[dict[str, Any]]':
     """
-    List dids in a scope.
+    List DIDs in a scope.
 
     :param scope: The scope name.
     :param filters: Filter arguments in form supported by the filter engine.
-    :param did_type:  The type of the did: all(container, dataset, file), collection(dataset or container), dataset, container
+    :param did_type:  The type of the DID: all(container, dataset, file), collection(dataset or container), dataset, container
     :param ignore_case: Ignore case distinctions.
     :param limit: The maximum number of DIDs returned.
     :param offset: Offset number.
@@ -87,7 +87,7 @@ def add_did(
     vo: str = 'def',
 ) -> None:
     """
-    Add data did.
+    Add data DID.
 
     :param scope: The scope name.
     :param name: The data identifier name.
@@ -96,7 +96,7 @@ def add_did(
     :param account: The account owner. If None, then issuer is selected as owner.
     :param statuses: Dictionary with statuses, e.g.g {'monotonic':True}.
     :meta: Meta-data associated with the data identifier is represented using key/value pairs in a dictionary.
-    :rules: Replication rules associated with the data did. A list of dictionaries, e.g., [{'copies': 2, 'rse_expression': 'TIERS1'}, ].
+    :rules: Replication rules associated with the data DID. A list of dictionaries, e.g., [{'copies': 2, 'rse_expression': 'TIERS1'}, ].
     :param lifetime: DID's lifetime (in seconds).
     :param dids: The content.
     :param rse: The RSE name when registering replicas.
@@ -155,9 +155,9 @@ def add_dids(
     vo: str = 'def',
 ) -> None:
     """
-    Bulk Add did.
+    Bulk Add DID.
 
-    :param dids: A list of dids.
+    :param dids: A list of DIDs.
     :param issuer: The issuer account.
     :param vo: The VO to act on.
     """
@@ -193,7 +193,7 @@ def attach_dids(
     vo='def',
 ) -> None:
     """
-    Append content to data did.
+    Append content to data DID.
 
     :param attachment: The attachment.
     :param issuer: The issuer account.
@@ -240,7 +240,7 @@ def attach_dids_to_dids(
     vo: str = 'def',
 ) -> None:
     """
-    Append content to dids.
+    Append content to DIDs.
 
     :param attachments: The contents.
     :param issuer: The issuer account.
@@ -468,15 +468,15 @@ def scope_list(
 
 def get_did(scope: str, name: str, dynamic_depth: Optional[DIDType] = None, vo: str = 'def') -> "dict[str, Any]":
     """
-    Retrieve a single data did.
+    Retrieve a single data DID.
 
     :param scope: The scope name.
     :param name: The data identifier name.
     :param dynamic_depth: the DID type to use as source for estimation of this DIDs length/bytes.
-    If set to None, or to a value which doesn't make sense (ex: requesting depth = CONTAINER for a did of type DATASET)
+    If set to None, or to a value which doesn't make sense (ex: requesting depth = CONTAINER for a DID of type DATASET)
     will not compute the size dynamically.
     :param vo: The VO to act on.
-    :return did: Dictionary containing {'name', 'scope', 'type'}, Exception otherwise
+    :return DID: Dictionary containing {'name', 'scope', 'type'}, Exception otherwise
     """
 
     internal_scope = InternalScope(scope, vo=vo)
@@ -496,7 +496,7 @@ def set_metadata(
     vo: str = 'def',
 ) -> None:
     """
-    Add metadata to data did.
+    Add metadata to data DID.
 
     :param scope: The scope name.
     :param name: The data identifier name.
@@ -529,7 +529,7 @@ def set_metadata_bulk(
     vo: str = 'def',
 ) -> None:
     """
-    Add metadata to data did.
+    Add metadata to data DID.
 
     :param scope: The scope name.
     :param name: The data identifier name.
@@ -563,7 +563,7 @@ def set_dids_metadata_bulk(
     Add metadata to a list of data identifiers.
 
     :param issuer: The issuer account.
-    :param dids: A list of dids including metadata.
+    :param dids: A list of DIDs including metadata.
     :param recursive: Option to propagate the metadata update to content.
     :param vo: The VO to act on.
     """
@@ -612,8 +612,8 @@ def get_metadata_bulk(
     vo: str = 'def',
 ) -> 'Iterator[dict[str, Any]]':
     """
-    Get metadata for a list of dids
-    :param dids:               A list of dids.
+    Get metadata for a list of DIDs
+    :param dids:               A list of DIDs.
     :param inherit:            A boolean. If set to true, the metadata of the parent are concatenated.
     :param plugin:             The metadata plugin to query, 'ALL' for all available plugins
     :param vo:                 The VO to act on.
@@ -638,8 +638,8 @@ def delete_metadata(
     """
     Delete a key from the metadata column
 
-    :param scope: the scope of did
-    :param name: the name of the did
+    :param scope: the scope of DID
+    :param name: the name of the DID
     :param key: the key to be deleted
     :param vo: The VO to act on.
     """
@@ -685,7 +685,7 @@ def get_dataset_by_guid(
     :param guid: The GUID.
     :param vo: The VO to act on.
 
-    :returns: A did
+    :returns: A DID
     """
     with db_session(DatabaseOperationType.READ) as session:
         dids = did.get_dataset_by_guid(guid=guid, session=session)
@@ -702,7 +702,7 @@ def list_parent_dids(
     vo: str = 'def',
 ) -> 'Iterator[dict[str, Any]]':
     """
-    List parent datasets and containers of a did.
+    List parent datasets and containers of a DID.
 
     :param scope:   The scope.
     :param name:    The name.
@@ -763,7 +763,7 @@ def resurrect(
     """
     Resurrect DIDs.
 
-    :param dids: A list of dids.
+    :param dids: A list of DIDs.
     :param issuer: The issuer account.
     :param vo: The VO to act on.
     """
@@ -808,7 +808,7 @@ def add_did_to_followed(
     vo: str = 'def'
 ) -> None:
     """
-    Mark a did as followed by the given account
+    Mark a DID as followed by the given account
 
     :param scope: The scope name.
     :param name: The data identifier name.
@@ -828,7 +828,7 @@ def add_dids_to_followed(
     """
     Bulk mark datasets as followed
 
-    :param dids: A list of dids.
+    :param dids: A list of DIDs.
     :param account: The account owner.
     """
     internal_account = InternalAccount(account, vo=vo)
@@ -842,7 +842,7 @@ def get_users_following_did(
     vo: str = 'def'
 ) -> 'Iterator[dict[str, str]]':
     """
-    Return list of users following a did
+    Return list of users following a DID
 
     :param scope: The scope name.
     :param name: The data identifier name.
@@ -863,7 +863,7 @@ def remove_did_from_followed(
     vo: str = 'def'
 ) -> None:
     """
-    Mark a did as not followed
+    Mark a DID as not followed
 
     :param scope: The scope name.
     :param name: The data identifier name.
@@ -890,7 +890,7 @@ def remove_dids_from_followed(
     """
     Bulk mark datasets as not followed
 
-    :param dids: A list of dids.
+    :param dids: A list of DIDs.
     :param account: The account owner.
     """
     kwargs = {'dids': dids, 'issuer': issuer}

rucio/gateway/dirac.py

@@ -63,7 +63,7 @@ def add_files(
                 rses[rse] = rse_id
             lfn['rse_id'] = rses[rse]
 
-        # Check if the issuer can add dids and use skip_availabitlity
+        # Check if the issuer can add DIDs and use skip_availabitlity
         for rse in rses:
             rse_id = rses[rse]
             kwargs = {'rse': rse, 'rse_id': rse_id}

rucio/gateway/lifetime_exception.py

@@ -59,7 +59,7 @@ def add_exception(
     """
     Add exceptions to Lifetime Model.
 
-    :param dids:        The list of dids
+    :param dids:        The list of DIDs
     :param account:     The account of the requester.
     :param pattern:     The account.
     :param comments:    The comments associated to the exception.

rucio/gateway/replica.py

@@ -434,7 +434,7 @@ def list_dataset_replicas_bulk(
         vo: str = 'def'
 ) -> 'Iterator[dict[str, Any]]':
     """
-    :param dids: The list of did dictionaries with scope and name.
+    :param dids: The list of DID dictionaries with scope and name.
     :param vo: The VO to act on.
 
     :returns: A list of dict dataset replicas
@@ -552,7 +552,7 @@ def add_bad_dids(
     """
     Add bad replica entries for DIDs.
 
-    :param dids: the list of dids with bad replicas at rse.
+    :param dids: the list of DIDs with bad replicas at rse.
     :param rse: the rse with the bad replicas.
     :param issuer: The issuer account.
     :param state: One of the possible states : BAD

rucio/gateway/request.py

@@ -19,11 +19,12 @@ Interface for the requests abstraction layer
 from typing import TYPE_CHECKING, Any, Optional
 
 from rucio.common import exception
+from rucio.common.constants import TransferLimitDirection
 from rucio.common.types import InternalAccount, InternalScope, RequestGatewayDict
 from rucio.common.utils import gateway_update_return_dict
 from rucio.core import request
 from rucio.core.rse import get_rse_id
-from rucio.db.sqla.constants import DatabaseOperationType, TransferLimitDirection
+from rucio.db.sqla.constants import DatabaseOperationType
 from rucio.db.sqla.session import db_session
 from rucio.gateway import permission
 
@@ -364,14 +365,14 @@ def set_transfer_limit(
             raise exception.AccessDenied(f'{issuer} cannot set transfer limits. {auth_result.message}')
 
         request.set_transfer_limit(rse_expression=rse_expression,
-                                activity=activity,
-                                direction=direction,
-                                max_transfers=max_transfers,
-                                volume=volume,
-                                deadline=deadline,
-                                strategy=strategy,
-                                transfers=transfers,
-                                waitings=waitings)
+                                   activity=activity,
+                                   direction=direction,
+                                   max_transfers=max_transfers,
+                                   volume=volume,
+                                   deadline=deadline,
+                                   strategy=strategy,
+                                   transfers=transfers,
+                                   waitings=waitings)
 
 
 def delete_transfer_limit(
@@ -398,6 +399,6 @@ def delete_transfer_limit(
             raise exception.AccessDenied(f'{issuer} cannot delete transfer limits. {auth_result.message}')
 
         request.delete_transfer_limit(rse_expression=rse_expression,
-                                    activity=activity,
-                                    direction=direction,
-                                    session=session)
+                                      activity=activity,
+                                      direction=direction,
+                                      session=session)

rucio/rse/protocols/ngarc.py

@@ -20,7 +20,7 @@ from rucio.rse.protocols import protocol
 
 try:
     import arc  # pylint: disable=import-error
-except:
+except Exception:
     pass
 
 
@@ -59,7 +59,7 @@ class Default(protocol.RSEProtocol):
         self.cfg = arc.UserConfig()
         try:
             self.cfg.ProxyPath(os.environ['X509_USER_PROXY'])
-        except:
+        except Exception:
             pass
 
     def path2pfn(self, path):

rucio/rse/protocols/srm.py

@@ -101,7 +101,7 @@ class Default(protocol.RSEProtocol):
             # force type conversion
             try:
                 port = int(port)
-            except:
+            except Exception:
                 port = ''
 
             if self.attributes['hostname'] != hostname and\

rucio/rse/protocols/webdav.py

@@ -253,8 +253,15 @@ class Default(protocol.RSEProtocol):
             :raise  ServiceUnavailable, RSEAccessDenied
         """
         path = self.path2pfn(pfn)
+
+        using_presigned_urls = self.rse['sign_url'] is not None
+
         try:
-            result = self.session.request('HEAD', path, verify=False, timeout=self.timeout, cert=self.cert)
+            # use GET instead of HEAD for presigned urls
+            if not using_presigned_urls:
+                result = self.session.request('HEAD', path, verify=False, timeout=self.timeout, cert=self.cert)
+            else:
+                result = self.session.request('GET', path, verify=False, timeout=self.timeout, cert=self.cert)
             if result.status_code == 200:
                 return True
             elif result.status_code in [401, ]:

rucio/rse/rsemanager.py

@@ -24,7 +24,7 @@ from rucio.common.checksum import GLOBALLY_SUPPORTED_CHECKSUMS
 from rucio.common.config import config_get_int
 from rucio.common.constraints import STRING_TYPES
 from rucio.common.logging import formatted_logger
-from rucio.common.utils import make_valid_did
+from rucio.common.utils import get_transfer_schemas, make_valid_did
 
 if TYPE_CHECKING:
     from collections.abc import Callable
@@ -875,7 +875,7 @@ def __check_compatible_scheme(
 
     if dest_scheme == src_scheme:
         return True
-    if src_scheme in constants.SCHEME_MAP.get(dest_scheme, []):
+    if src_scheme in get_transfer_schemas().get(dest_scheme, []):
         return True
 
     return False

rucio/tests/common.py

@@ -102,13 +102,13 @@ def scope_name_generator() -> str:
 
 
 def did_name_generator(did_type: str = 'file', name_prefix: str = '', name_suffix: str = '', path: Optional[str] = None) -> str:
-    """ Generate random did name.
+    """ Generate random DID name.
     :param did_type: A string to create a meaningful did_name depending on the did_type (file, dataset, container)
-    :param name_prefix: String to prefix to the did name
-    :param name_suffix: String to append to the did name
+    :param name_prefix: String to prefix to the DID name
+    :param name_suffix: String to append to the DID name
     :param path: If specified, use the path to generate the did_name
 
-    :returns: A random did name
+    :returns: A random DID name
     """
     if os.getenv('POLICY') == 'belleii':
         if path is not None:

rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '37.4.0',
+    'version': '37.6.0',
     'branch_nick': 'release-37',
-    'revision_id': '20eed71b1dd6d1d8e550966b7d40ea730a16c7d8',
-    'revno': 13754
+    'revision_id': '30f77937bd8dd8b480072448e64a5398dbad0c9f',
+    'revno': 13789
 }

rucio/web/rest/flaskapi/v1/accountlimits.py

@@ -35,13 +35,13 @@ class LocalAccountLimit(ErrorHandlingMethodView):
         parameters:
         - name: account
           in: path
-          description: The account for the accountlimit.
+          description: "The account for the accountlimit."
           schema:
             type: string
           style: simple
         - name: rse
           in: path
-          description: The rse for the accountlimit.
+          description: "The rse for the accountlimit."
           schema:
             type: string
           style: simple
@@ -54,20 +54,20 @@ class LocalAccountLimit(ErrorHandlingMethodView):
                 - bytes
                 properties:
                   bytes:
-                    description: The new limit in bytes.
+                    description: "The new limit in bytes."
                     type: integer
         responses:
           201:
-            description: OK
+            description: "OK"
             content:
               application/json:
                 schema:
                   type: string
                   enum: ['Created']
           401:
-            description: Invalid Auth Token
+            description: "Invalid Auth Token"
           404:
-            description: No RSE or account found for the given id.
+            description: "No RSE or account found for the given id."
         """
         parameters = json_parameters()
         bytes_param = param_get(parameters, 'bytes')
@@ -89,23 +89,23 @@ class LocalAccountLimit(ErrorHandlingMethodView):
         parameters:
         - name: account
           in: path
-          description: The account for the accountlimit.
+          description: "The account for the accountlimit."
           schema:
             type: string
           style: simple
         - name: rse
           in: path
-          description: The rse for the accountlimit.
+          description: "The rse for the accountlimit."
           schema:
             type: string
           style: simple
         responses:
           200:
-            description: OK
+            description: "OK"
           401:
-            description: Invalid Auth Token
+            description: "Invalid Auth Token"
           404:
-            description: No RSE or account found for the given id.
+            description: "No RSE or account found for the given id."
         """
         try:
             delete_local_account_limit(account=account, rse=rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
@@ -127,13 +127,13 @@ class GlobalAccountLimit(ErrorHandlingMethodView):
         parameters:
         - name: account
           in: path
-          description: The account for the accountlimit.
+          description: "The account for the accountlimit."
           schema:
             type: string
           style: simple
         - name: rse_expression
           in: path
-          description: The rse expression for the accountlimit.
+          description: "The rse expression for the accountlimit."
           schema:
             type: string
           style: simple
@@ -146,20 +146,20 @@ class GlobalAccountLimit(ErrorHandlingMethodView):
                 - bytes
                 properties:
                   bytes:
-                    description: The new limit in bytes.
+                    description: "The new limit in bytes."
                     type: integer
         responses:
           201:
-            description: OK
+            description: "OK"
             content:
               application/json:
                 schema:
                   type: string
                   enum: ['Created']
           401:
-            description: Invalid Auth Token
+            description: "Invalid Auth Token"
           404:
-            description: No RSE or account found for the given id.
+            description: "No RSE or account found for the given id."
         """
         parameters = json_parameters()
         bytes_param = param_get(parameters, 'bytes')
@@ -187,23 +187,23 @@ class GlobalAccountLimit(ErrorHandlingMethodView):
         parameters:
         - name: account
           in: path
-          description: The account for the accountlimit.
+          description: "The account for the accountlimit."
           schema:
             type: string
           style: simple
         - name: rse_expression
           in: path
-          description: The rse expression for the accountlimit.
+          description: "The rse expression for the accountlimit."
           schema:
             type: string
           style: simple
         responses:
           200:
-            description: OK
+            description: "OK"
           401:
-            description: Invalid Auth Token
+            description: "Invalid Auth Token"
           404:
-            description: No RSE or account found for the given id.
+            description: "No RSE or account found for the given id."
         """
         try:
             delete_global_account_limit(account=account, rse_expression=rse_expression, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))