rucio-clients 37.4.0__tar.gz → 37.5.0__tar.gz

{rucio_clients-37.4.0 → rucio_clients-37.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio-clients
-Version: 37.4.0
+Version: 37.5.0
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio_clients-37.4.0 → rucio_clients-37.5.0}/lib/rucio/client/downloadclient.py

@@ -1323,7 +1323,7 @@ class DownloadClient:
     def _resolve_one_item_dids(self, item: dict[str, Any]) -> "Iterator[dict[str, Any]]":
         """
         Resolve scopes or wildcard DIDs to lists of full did names:
-        
+
         Parameters
         ----------
         item :

{rucio_clients-37.4.0 → rucio_clients-37.5.0}/lib/rucio/client/requestclient.py

@@ -19,8 +19,8 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import TransferLimitDirection
 from rucio.common.utils import build_url
-from rucio.db.sqla.constants import TransferLimitDirection
 
 if TYPE_CHECKING:
     from collections.abc import Iterator, Sequence
@@ -192,14 +192,15 @@ class RequestClient(BaseClient):
         :param strategy: defines how to handle datasets: `fifo` (each file released separately) or `grouped_fifo` (wait for the entire dataset to fit)
         :param transfers: Current number of active transfers
         :param waitings: Current number of waiting transfers
-        
+
         :returns: True if the transfer limit was deleted
         """
         path = '/'.join([self.REQUEST_BASEURL, 'transfer_limits'])
         url = build_url(choice(self.list_hosts), path=path)
-        data = dumps({'rse_expression': rse_expression, 'activity': activity, 'direction': direction.value,
-                'max_transfers': max_transfers, 'volume': volume, 'deadline': deadline, 'strategy': strategy,
-                'transfers': transfers, 'waitings': waitings})
+        data = dumps({'rse_expression': rse_expression, 'activity': activity,
+                      'direction': direction.value, 'max_transfers': max_transfers,
+                      'volume': volume, 'deadline': deadline, 'strategy': strategy,
+                      'transfers': transfers, 'waitings': waitings})
         r = self._send_request(url, type_='PUT', data=data)
 
         if r.status_code == codes.created:

{rucio_clients-37.4.0 → rucio_clients-37.5.0}/lib/rucio/common/constants.py

@@ -16,8 +16,6 @@ import enum
 from collections import namedtuple
 from typing import Literal, get_args
 
-from rucio.common.config import config_get_bool
-
 """
 Constants.
 
@@ -32,21 +30,16 @@ RESERVED_KEYS = ['scope', 'name', 'account', 'did_type', 'is_open', 'monotonic',
 KEY_TYPES = ['ALL', 'COLLECTION', 'FILE', 'DERIVED']
 # all(container, dataset, file), collection(dataset or container), file, derived(compute from file for collection)
 
-SCHEME_MAP = {'srm': ['srm', 'gsiftp'],
-              'gsiftp': ['srm', 'gsiftp'],
-              'https': ['https', 'davs', 'srm+https', 'cs3s'],
-              'davs': ['https', 'davs', 'srm+https', 'cs3s'],
-              'srm+https': ['https', 'davs', 'srm+https', 'cs3s'],
-              'cs3s': ['https', 'davs', 'srm+https', 'cs3s'],
-              'root': ['root'],
-              'scp': ['scp'],
-              'rsync': ['rsync'],
-              'rclone': ['rclone']}
-if config_get_bool('transfers', 'srm_https_compatibility', raise_exception=False, default=False):
-    SCHEME_MAP['srm'].append('https')
-    SCHEME_MAP['https'].append('srm')
-    SCHEME_MAP['srm'].append('davs')
-    SCHEME_MAP['davs'].append('srm')
+BASE_SCHEME_MAP = {'srm': ['srm', 'gsiftp'],
+                   'gsiftp': ['srm', 'gsiftp'],
+                   'https': ['https', 'davs', 'srm+https', 'cs3s'],
+                   'davs': ['https', 'davs', 'srm+https', 'cs3s'],
+                   'srm+https': ['https', 'davs', 'srm+https', 'cs3s'],
+                   'cs3s': ['https', 'davs', 'srm+https', 'cs3s'],
+                   'root': ['root'],
+                   'scp': ['scp'],
+                   'rsync': ['rsync'],
+                   'rclone': ['rclone']}
 
 SORTING_ALGORITHMS_LITERAL = Literal['geoip', 'custom_table', 'random']
 SORTING_ALGORITHMS = list(get_args(SORTING_ALGORITHMS_LITERAL))
@@ -76,6 +69,10 @@ FTS_JOB_TYPE = namedtuple('FTS_JOB_TYPE', ['MULTIPLE_REPLICA', 'MULTI_HOP', 'SES
 
 MAX_MESSAGE_LENGTH = 4000
 
+@enum.unique
+class TransferLimitDirection(enum.Enum):
+    SOURCE = 'S'
+    DESTINATION = 'D'
 
 @enum.unique
 class SuspiciousAvailability(enum.Enum):

{rucio_clients-37.4.0 → rucio_clients-37.5.0}/lib/rucio/common/utils.py

@@ -32,7 +32,7 @@ import threading
 import time
 from collections import OrderedDict
 from enum import Enum
-from functools import wraps
+from functools import cache, wraps
 from io import StringIO
 from itertools import zip_longest
 from typing import TYPE_CHECKING, Any, Optional, TypeVar, Union
@@ -42,7 +42,8 @@ from xml.etree import ElementTree
 
 import requests
 
-from rucio.common.config import config_get
+from rucio.common.config import config_get, config_get_bool
+from rucio.common.constants import BASE_SCHEME_MAP
 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
@@ -1690,3 +1691,18 @@ def is_method_overridden(obj, base_cls, method_name):
     if getattr(type(obj), method_name, None) is getattr(base_cls, method_name, None):  # Caring for bound/unbound cases
         return False
     return True
+
+
+@cache
+def get_transfer_schemas() -> dict[str, list[str]]:
+    """
+    Extend base schema map based on SRM HTTPS compatibility.
+    """
+    scheme_map = BASE_SCHEME_MAP
+    if config_get_bool('transfers', 'srm_https_compatibility', raise_exception=False, default=False):
+        scheme_map['srm'].append('https')
+        scheme_map['https'].append('srm')
+        scheme_map['srm'].append('davs')
+        scheme_map['davs'].append('srm')
+
+    return scheme_map

{rucio_clients-37.4.0 → rucio_clients-37.5.0}/lib/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_clients-37.4.0 → rucio_clients-37.5.0}/lib/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.5.0',
     'branch_nick': 'release-37',
-    'revision_id': '20eed71b1dd6d1d8e550966b7d40ea730a16c7d8',
-    'revno': 13754
+    'revision_id': '092cfe864848019a987a3a167120cf5cf7df2f61',
+    'revno': 13761
 }

{rucio_clients-37.4.0 → rucio_clients-37.5.0}/tests/test_conveyor.py

@@ -452,6 +452,7 @@ def test_multisource(vo, did_factory, root_account, replica_client, caches_mock,
     )
 
 
+@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.dirty(reason="leaves files in XRD containers")
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER])
@@ -525,6 +526,7 @@ def test_multisource_receiver(vo, did_factory, replica_client, root_account, met
         RECEIVER_GRACEFUL_STOP.clear()
 
 
+@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER])
 @pytest.mark.parametrize("caches_mock", [{"caches_to_mock": [
@@ -579,6 +581,7 @@ def test_multihop_receiver_on_failure(vo, did_factory, replica_client, root_acco
         RECEIVER_GRACEFUL_STOP.clear()
 
 
+@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER])
 @pytest.mark.parametrize("caches_mock", [{"caches_to_mock": [
@@ -623,6 +626,7 @@ def test_multihop_receiver_on_success(vo, did_factory, root_account, caches_mock
         RECEIVER_GRACEFUL_STOP.clear()
 
 
+@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.dirty(reason="leaves files in XRD containers")
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER, NoParallelGroups.POLLER])
@@ -692,6 +696,7 @@ def test_receiver_archiving(vo, did_factory, root_account, caches_mock, scitags_
             RECEIVER_GRACEFUL_STOP.clear()
 
 
+@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.PREPARER, NoParallelGroups.THROTTLER, NoParallelGroups.SUBMITTER, NoParallelGroups.POLLER])
 @pytest.mark.parametrize("file_config_mock", [{
@@ -1023,6 +1028,7 @@ def test_failed_transfers_to_mas_existing_replica(rse_factory, did_factory, root
     assert rule_core.get_rule(rule2_id)['state'] == RuleState.STUCK
 
 
+@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER, NoParallelGroups.POLLER, NoParallelGroups.FINISHER])
 def test_lost_transfers(rse_factory, did_factory, root_account):
@@ -1425,6 +1431,7 @@ def test_multi_vo_certificates(file_config_mock, rse_factory, did_factory, scope
         assert sorted(certs_used_by_poller) == ['DEFAULT_DUMMY_CERT', 'NEW_VO_DUMMY_CERT']
 
 
+@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER, NoParallelGroups.POLLER, NoParallelGroups.FINISHER])
 @pytest.mark.parametrize("core_config_mock", [
@@ -1556,6 +1563,7 @@ def test_two_multihops_same_intermediate_rse(rse_factory, did_factory, root_acco
     assert dict_stats[rse2_id][rse1_id]['bytes_done'] == 2
 
 
+@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER, NoParallelGroups.POLLER])
 def test_checksum_validation(rse_factory, did_factory, root_account):
@@ -1608,6 +1616,7 @@ def test_checksum_validation(rse_factory, did_factory, root_account):
     assert request['state'] == RequestState.FAILED
 
 
+@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER])
 @pytest.mark.parametrize("file_config_mock", [

{rucio_clients-37.4.0 → rucio_clients-37.5.0}/tests/test_gateway_external_representation.py

@@ -137,7 +137,7 @@ class TestGatewayExternalRepresentation:
         gateway_acc_lim.set_local_account_limit(account_name, rse1, 10000, issuer='root', vo=vo)
         gateway_acc_lim.set_global_account_limit(account_name, rse_expr, 20000, issuer='root', vo=vo)
 
-        out = gateway_acc_lim.get_local_account_limit(account_name,rse=None, vo=vo)
+        out = gateway_acc_lim.get_local_account_limit(account_name, rse=None, vo=vo)
         assert rse1 in out
         assert rse1_id not in out
 

{rucio_clients-37.4.0 → rucio_clients-37.5.0}/tests/test_throttler.py

@@ -17,6 +17,7 @@ from datetime import datetime, timedelta
 import pytest
 from sqlalchemy import delete
 
+from rucio.common.constants import TransferLimitDirection
 from rucio.common.utils import generate_uuid
 from rucio.core.did import add_did, attach_dids
 from rucio.core.distance import add_distance
@@ -34,7 +35,7 @@ from rucio.core.request import (
 from rucio.daemons.conveyor.preparer import preparer
 from rucio.daemons.conveyor.throttler import throttler
 from rucio.db.sqla import models
-from rucio.db.sqla.constants import DIDType, RequestState, RequestType, TransferLimitDirection
+from rucio.db.sqla.constants import DIDType, RequestState, RequestType
 from rucio.db.sqla.session import get_session, transactional_session
 from rucio.tests.common import skiplimitedsql