rucio-clients 36.1.0__tar.gz → 36.2.0__tar.gz

{rucio_clients-36.1.0 → rucio_clients-36.2.0}/PKG-INFO

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

{rucio_clients-36.1.0 → rucio_clients-36.2.0}/bin/rucio

@@ -21,6 +21,16 @@ from rucio.client.commands.bin_legacy.rucio import main as main_legacy
 from rucio.client.commands.command import main
 
 
+def _get_first_command(args: list[str]) -> Optional[str]:
+    return next(
+        (
+            arg for arg in args
+            if arg != 'rucio' and (arg[0] != "-" or arg in ("-h", "--help", "--version"))
+        ),
+        None
+    )
+
+
 def make_warning():
     base_warning = "\nWARNING: This method is being deprecated."
     new_command = map_legacy_command()
@@ -33,10 +43,7 @@ def make_warning():
 
 
 def map_legacy_command() -> Optional[list[str]]:
-    try:
-        command = [arg for arg in sys.argv if arg[0] != "-" or arg in ("-h", "--version")][1]
-    except IndexError:
-        command = None
+    command = _get_first_command(sys.argv[1:])
 
     new_command = None
     if command not in ("-h", "--version", None):
@@ -89,7 +96,9 @@ def map_legacy_command() -> Optional[list[str]]:
 
 if __name__ == "__main__":
     commands = ("-h", "--help", "--version", "account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download")
-    first_command = [arg for arg in sys.argv if arg[0] != "-" or arg in ("-h", "--help", "--version")][1]
+
+    first_command = _get_first_command(sys.argv[1:])
+
     is_legacy = '--legacy' in sys.argv
 
     if (first_command in commands) and not is_legacy:

{rucio_clients-36.1.0 → rucio_clients-36.2.0}/bin/rucio-admin

@@ -20,7 +20,10 @@ from rucio.client.commands.bin_legacy.rucio_admin import main as main_legacy
 def make_warning():
     base_warning = "\nWARNING: This method is being deprecated."
     args = [arg for arg in sys.argv if arg[0] != "-" or arg in ("-h", "--help", "--version")]
-    first_command = args[1]
+    try:
+        first_command = args[1]
+    except IndexError:
+        first_command = None
     try:
         second_command = args[2]
     except IndexError:

{rucio_clients-36.1.0 → rucio_clients-36.2.0}/lib/rucio/client/commands/bin_legacy/rucio_admin.py

@@ -418,7 +418,6 @@ def info_rse(args, client, logger, console, spinner):
     if cli_config == 'rich':
         table = generate_table(table_data, row_styles=['none'], col_alignments=['left', 'left'])
         output.append(table)
-        table_data = []
     else:
         print('Protocols:')
         print('==========')
@@ -430,6 +429,7 @@ def info_rse(args, client, logger, console, spinner):
         else:
             print('  ' + protocol['scheme'])
 
+        table_data = []
         for item in sorted(protocol):
             if cli_config == 'rich':
                 if item == 'domains':
@@ -447,10 +447,11 @@ def info_rse(args, client, logger, console, spinner):
                 else:
                     print('    ' + item + ': ' + str(protocol[item]))
 
-    if cli_config == 'rich':
-        table = generate_table(table_data, col_alignments=['left', 'left'], row_styles=['none'])
-        output.append(Padding.indent(table, 2))
+        if cli_config == 'rich':
+            table = generate_table(table_data, col_alignments=['left', 'left'], row_styles=['none'])
+            output.append(Padding.indent(table, 2))
 
+    if cli_config == 'rich':
         header = ['SOURCE', 'USED', 'FILES', 'FREE', 'TOTAL', 'UPDATED AT']
         key2id = {header[i].lower().replace(' ', '_'): i for i in range(len(header))}
         table_data = []

{rucio_clients-36.1.0 → rucio_clients-36.2.0}/lib/rucio/common/config.py

@@ -17,10 +17,11 @@
 import configparser
 import json
 import os
+from functools import cache
 from typing import TYPE_CHECKING, Any, Optional, TypeVar, Union, overload
 
 from rucio.common import exception
-from rucio.common.exception import ConfigNotFound, DatabaseException
+from rucio.common.exception import ConfigLoadingError, ConfigNotFound, DatabaseException
 
 _T = TypeVar('_T')
 _U = TypeVar('_U')
@@ -656,7 +657,6 @@ def __config_get_table(
     :raises ConfigNotFound
     :raises DatabaseException
     """
-    global __CONFIG
     try:
         from rucio.core.config import get as core_config_get
         return core_config_get(section, option, default=default, session=session, use_cache=use_cache,
@@ -665,7 +665,7 @@ def __config_get_table(
         if raise_exception and default is None:
             raise err
         if clean_cached:
-            __CONFIG = None
+            clean_cached_config()
         return default
 
 
@@ -753,21 +753,15 @@ def get_rse_credentials(path_to_credentials_file: Optional[Union[str, os.PathLik
     return credentials
 
 
-__CONFIG = None
-
-
+@cache
 def get_config() -> configparser.ConfigParser:
     """Factory function for the configuration class. Returns the ConfigParser instance."""
-    global __CONFIG
-    if __CONFIG is None:
-        __CONFIG = Config()
-    return __CONFIG.parser
+    return Config().parser
 
 
 def clean_cached_config() -> None:
     """Deletes the cached config singleton instance."""
-    global __CONFIG
-    __CONFIG = None
+    get_config.cache_clear()
 
 
 class Config:
@@ -790,7 +784,4 @@ class Config:
                     '\n\t' + '\n\t'.join(configs))
 
         if not self.parser.read(self.configfile) == [self.configfile]:
-            raise ConfigNotFound(
-                'Could not load Rucio configuration file. '
-                'Rucio tried loading the following configuration file:'
-                '\n\t' + self.configfile)
+            raise ConfigLoadingError(self.configfile)

{rucio_clients-36.1.0 → rucio_clients-36.2.0}/lib/rucio/common/exception.py

@@ -1167,3 +1167,18 @@ class ChecksumCalculationError(RucioException):
         self.filepath = filepath
         self._message = 'An error occurred while calculating the %s checksum of file %s.' % (self.algorithm_name, self.filepath)
         self.error_code = 111
+
+
+class ConfigLoadingError(RucioException):
+    """
+    An error occurred while loading the configuration.
+    """
+    def __init__(
+            self,
+            config_file: str,
+            *args,
+            **kwargs
+    ):
+        super(ConfigLoadingError, self).__init__(*args, **kwargs)
+        self._message = 'Could not load Rucio configuration file. Rucio tried loading the following configuration file:\n\t %s' % (config_file)
+        self.error_code = 112

{rucio_clients-36.1.0 → rucio_clients-36.2.0}/lib/rucio/rse/translation.py

@@ -18,6 +18,7 @@ from typing import TYPE_CHECKING, Any, Optional
 
 from rucio.common import config
 from rucio.common.constants import RseAttr
+from rucio.common.exception import ConfigNotFound
 from rucio.common.plugins import PolicyPackageAlgorithms
 
 if TYPE_CHECKING:
@@ -38,7 +39,7 @@ class RSEDeterministicScopeTranslation(PolicyPackageAlgorithms):
 
         try:
             algorithm_name = config.config_get('policy', self._algorithm_type)
-        except (NoOptionError, NoSectionError, RuntimeError):
+        except (ConfigNotFound, NoOptionError, NoSectionError, RuntimeError):
             logger.debug("PFN2LFN: no algorithm specified in the config.")
             if super()._supports(self._algorithm_type, vo):
                 algorithm_name = vo
@@ -244,7 +245,7 @@ class RSEDeterministicTranslation(PolicyPackageAlgorithms):
         policy_module = None
         try:
             policy_module = config.config_get('policy', 'lfn2pfn_module')
-        except (NoOptionError, NoSectionError):
+        except (ConfigNotFound, NoOptionError, NoSectionError):
             pass
         if policy_module:
             # TODO: The import of importlib is done like this due to a dependency issue with python 2.6 and incompatibility of the module with py3.x

{rucio_clients-36.1.0 → rucio_clients-36.2.0}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '36.1.0',
+    'version': '36.2.0',
     'branch_nick': 'release-36',
-    'revision_id': '7f12d78cdec7d780fc888118c5812d67dfbf20b7',
-    'revno': 13394
+    'revision_id': 'e9fa6a872d7c83dbe41cd74932267cdc5289cfd3',
+    'revno': 13451
 }

{rucio_clients-36.1.0 → rucio_clients-36.2.0}/lib/rucio_clients.egg-info/SOURCES.txt

@@ -138,9 +138,6 @@ tests/test_did.py
 tests/test_did_meta_plugins.py
 tests/test_download.py
 tests/test_dumper.py
-tests/test_dumper_consistency.py
-tests/test_dumper_data_model.py
-tests/test_dumper_path_parsing.py
 tests/test_filter_engine.py
 tests/test_gateway_external_representation.py
 tests/test_heartbeat.py

rucio_clients-36.2.0/tests/test_dumper.py

@@ -0,0 +1,47 @@
+# Copyright European Organization for Nuclear Research (CERN) since 2012
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from io import StringIO
+
+from rucio.common import dumper
+from rucio.tests.common import mock_open
+
+from .mocks import gfal2
+
+
+def test_gfal_download_to_file():
+    gfal_file = StringIO()
+    local_file = StringIO()
+    gfal_file.write('content')
+    gfal_file.seek(0)
+
+    with gfal2.mocked_gfal2(dumper, files={'srm://example.com/file': gfal_file}):
+        dumper.gfal_download_to_file('srm://example.com/file', local_file)
+
+    local_file.seek(0)
+    assert local_file.read() == 'content'
+
+
+def test_gfal_download_creates_file_with_content():
+    gfal_file = StringIO()
+    local_file = StringIO()
+    gfal_file.write('content')
+    gfal_file.seek(0)
+
+    with gfal2.mocked_gfal2(dumper, files={'srm://example.com/file': gfal_file}):
+        with mock_open(dumper, local_file):
+            dumper.gfal_download('srm://example.com/file', 'filename')
+
+    local_file.seek(0)
+    assert local_file.read() == 'content'

{rucio_clients-36.1.0 → rucio_clients-36.2.0}/tests/test_hermes.py

@@ -24,7 +24,7 @@ import pytest
 import requests
 import stomp
 
-from rucio.common.config import config_get, config_get_int
+from rucio.common.config import config_get, config_get_int, config_get_list
 from rucio.core.message import add_message, retrieve_messages, truncate_messages
 from rucio.daemons.hermes import hermes
 from rucio.tests.common import rse_name_generator, skip_missing_elasticsearch_influxdb_in_env
@@ -140,7 +140,7 @@ def test_hermes(core_config_mock, caches_mock):
         add_message(
             "email",
             {
-                "to": config_get("messaging-hermes", "email_test").split(","),
+                "to": config_get_list("messaging-hermes", "email_test"),
                 "subject": "Half-Life %i" % i,
                 "body": """
                               Good morning, and welcome to the Black Mesa Transit System.

rucio_clients-36.1.0/tests/test_dumper.py

@@ -1,237 +0,0 @@
-# Copyright European Organization for Nuclear Research (CERN) since 2012
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import bz2
-import json
-import os
-import tempfile
-from datetime import datetime
-from io import StringIO
-from unittest import mock
-
-import pytest
-import requests
-
-from rucio.common import config, dumper
-from rucio.tests.common import make_temp_file, mock_open
-
-from .mocks import gfal2
-
-DATE_SECONDS = "2015-03-10 14:00:35"
-DATE_TENTHS = "2015-03-10T14:00:35.5"
-DATE_MILLISECONDS = "2015-03-10T14:00:35.5"
-RSEPROTOCOL = {
-    "hostname": "example.com",
-    "scheme": "root",
-    "port": 1094,
-    "prefix": "//atlasdatadisk/rucio/",
-    "domains": {
-        "wan": {
-            "read": 1,
-        }
-    },
-}
-
-
-class MockResponse:
-    def __init__(self, json_data, status_code):
-        self.json_data = json_data
-        self.status_code = status_code
-        self.text = json.dumps(json_data)
-
-    def json(self):
-        return self.json_data
-
-
-def test_http_download_failed_exception_with_no_semantic_errors():
-    with pytest.raises(dumper.HTTPDownloadFailed):
-        raise dumper.HTTPDownloadFailed('some message', 500)
-
-
-def test_error_ends_the_program():
-    with pytest.raises(SystemExit):
-        dumper.error('message', 2)
-
-
-def test_cacert_config_returns_a_string():
-    assert isinstance(dumper.cacert_config(config, '.'), str)
-
-
-@mock.patch('rucio.common.config.config_get')
-def test_cacert_config_returns_false_if_no_cert_configured(mock_get):
-    mock_get.return_value = ''
-    assert not dumper.cacert_config(config, '.')
-
-
-def test_smart_open_for_text_file():
-    tmp = make_temp_file('/tmp', 'abcdef')
-    assert hasattr(dumper.smart_open(tmp), 'read')  # check if object is file - python2/3 compatibility
-    os.unlink(tmp)
-
-
-def test_smart_open_for_bz2_file():
-    fd, path = tempfile.mkstemp()
-    comp = bz2.BZ2Compressor()
-    with os.fdopen(fd, 'wb') as f:
-        f.write(comp.compress(b'abcdef'))
-        f.write(comp.flush())
-    assert not isinstance(dumper.smart_open(path), bz2.BZ2File)
-    os.unlink(path)
-
-
-def test_temp_file_with_final_name_creates_a_tmp_file_and_then_removes_it():
-    final_name = tempfile.mktemp()
-    with dumper.temp_file('/tmp', final_name) as (_, tmp_path):
-        tmp_path = os.path.join('/tmp', tmp_path)
-        assert os.path.exists(tmp_path)
-        assert not os.path.exists(final_name)
-
-    assert os.path.exists(final_name)
-    assert not os.path.exists(tmp_path)
-    os.unlink(final_name)
-
-
-def test_temp_file_with_final_name_creates_a_tmp_file_and_keeps_it():
-    with dumper.temp_file('/tmp') as (_, tmp_path):
-        tmp_path = os.path.join('/tmp', tmp_path)
-        assert os.path.exists(tmp_path)
-
-    assert os.path.exists(tmp_path)
-    os.unlink(tmp_path)
-
-
-def test_temp_file_cleanup_on_exception():
-    try:
-        with dumper.temp_file('/tmp') as (_, tmp_path):
-            tmp_path = os.path.join('/tmp', tmp_path)
-            raise Exception
-    except:
-        pass
-    finally:
-        assert not os.path.exists(tmp_path)
-
-
-def test_temp_file_cleanup_on_exception_with_final_name():
-    final_name = tempfile.mktemp()
-    try:
-        with dumper.temp_file('/tmp', final_name) as (_, tmp_path):
-            tmp_path = os.path.join('/tmp', tmp_path)
-            raise Exception
-    except:
-        pass
-    finally:
-        assert not os.path.exists(tmp_path)
-        assert not os.path.exists(final_name)
-
-
-def test_to_date_format():
-    assert isinstance(dumper.to_datetime(DATE_SECONDS), datetime)
-    assert isinstance(dumper.to_datetime(DATE_TENTHS), datetime)
-    assert isinstance(dumper.to_datetime(DATE_MILLISECONDS), datetime)
-
-
-@mock.patch('rucio.common.dumper.ddmendpoint_preferred_protocol')
-def test_ddmendpoint_url_builds_url_from_ddmendpoint_preferred_protocol(mock_get):
-    mock_get.return_value = RSEPROTOCOL
-    assert dumper.ddmendpoint_url('SOMEENDPOINT') == 'root://example.com:1094//atlasdatadisk/'
-
-
-@mock.patch('rucio.common.dumper.ddmendpoint_preferred_protocol')
-def test_ddmendpoint_url_fails_on_unexistent_entry(mock_get):
-    mock_get.side_effect = StopIteration()
-    with pytest.raises(StopIteration):
-        dumper.ddmendpoint_url('SOMEENDPOINT')
-
-
-@mock.patch('requests.get')
-def test_http_download_to_file_without_session_uses_requests_get(mock_get):
-    response = requests.Response()
-    response.status_code = 200
-    response.iter_content = lambda _: ['content']
-    mock_get.return_value = response
-    stringio = StringIO()
-
-    dumper.http_download_to_file('http://example.com', stringio)
-
-    stringio.seek(0)
-    assert stringio.read() == 'content'
-
-
-def test_http_download_to_file_with_session():
-    response = requests.Response()
-    response.status_code = 200
-    response.iter_content = lambda _: ['content']
-
-    stringio = StringIO()
-    session = requests.Session()
-    session.get = lambda _: response
-
-    dumper.http_download_to_file('http://example.com', stringio, session)
-    stringio.seek(0)
-    assert stringio.read() == 'content'
-
-
-def test_http_download_to_file_throws_exception_on_error():
-    response = requests.Response()
-    response.status_code = 404
-    response.iter_content = lambda _: ['content']
-
-    stringio = StringIO()
-    session = requests.Session()
-    session.get = lambda _: response
-
-    with pytest.raises(dumper.HTTPDownloadFailed):
-        dumper.http_download_to_file('http://example.com', stringio, session)
-
-
-@mock.patch('requests.get')
-def test_http_download_creates_file_with_content(mock_get):
-    response = requests.Response()
-    response.status_code = 200
-    response.iter_content = lambda _: ['abc']
-    stringio = StringIO()
-    mock_get.return_value = response
-
-    with mock_open(dumper, stringio):
-        dumper.http_download('http://example.com', 'filename')
-
-    stringio.seek(0)
-    assert stringio.read() == 'abc'
-
-
-def test_gfal_download_to_file():
-    gfal_file = StringIO()
-    local_file = StringIO()
-    gfal_file.write('content')
-    gfal_file.seek(0)
-
-    with gfal2.mocked_gfal2(dumper, files={'srm://example.com/file': gfal_file}):
-        dumper.gfal_download_to_file('srm://example.com/file', local_file)
-
-    local_file.seek(0)
-    assert local_file.read() == 'content'
-
-
-def test_gfal_download_creates_file_with_content():
-    gfal_file = StringIO()
-    local_file = StringIO()
-    gfal_file.write('content')
-    gfal_file.seek(0)
-
-    with gfal2.mocked_gfal2(dumper, files={'srm://example.com/file': gfal_file}):
-        with mock_open(dumper, local_file):
-            dumper.gfal_download('srm://example.com/file', 'filename')
-
-    local_file.seek(0)
-    assert local_file.read() == 'content'