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

rucio/gateway/subscription.py

@@ -20,19 +20,17 @@ from rucio.common.exception import AccessDenied, InvalidObject
 from rucio.common.schema import validate_schema
 from rucio.common.types import InternalAccount, InternalScope
 from rucio.core import subscription
-from rucio.db.sqla.session import read_session, stream_session, transactional_session
+from rucio.db.sqla.constants import DatabaseOperationType
+from rucio.db.sqla.session import db_session
 from rucio.gateway.permission import has_permission
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-    from sqlalchemy.orm import Session
-
 
 SubscriptionRuleState = namedtuple('SubscriptionRuleState', ['account', 'name', 'state', 'count'])
 
 
-@transactional_session
 def add_subscription(
     name: str,
     account: str,
@@ -42,11 +40,9 @@ def add_subscription(
     lifetime: Union[int, Literal[False]],
     retroactive: bool,
     dry_run: bool,
+    issuer: str,
     priority: Optional[int] = None,
-    issuer: Optional[str] = None,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> str:
     """
     Adds a new subscription which will be verified against every new added file and dataset
@@ -63,53 +59,50 @@ def add_subscription(
     :param priority: The priority of the subscription
     :param issuer:  The account issuing this operation.
     :param vo: The VO to act on.
-    :param session: The database session in use.
     :returns: subscription_id
     """
-    auth_result = has_permission(issuer=issuer, vo=vo, action='add_subscription', kwargs={'account': account}, session=session)
-    if not auth_result.allowed:
-        raise AccessDenied('Account %s can not add subscription. %s' % (issuer, auth_result.message))
-    try:
-        if filter_:
-            if not isinstance(filter_, dict):
-                raise TypeError('filter should be a dict')
-            validate_schema(name='subscription_filter', obj=filter_, vo=vo)
-        if replication_rules:
-            if not isinstance(replication_rules, list):
-                raise TypeError('replication_rules should be a list')
-            else:
-                for rule in replication_rules:
-                    validate_schema(name='activity', obj=rule.get('activity', 'default'), vo=vo)
-        else:
-            raise InvalidObject('You must specify a rule')
-    except ValueError as error:
-        raise TypeError(error)
-
-    internal_account = InternalAccount(account, vo=vo)
-
-    keys = ['scope', 'account']
-    types = [InternalScope, InternalAccount]
-    for _key, _type in zip(keys, types):
-        if _key in filter_:
-            if isinstance(filter_[_key], list):
-                filter_[_key] = [_type(val, vo=vo).internal for val in filter_[_key]]
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = has_permission(issuer=issuer, vo=vo, action='add_subscription', kwargs={'account': account}, session=session)
+        if not auth_result.allowed:
+            raise AccessDenied('Account %s can not add subscription. %s' % (issuer, auth_result.message))
+        try:
+            if filter_:
+                if not isinstance(filter_, dict):
+                    raise TypeError('filter should be a dict')
+                validate_schema(name='subscription_filter', obj=filter_, vo=vo)
+            if replication_rules:
+                if not isinstance(replication_rules, list):
+                    raise TypeError('replication_rules should be a list')
+                else:
+                    for rule in replication_rules:
+                        validate_schema(name='activity', obj=rule.get('activity', 'default'), vo=vo)
             else:
-                filter_[_key] = _type(filter_[_key], vo=vo).internal
+                raise InvalidObject('You must specify a rule')
+        except ValueError as error:
+            raise TypeError(error)
+
+        internal_account = InternalAccount(account, vo=vo)
+
+        keys = ['scope', 'account']
+        types = [InternalScope, InternalAccount]
+        for _key, _type in zip(keys, types):
+            if _key in filter_:
+                if isinstance(filter_[_key], list):
+                    filter_[_key] = [_type(val, vo=vo).internal for val in filter_[_key]]
+                else:
+                    filter_[_key] = _type(filter_[_key], vo=vo).internal
 
-    return subscription.add_subscription(name=name, account=internal_account, filter_=dumps(filter_), replication_rules=dumps(replication_rules),
-                                         comments=comments, lifetime=lifetime, retroactive=retroactive, dry_run=dry_run, priority=priority,
-                                         session=session)
+        return subscription.add_subscription(name=name, account=internal_account, filter_=dumps(filter_), replication_rules=dumps(replication_rules),
+                                             comments=comments, lifetime=lifetime, retroactive=retroactive, dry_run=dry_run, priority=priority,
+                                             session=session)
 
 
-@transactional_session
 def update_subscription(
     name: str,
     account: str,
+    issuer: str,
     metadata: Optional[dict[str, Any]] = None,
-    issuer: Optional[str] = None,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """
     Updates a subscription
@@ -119,53 +112,50 @@ def update_subscription(
     :param metadata: Dictionary of metadata to update. Supported keys : filter, replication_rules, comments, lifetime, retroactive, dry_run, priority, last_processed
     :param issuer: The account issuing this operation.
     :param vo: The VO to act on.
-    :param session: The database session in use.
     :raises: SubscriptionNotFound if subscription is not found
     """
-    auth_result = has_permission(issuer=issuer, vo=vo, action='update_subscription', kwargs={'account': account}, session=session)
-    if not auth_result.allowed:
-        raise AccessDenied('Account %s can not update subscription. %s' % (issuer, auth_result.message))
-    try:
-        if not isinstance(metadata, dict):
-            raise TypeError('metadata should be a dict')
-        if 'filter' in metadata and metadata['filter']:
-            if not isinstance(metadata['filter'], dict):
-                raise TypeError('filter should be a dict')
-            validate_schema(name='subscription_filter', obj=metadata['filter'], vo=vo)
-        if 'replication_rules' in metadata and metadata['replication_rules']:
-            if not isinstance(metadata['replication_rules'], list):
-                raise TypeError('replication_rules should be a list')
-            else:
-                for rule in metadata['replication_rules']:
-                    validate_schema(name='activity', obj=rule.get('activity', 'default'), vo=vo)
-    except ValueError as error:
-        raise TypeError(error)
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = has_permission(issuer=issuer, vo=vo, action='update_subscription', kwargs={'account': account}, session=session)
+        if not auth_result.allowed:
+            raise AccessDenied('Account %s can not update subscription. %s' % (issuer, auth_result.message))
+        try:
+            if not isinstance(metadata, dict):
+                raise TypeError('metadata should be a dict')
+            if 'filter' in metadata and metadata['filter']:
+                if not isinstance(metadata['filter'], dict):
+                    raise TypeError('filter should be a dict')
+                validate_schema(name='subscription_filter', obj=metadata['filter'], vo=vo)
+            if 'replication_rules' in metadata and metadata['replication_rules']:
+                if not isinstance(metadata['replication_rules'], list):
+                    raise TypeError('replication_rules should be a list')
+                else:
+                    for rule in metadata['replication_rules']:
+                        validate_schema(name='activity', obj=rule.get('activity', 'default'), vo=vo)
+        except ValueError as error:
+            raise TypeError(error)
 
-    internal_account = InternalAccount(account, vo=vo)
+        internal_account = InternalAccount(account, vo=vo)
 
-    if 'filter' in metadata and metadata['filter'] is not None:
-        filter_ = metadata['filter']
-        keys = ['scope', 'account']
-        types = [InternalScope, InternalAccount]
+        if 'filter' in metadata and metadata['filter'] is not None:
+            filter_ = metadata['filter']
+            keys = ['scope', 'account']
+            types = [InternalScope, InternalAccount]
 
-        for _key, _type in zip(keys, types):
-            if _key in filter_ and filter_[_key] is not None:
-                if isinstance(filter_[_key], list):
-                    filter_[_key] = [_type(val, vo=vo).internal for val in filter_[_key]]
-                else:
-                    filter_[_key] = _type(filter_[_key], vo=vo).internal
+            for _key, _type in zip(keys, types):
+                if _key in filter_ and filter_[_key] is not None:
+                    if isinstance(filter_[_key], list):
+                        filter_[_key] = [_type(val, vo=vo).internal for val in filter_[_key]]
+                    else:
+                        filter_[_key] = _type(filter_[_key], vo=vo).internal
 
-    return subscription.update_subscription(name=name, account=internal_account, metadata=metadata, session=session)
+        return subscription.update_subscription(name=name, account=internal_account, metadata=metadata, session=session)
 
 
-@stream_session
 def list_subscriptions(
     name: Optional[str] = None,
     account: Optional[str] = None,
     state: Optional[str] = None,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> 'Iterator[dict[str, Any]]':
     """
     Returns a dictionary with the subscription information :
@@ -175,7 +165,6 @@ def list_subscriptions(
     :param account: Account identifier
     :param state: Filter for subscription state
     :param vo: The VO to act on.
-    :param session: The database session in use.
     :returns: Dictionary containing subscription parameter
     :raises: exception.NotFound if subscription is not found
     """
@@ -185,85 +174,78 @@ def list_subscriptions(
     else:
         internal_account = InternalAccount('*', vo=vo)
 
-    subs = subscription.list_subscriptions(name, internal_account, state, session=session)
+    with db_session(DatabaseOperationType.READ) as session:
+        subs = subscription.list_subscriptions(name, internal_account, state, session=session)
 
-    for sub in subs:
-        sub['account'] = sub['account'].external
+        for sub in subs:
+            sub['account'] = sub['account'].external
 
-        if 'filter' in sub:
-            fil = loads(sub['filter'])
-            if 'account' in fil:
-                fil['account'] = [InternalAccount(acc, from_external=False).external for acc in fil['account']]
-            if 'scope' in fil:
-                fil['scope'] = [InternalScope(sco, from_external=False).external for sco in fil['scope']]
-            sub['filter'] = dumps(fil)
+            if 'filter' in sub:
+                fil = loads(sub['filter'])
+                if 'account' in fil:
+                    fil['account'] = [InternalAccount(acc, from_external=False).external for acc in fil['account']]
+                if 'scope' in fil:
+                    fil['scope'] = [InternalScope(sco, from_external=False).external for sco in fil['scope']]
+                sub['filter'] = dumps(fil)
 
-        yield sub
+            yield sub
 
 
-@stream_session
 def list_subscription_rule_states(
     name: Optional[str] = None,
     account: Optional[str] = None,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> 'Iterator[SubscriptionRuleState]':
     """Returns a list of with the number of rules per state for a subscription.
 
     :param name: Name of the subscription
     :param account: Account identifier
     :param vo: The VO to act on.
-    :param session: The database session in use.
     :returns: Sequence with SubscriptionRuleState named tuples (account, name, state, count)
     """
     if account is not None:
         internal_account = InternalAccount(account, vo=vo)
     else:
         internal_account = InternalAccount('*', vo=vo)
-    subs = subscription.list_subscription_rule_states(name, internal_account, session=session)
-    for sub in subs:
-        # sub is an immutable Row so return new named tuple with edited entries
-        d = sub._asdict()
-        d['account'] = d['account'].external
-        yield SubscriptionRuleState(**d)
+
+    with db_session(DatabaseOperationType.READ) as session:
+        subs = subscription.list_subscription_rule_states(name, internal_account, session=session)
+
+        for sub in subs:
+            # sub is an immutable Row so return new named tuple with edited entries
+            d = sub._asdict()
+            d['account'] = d['account'].external
+            yield SubscriptionRuleState(**d)
 
 
-@transactional_session
 def delete_subscription(
     subscription_id: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """
     Deletes a subscription
 
     :param subscription_id: Subscription identifier
     :param vo: The VO of the user issuing command
-    :param session: The database session in use.
     """
 
     raise NotImplementedError
 
 
-@read_session
 def get_subscription_by_id(
     subscription_id: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> dict[str, Any]:
     """
     Get a specific subscription by id.
 
     :param subscription_id: The subscription_id to select.
     :param vo: The VO of the user issuing command.
-    :param session: The database session in use.
 
     :raises: SubscriptionNotFound if no Subscription can be found.
     """
-    sub = subscription.get_subscription_by_id(subscription_id, session=session)
+    with db_session(DatabaseOperationType.READ) as session:
+        sub = subscription.get_subscription_by_id(subscription_id, session=session)
     if sub['account'].vo != vo:
         raise AccessDenied('Unable to get subscription')
 

rucio/vcsversion.py

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

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

@@ -296,7 +296,7 @@ class HeaderRedirector(ErrorHandlingMethodView):
             vo = extract_vo(request.headers)
 
             replicas = list(
-                list_replicas(  # type: ignore (session parameter missing)
+                list_replicas(
                     dids=[{'scope': scope, 'name': name, 'type': 'FILE'}],
                     schemes=schemes,
                     client_location=client_location,

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

@@ -252,7 +252,7 @@ class Replicas(ErrorHandlingMethodView):
             def _list_and_sort_replicas(vo):
                 # we need to call list_replicas before starting to reply
                 # otherwise the exceptions won't be propagated correctly
-                for rfile in list_replicas(dids=dids, schemes=schemes, vo=vo):
+                for rfile in list_replicas(dids=dids, schemes=schemes, vo=vo):  # type: ignore (pending https://github.com/rucio/rucio/issues/7739)
                     replicas = []
                     dictreplica = {}
                     for rse in rfile['rses']: