rucio-clients 35.2.0__tar.gz → 35.3.0__tar.gz

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/MANIFEST.in

@@ -2,7 +2,7 @@ include MANIFEST.in pylintrc
 include AUTHORS
 include LICENSE
 include ChangeLog
-include README.rst
+include README.md
 include setuputil.py
 include setup.py
 include setup.cfg

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/PKG-INFO

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

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/lib/rucio/client/baseclient.py

@@ -137,6 +137,7 @@ class BaseClient:
             self.logger.debug('No trace_host passed. Using rucio_host instead')
 
         self.list_hosts = [self.host]
+        self.account = account
         self.ca_cert = ca_cert
         self.auth_token = ""
         self.headers = {}
@@ -170,10 +171,11 @@ class BaseClient:
                 except (NoOptionError, NoSectionError):
                     self.logger.debug('No ca_cert found in configuration. Falling back to Mozilla default CA bundle (certifi).')
                     self.ca_cert = True
+                except ConfigNotFound:
+                    self.logger.debug('No configuration found. Falling back to Mozilla default CA bundle (certifi).')
+                    self.ca_cert = True
 
-        if account is not None:
-            self.account = account
-        else:
+        if account is None:
             self.logger.debug('No account passed. Trying to get it from the RUCIO_ACCOUNT environment variable or the config file.')
             try:
                 self.account = environ['RUCIO_ACCOUNT']
@@ -196,6 +198,9 @@ class BaseClient:
                 except (NoOptionError, NoSectionError):
                     self.logger.debug('No VO found. Using default VO.')
                     self.vo = 'def'
+                except ConfigNotFound:
+                    self.logger.debug('No configuration found. Using default VO.')
+                    self.vo = 'def'
 
         self.auth_token_file_path, self.token_exp_epoch_file, self.token_file, self.token_path = self._get_auth_tokens()
         self.__authenticate()

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/lib/rucio/common/exception.py

@@ -962,11 +962,11 @@ class NoDistance(RucioException):
 
 class PolicyPackageNotFound(RucioException):
     """
-    The policy package specified in the config file cannot be loaded.
+    The policy package specified in the config file was not found
     """
     def __init__(self, *args, **kwargs):
         super(PolicyPackageNotFound, self).__init__(*args, **kwargs)
-        self._message = 'The specified policy package cannot be loaded'
+        self._message = 'The specified policy package was not found'
         self.error_code = 93
 
 
@@ -1099,3 +1099,23 @@ class SortingAlgorithmNotSupported(RucioException):
         super(SortingAlgorithmNotSupported, self).__init__(*args, **kwargs)
         self._message = 'Sorting algorithm is not supported.'
         self.error_code = 106
+
+
+class ErrorLoadingPolicyPackage(RucioException):
+    """
+    An error occurred while loading the policy package.
+    """
+    def __init__(self, *args, **kwargs):
+        super(ErrorLoadingPolicyPackage, self).__init__(*args, **kwargs)
+        self._message = 'An error occurred while loading the specified policy package'
+        self.error_code = 107
+
+
+class TraceValidationSchemaNotFound(RucioException):
+    """
+    Trace validation schema not found.
+    """
+    def __init__(self, *args, **kwargs):
+        super(TraceValidationSchemaNotFound, self).__init__(*args, **kwargs)
+        self._message = 'Trace validation schema not found.'
+        self.error_code = 108

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/lib/rucio/common/schema/__init__.py

@@ -60,8 +60,10 @@ if not multivo:
 
     try:
         module = importlib.import_module(POLICY)
-    except ImportError:
+    except ModuleNotFoundError:
         raise exception.PolicyPackageNotFound('Module ' + POLICY + ' not found')
+    except ImportError:
+        raise exception.ErrorLoadingPolicyPackage('An error occurred while loading module ' + POLICY)
 
     schema_modules["def"] = module
     scope_name_regexps.append(module.SCOPE_NAME_REGEXP)
@@ -90,8 +92,10 @@ def load_schema_for_vo(vo: str) -> None:
 
     try:
         module = importlib.import_module(POLICY)
-    except ImportError:
+    except ModuleNotFoundError:
         raise exception.PolicyPackageNotFound('Module ' + POLICY + ' not found')
+    except ImportError:
+        raise exception.ErrorLoadingPolicyPackage('An error occurred while loading module ' + POLICY)
 
     schema_modules[vo] = module
 

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/lib/rucio/common/types.py

@@ -308,6 +308,10 @@ class TraceDict(TraceBaseDict):
     transferEnd: float
 
 
+class TraceSchemaDict(TypedDict):
+    eventType: str
+
+
 class FileToUploadDict(TypedDict):
     path: PathTypeAlias
     rse: str

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/lib/rucio/rse/protocols/protocol.py

@@ -20,7 +20,7 @@ import hashlib
 import logging
 from collections.abc import Callable, Mapping
 from configparser import NoOptionError, NoSectionError
-from typing import Any, TypeVar
+from typing import Any, Optional, TypeVar
 from urllib.parse import urlparse
 
 from rucio.common import config, exception
@@ -46,32 +46,46 @@ class RSEDeterministicScopeTranslation(PolicyPackageAlgorithms):
 
     def __init__(self, vo: str = 'def'):
         super().__init__()
-        self.register("def", RSEDeterministicScopeTranslation._default)
-        self.register("atlas", RSEDeterministicScopeTranslation._atlas)
-        policy_module = vo
+
+        self.register(RSEDeterministicScopeTranslation._default, "def")
+        self.register(RSEDeterministicScopeTranslation._atlas, "atlas")
+
         logger = logging.getLogger(__name__)
+
         try:
             # Use the function defined in the policy package if it's configured so
-            algo_type = self._algorithm_type
             algorithm_name = config.config_get('policy', self._algorithm_type)
         except (NoOptionError, NoSectionError, RuntimeError):
             # Don't use a function from the policy package. Use one defined in this class according to vo
             logger.debug("PFN2LFN function will not be fetched from the policy package")
-            algo_type = self.__class__.__name__
-            if super()._supports(algo_type, policy_module):
-                algorithm_name = policy_module
+            if super()._supports(self._algorithm_type, vo):
+                algorithm_name = vo
             else:
                 algorithm_name = "def"
 
-        self.parser = self.get_parser(algo_type, algorithm_name)
+        self.parser = self.get_parser(algorithm_name)
 
     @classmethod
-    def get_parser(cls, algorithm_type: str, algorithm_name: str) -> Callable[..., Any]:
-        return super()._get_one_algorithm(algorithm_type, algorithm_name)
+    def get_parser(cls, algorithm_name: str) -> Callable[..., Any]:
+        return super()._get_one_algorithm(cls._algorithm_type, algorithm_name)
 
     @classmethod
-    def register(cls, name: str, func: Callable) -> None:
-        super()._register(cls.__name__, {name: func})
+    def register(
+        cls,
+        pfn2lfn_callable: Callable,
+        name: Optional[str] = None
+    ) -> None:
+        """
+        Provided a callable function, register it as one of the valid PFN2LFN algorithms.
+
+
+        :param pfn2lfn_callable: Callable function to use.
+        :param name: Algorithm name used for registration.
+        """
+        if name is None:
+            name = pfn2lfn_callable.__name__
+        algorithm_dict = {name: pfn2lfn_callable}
+        super()._register(cls._algorithm_type, algorithm_dict)
 
     @staticmethod
     def _default(parsed_pfn: Mapping[str, str]) -> tuple[str, str]:

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '35.2.0',
+    'version': '35.3.0',
     'branch_nick': 'release-35-LTS',
-    'revision_id': 'a65e2d745f9f37bc4951eb99d28283a6833e63f6',
-    'revno': 13125
+    'revision_id': 'f6b86349677cb344f3a3db2c12f0841accc9a5ca',
+    'revno': 13148
 }

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/setup.cfg

@@ -4,7 +4,7 @@ force-manifest = 1
 
 [metadata]
 description-file = 
-	README.rst
+	README.md
 
 [egg_info]
 tag_build = 

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/tests/test_dumper_consistency.py

@@ -17,7 +17,7 @@ import os
 from datetime import datetime
 from unittest import mock
 
-from rucio.common.dumper.consistency import Consistency, _try_to_advance, compare3, gnu_sort, min3, parse_and_filter_file
+from rucio.common.dumper.consistency import Consistency, _try_to_advance, compare3, gnu_sort, min_value, parse_and_filter_file
 from rucio.tests.common import make_temp_file
 
 RSEPROTOCOL = {
@@ -282,17 +282,17 @@ class TestConsistency:
         ]
         assert value == expected
 
-    def test_min3_simple_strings(self, tmp_path):
+    def test_min_value_simple_strings(self, tmp_path):
         ''' DUMPER '''
-        assert min3('a', 'b', 'c') == 'a'
+        assert min_value('a', 'b', 'c') == 'a'
 
-    def test_min3_repeated_strings(self, tmp_path):
+    def test_min_value_repeated_strings(self, tmp_path):
         ''' DUMPER '''
-        assert min3('b', 'a', 'a') == 'a'
+        assert min_value('b', 'a', 'a') == 'a'
 
-    def test_min3_parsing_the_strings_is_not_a_responsability_of_this_function(self, tmp_path):
+    def test_min_value_parsing_the_strings_is_not_a_responsability_of_this_function(self, tmp_path):
         ''' DUMPER '''
-        assert min3('a,b', 'cab', 'b,a') == 'a,b'
+        assert min_value('a,b', 'cab', 'b,a') == 'a,b'
 
     def test_parse_and_filter_file_default_parameters(self, tmp_path):
         ''' DUMPER '''

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/tests/test_heartbeat.py

@@ -20,7 +20,7 @@ import pytest
 from sqlalchemy import delete, update
 
 from rucio.core.heartbeat import cardiac_arrest, die, list_heartbeats, list_payload_counts, live, sanity_check
-from rucio.db.sqla.models import Heartbeats
+from rucio.db.sqla.models import Heartbeat
 from rucio.db.sqla.session import transactional_session
 
 
@@ -36,9 +36,9 @@ def executable_factory(function_scope_prefix, db_session):
     yield _create_executable
 
     stmt = delete(
-        Heartbeats
+        Heartbeat
     ).where(
-        Heartbeats.executable.in_(executables)
+        Heartbeat.executable.in_(executables)
     )
     db_session.execute(stmt)
 
@@ -165,19 +165,19 @@ class TestHeartbeat:
             two_days_ago = datetime.utcnow() - timedelta(days=2)
             a_dozen_hours_ago = datetime.utcnow() - timedelta(hours=12)
             stmt = update(
-                Heartbeats
+                Heartbeat
             ).where(
-                Heartbeats.hostname == 'host1'
+                Heartbeat.hostname == 'host1'
             ).values({
-                Heartbeats.updated_at: two_days_ago
+                Heartbeat.updated_at: two_days_ago
             })
             session.execute(stmt)
             stmt = update(
-                Heartbeats
+                Heartbeat
             ).where(
-                Heartbeats.hostname == 'host2'
+                Heartbeat.hostname == 'host2'
             ).values({
-                Heartbeats.updated_at: a_dozen_hours_ago
+                Heartbeat.updated_at: a_dozen_hours_ago
             })
             session.execute(stmt)
 

{rucio_clients-35.2.0 → rucio_clients-35.3.0}/tests/test_trace.py

@@ -20,7 +20,7 @@ import uuid
 
 import pytest
 
-from rucio.common.exception import InvalidObject
+from rucio.common.exception import InvalidObject, TraceValidationSchemaNotFound
 from rucio.common.schema.generic import IPv4orIPv6
 from rucio.core.trace import SCHEMAS, validate_schema
 
@@ -86,12 +86,8 @@ def test_trace_ip():
             validate_schema(obj)
 
 
-def test_non_existant_event_type_validation_rejection(caplog):
-    """
-    Test if an incoming trace with a non-supported schema logs a warning
-    instead of printing entire stack-trace
-    """
+def test_non_existant_event_type_validation_rejection():
     event_type = "put_new_type"
     obj = json.dumps({"eventType": f"{event_type}"})
-    validate_schema(obj)
-    assert f"schema for eventType {event_type} is not currently supported" in caplog.text
+    with pytest.raises(TraceValidationSchemaNotFound):
+        validate_schema(obj)