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

rucio/gateway/account.py

@@ -22,27 +22,22 @@ from rucio.common.types import InternalAccount
 from rucio.common.utils import gateway_update_return_dict
 from rucio.core import account as account_core
 from rucio.core.rse import get_rse_id
-from rucio.db.sqla.constants import AccountType
-from rucio.db.sqla.session import read_session, stream_session, transactional_session
+from rucio.db.sqla.constants import AccountType, DatabaseOperationType
+from rucio.db.sqla.session import db_session
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-    from sqlalchemy.orm import Session
-
     from rucio.common.types import AccountAttributesDict, IdentityDict, UsageDict
     from rucio.db.sqla.models import Account
 
 
-@transactional_session
 def add_account(
     account: str,
     type_: str,
     email: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """
     Creates an account with the provided account name, contact information, etc.
@@ -53,29 +48,27 @@ def add_account(
 
     :param issuer: The issuer account_core.
     :param vo: The VO to act on.
-    :param session: The database session in use.
 
     """
 
     validate_schema(name='account', obj=account, vo=vo)
 
     kwargs = {'account': account, 'type': type_}
-    auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='add_account', kwargs=kwargs, session=session)
-    if not auth_result.allowed:
-        raise rucio.common.exception.AccessDenied('Account %s can not add account. %s' % (issuer, auth_result.message))
 
-    internal_account = InternalAccount(account, vo=vo)
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='add_account', kwargs=kwargs, session=session)
+        if not auth_result.allowed:
+            raise rucio.common.exception.AccessDenied('Account %s can not add account. %s' % (issuer, auth_result.message))
+
+        internal_account = InternalAccount(account, vo=vo)
 
-    account_core.add_account(internal_account, AccountType[type_.upper()], email, session=session)
+        account_core.add_account(internal_account, AccountType[type_.upper()], email, session=session)
 
 
-@transactional_session
 def del_account(
     account: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """
     Disables an account with the provided account name.
@@ -83,25 +76,22 @@ def del_account(
     :param account: The account name.
     :param issuer: The issuer account.
     :param vo: The VO to act on.
-    :param session: The database session in use.
 
     """
     kwargs = {'account': account}
-    auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='del_account', kwargs=kwargs, session=session)
-    if not auth_result.allowed:
-        raise rucio.common.exception.AccessDenied('Account %s can not delete account. %s' % (issuer, auth_result.message))
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='del_account', kwargs=kwargs, session=session)
+        if not auth_result.allowed:
+            raise rucio.common.exception.AccessDenied('Account %s can not delete account. %s' % (issuer, auth_result.message))
 
-    internal_account = InternalAccount(account, vo=vo)
+        internal_account = InternalAccount(account, vo=vo)
 
-    account_core.del_account(internal_account, session=session)
+        account_core.del_account(internal_account, session=session)
 
 
-@read_session
 def get_account_info(
     account: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> "Account":
     """
     Returns the info like the statistics information associated to an account_core.
@@ -109,25 +99,23 @@ def get_account_info(
     :param account: The account name.
     :returns: A list with all account information.
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     """
 
     internal_account = InternalAccount(account, vo=vo)
 
-    acc = account_core.get_account(internal_account, session=session)
-    acc.account = acc.account.external
-    return acc
+    with db_session(DatabaseOperationType.READ) as session:
+        acc = account_core.get_account(internal_account, session=session)
+        acc.account = acc.account.external
+        return acc
 
 
-@transactional_session
 def update_account(
     account: str,
     key: str,
     value: Any,
     issuer: str = 'root',
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """ Update a property of an account_core.
 
@@ -136,21 +124,21 @@ def update_account(
     :param value: Property value.
     :param issuer: The issuer account
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     """
     validate_schema(name='account', obj=account, vo=vo)
     kwargs = {}
-    auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='update_account', kwargs=kwargs, session=session)
-    if not auth_result.allowed:
-        raise rucio.common.exception.AccessDenied('Account %s can not change %s  of the account. %s' % (issuer, key, auth_result.message))
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='update_account', kwargs=kwargs, session=session)
+        if not auth_result.allowed:
+            raise rucio.common.exception.AccessDenied('Account %s can not change %s  of the account. %s' % (issuer, key, auth_result.message))
 
-    internal_account = InternalAccount(account, vo=vo)
+        internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.update_account(internal_account, key, value, session=session)
+        return account_core.update_account(internal_account, key, value, session=session)
 
 
-@stream_session
-def list_accounts(filter_: Optional[dict[str, Any]] = None, vo: str = 'def', *, session: "Session") -> 'Iterator[dict[str, Any]]':
+def list_accounts(filter_: Optional[dict[str, Any]] = None, vo: str = 'def') -> 'Iterator[dict[str, Any]]':
     """
     Lists all the Rucio account names.
 
@@ -158,7 +146,6 @@ def list_accounts(filter_: Optional[dict[str, Any]] = None, vo: str = 'def', *,
 
     :param filter_: Dictionary of attributes by which the input data should be filtered
     :param vo: The VO to act on.
-    :param session: The database session in use.
 
     :returns: List of all accounts.
     """
@@ -169,80 +156,73 @@ def list_accounts(filter_: Optional[dict[str, Any]] = None, vo: str = 'def', *,
         filter_['account'] = InternalAccount(filter_['account'], vo=vo)
     else:
         filter_['account'] = InternalAccount(account='*', vo=vo)
-    for result in account_core.list_accounts(filter_=filter_, session=session):
-        yield gateway_update_return_dict(result, session=session)
+
+    with db_session(DatabaseOperationType.READ) as session:
+        for result in account_core.list_accounts(filter_=filter_, session=session):
+            yield gateway_update_return_dict(result, session=session)
 
 
-@read_session
 def account_exists(
     account: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> bool:
     """
     Checks to see if account exists. This procedure does not check it's status.
 
     :param account: Name of the account.
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     :returns: True if found, otherwise false.
     """
 
     internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.account_exists(internal_account, session=session)
+    with db_session(DatabaseOperationType.READ) as session:
+        return account_core.account_exists(internal_account, session=session)
 
 
-@read_session
 def list_identities(
     account: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> list["IdentityDict"]:
     """
     List all identities on an account_core.
 
     :param account: The account name.
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     """
 
     internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.list_identities(internal_account, session=session)
+    with db_session(DatabaseOperationType.READ) as session:
+        return account_core.list_identities(internal_account, session=session)
 
 
-@read_session
 def list_account_attributes(
     account: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> list["AccountAttributesDict"]:
     """
     Returns all the attributes for the given account.
 
     :param account: The account name.
     :param vo: The VO to act on
-    :param session: The database session in use.
+
     """
 
     internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.list_account_attributes(internal_account, session=session)
+    with db_session(DatabaseOperationType.READ) as session:
+        return account_core.list_account_attributes(internal_account, session=session)
 
 
-@transactional_session
 def add_account_attribute(
     key: str,
     value: Any,
     account: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """
     Add an attribute to an account.
@@ -252,29 +232,27 @@ def add_account_attribute(
     :param account: The account name.
     :param issuer: The issuer account.
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     """
     validate_schema(name='account_attribute', obj=key, vo=vo)
     validate_schema(name='account_attribute', obj=value, vo=vo)
 
     kwargs = {'account': account, 'key': key, 'value': value}
-    auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='add_attribute', kwargs=kwargs, session=session)
-    if not auth_result.allowed:
-        raise rucio.common.exception.AccessDenied('Account %s can not add attributes. %s' % (issuer, auth_result.message))
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='add_attribute', kwargs=kwargs, session=session)
+        if not auth_result.allowed:
+            raise rucio.common.exception.AccessDenied('Account %s can not add attributes. %s' % (issuer, auth_result.message))
 
-    internal_account = InternalAccount(account, vo=vo)
+        internal_account = InternalAccount(account, vo=vo)
 
-    account_core.add_account_attribute(internal_account, key, value, session=session)
+        account_core.add_account_attribute(internal_account, key, value, session=session)
 
 
-@transactional_session
 def del_account_attribute(
     key: str,
     account: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """
     Delete an attribute to an account.
@@ -283,26 +261,24 @@ def del_account_attribute(
     :param account: The account name.
     :param issuer: The issuer account.
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     """
     kwargs = {'account': account, 'key': key}
-    auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='del_attribute', kwargs=kwargs, session=session)
-    if not auth_result.allowed:
-        raise rucio.common.exception.AccessDenied('Account %s can not delete attribute. %s' % (issuer, auth_result.message))
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='del_attribute', kwargs=kwargs, session=session)
+        if not auth_result.allowed:
+            raise rucio.common.exception.AccessDenied('Account %s can not delete attribute. %s' % (issuer, auth_result.message))
 
-    internal_account = InternalAccount(account, vo=vo)
+        internal_account = InternalAccount(account, vo=vo)
 
-    account_core.del_account_attribute(internal_account, key, session=session)
+        account_core.del_account_attribute(internal_account, key, session=session)
 
 
-@read_session
 def get_usage(
     rse: str,
     account: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> "UsageDict":
     """
     Returns current values of the specified counter, or raises CounterNotFound if the counter does not exist.
@@ -311,23 +287,21 @@ def get_usage(
     :param account:          The account name.
     :param issuer:           The issuer account.
     :param vo:               The VO to act on.
-    :param session:          The database session in use.
+
     :returns:                A dictionary with total and bytes.
     """
-    rse_id = get_rse_id(rse=rse, vo=vo, session=session)
-    internal_account = InternalAccount(account, vo=vo)
+    with db_session(DatabaseOperationType.READ) as session:
+        rse_id = get_rse_id(rse=rse, vo=vo, session=session)
+        internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.get_usage(rse_id, internal_account, session=session)
+        return account_core.get_usage(rse_id, internal_account, session=session)
 
 
-@read_session
 def get_usage_history(
     rse: str,
     account: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> list["UsageDict"]:
     """
     Returns historical values of the specified counter, or raises CounterNotFound if the counter does not exist.
@@ -336,10 +310,11 @@ def get_usage_history(
     :param account:          The account name.
     :param issuer:           The issuer account.
     :param vo:               The VO to act on.
-    :param session:          The database session in use.
+
     :returns:                A dictionary with total and bytes.
     """
-    rse_id = get_rse_id(rse=rse, vo=vo, session=session)
-    internal_account = InternalAccount(account, vo=vo)
+    with db_session(DatabaseOperationType.READ) as session:
+        rse_id = get_rse_id(rse=rse, vo=vo, session=session)
+        internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.get_usage_history(rse_id, internal_account, session=session)
+        return account_core.get_usage_history(rse_id, internal_account, session=session)

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/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/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: