rucio-clients 35.0.0rc2__tar.gz → 35.1.0__tar.gz

{rucio_clients-35.0.0rc2 → rucio_clients-35.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rucio-clients
-Version: 35.0.0rc2
+Version: 35.1.0
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio
@@ -21,6 +21,7 @@ License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: requests>=2.32.2
 Requires-Dist: urllib3>=1.26.18
+Requires-Dist: dogpile-cache>=1.2.2
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: jsonschema>=4.20.0
 Provides-Extra: ssh

{rucio_clients-35.0.0rc2 → rucio_clients-35.1.0}/bin/rucio-admin

@@ -1196,7 +1196,9 @@ def declare_temporary_unavailable_replicas(args):
     else:
         bad_files = args.listbadfiles
 
-    assert args.duration is not None, "Duration should have been set, something went wrong!"
+    if args.duration is None:
+        raise ValueError("Duration should have been set, something went wrong!")
+
     expiration_date = (datetime.datetime.utcnow() + datetime.timedelta(seconds=args.duration)).isoformat()
 
     chunk_size = 10000

{rucio_clients-35.0.0rc2 → rucio_clients-35.1.0}/lib/rucio/client/lockclient.py

@@ -69,8 +69,8 @@ class LockClient(BaseClient):
         """
 
         # convert did list to list of dictionaries
-
-        assert all(did.get("type", "dataset") in ("dataset", "container") for did in dids), "did type can be either 'container' or 'dataset'"
+        if not all(did.get("type", "dataset") in ("dataset", "container") for did in dids):
+            raise ValueError("DID type can be either 'container' or 'dataset'")
 
         path = '/'.join([self.LOCKS_BASEURL, "bulk_locks_for_dids"])
         url = build_url(choice(self.list_hosts), path=path)

{rucio_clients-35.0.0rc2 → rucio_clients-35.1.0}/lib/rucio/client/uploadclient.py

@@ -48,7 +48,7 @@ from rucio.rse import rsemanager as rsemgr
 if TYPE_CHECKING:
     from collections.abc import Iterable, Mapping
 
-    from rucio.common.types import AttachDict, DatasetDict, DIDStringDict, FileToUploadDict, FileToUploadWithCollectedAndDatasetInfoDict, FileToUploadWithCollectedInfoDict, LoggerFunction, RSESettingsDict, TraceBaseDict, TraceDict
+    from rucio.common.types import AttachDict, DatasetDict, DIDStringDict, FileToUploadDict, FileToUploadWithCollectedAndDatasetInfoDict, FileToUploadWithCollectedInfoDict, LoggerFunction, PathTypeAlias, RSESettingsDict, TraceBaseDict, TraceDict
     from rucio.rse.protocols.protocol import RSEProtocol
 
 
@@ -372,10 +372,7 @@ class UploadClient:
             raise NotAllFilesUploaded()
         return 0
 
-    def _add_bittorrent_meta(self, file: "Mapping[str, Any]", logger: "LoggerFunction") -> None:
-        if not config_get_bool('client', 'register_bittorrent_meta', default=False):
-            return
-
+    def _add_bittorrent_meta(self, file: "Mapping[str, Any]") -> None:
         pieces_root, pieces_layers, piece_length = bittorrent_v2_merkle_sha256(os.path.join(file['dirname'], file['basename']))
         bittorrent_meta = {
             'bittorrent_pieces_root': base64.b64encode(pieces_root).decode(),
@@ -383,6 +380,7 @@ class UploadClient:
             'bittorrent_piece_length': piece_length,
         }
         self.client.set_metadata_bulk(scope=file['did_scope'], name=file['did_name'], meta=bittorrent_meta)
+        self.logger(logging.INFO, f"Added bittorrent metadata to file DID {file['did_scope']}:{file['did_name']}")
 
     def _register_file(
             self,
@@ -434,7 +432,6 @@ class UploadClient:
                 logger(logging.INFO, 'Successfully created dataset %s' % dataset_did_str)
             except DataIdentifierAlreadyExists:
                 logger(logging.INFO, 'Dataset %s already exists - no rule will be created' % dataset_did_str)
-
                 if file.get('lifetime') is not None:
                     raise InputValidationError('Dataset %s exists and lifetime %s given. Prohibited to modify parent dataset lifetime.' % (dataset_did_str,
                                                                                                                                            file.get('lifetime')))
@@ -453,7 +450,6 @@ class UploadClient:
 
             if str(meta['adler32']).lstrip('0') != str(file['adler32']).lstrip('0'):
                 logger(logging.ERROR, 'Local checksum %s does not match remote checksum %s' % (file['adler32'], meta['adler32']))
-
                 raise DataIdentifierAlreadyExists
 
             # add file to rse if it is not registered yet
@@ -464,7 +460,8 @@ class UploadClient:
         except DataIdentifierNotFound:
             logger(logging.DEBUG, 'File DID does not exist')
             self.client.add_replicas(rse=rse, files=[replica_for_api])
-            self._add_bittorrent_meta(file=file, logger=logger)
+            if config_get_bool('client', 'register_bittorrent_meta', default=False):
+                self._add_bittorrent_meta(file=file)
             logger(logging.INFO, 'Successfully added replica in Rucio catalogue at %s' % rse)
             if not dataset_did_str:
                 # only need to add rules for files if no dataset is given
@@ -499,7 +496,7 @@ class UploadClient:
 
     def _collect_file_info(
             self,
-            filepath: str,
+            filepath: "PathTypeAlias",
             item: "FileToUploadDict"
     ) -> "FileToUploadWithCollectedInfoDict":
         """
@@ -845,7 +842,7 @@ class UploadClient:
             scope = self.default_file_scope
         rse = item.get('rse')
         path = item.get('path')
-        if path:
+        if path and isinstance(path, str):
             if path[-1] == '/':
                 path = path[0:-1]
             i = 0

{rucio_clients-35.0.0rc2 → rucio_clients-35.1.0}/lib/rucio/common/types.py

@@ -15,11 +15,14 @@
 import sys
 from collections.abc import Callable
 from datetime import datetime
+from os import PathLike
 
 if sys.version_info < (3, 11):
     from typing_extensions import TYPE_CHECKING, Any, Literal, NotRequired, Optional, TypedDict, Union  # noqa: UP035
+    PathTypeAlias = Union[PathLike, str]
 else:
     from typing import TYPE_CHECKING, Any, Literal, NotRequired, Optional, TypedDict, Union
+    PathTypeAlias = PathLike
 
 
 if TYPE_CHECKING:
@@ -306,7 +309,7 @@ class TraceDict(TraceBaseDict):
 
 
 class FileToUploadDict(TypedDict):
-    path: str
+    path: PathTypeAlias
     rse: str
     did_scope: str
     did_name: str

{rucio_clients-35.0.0rc2 → rucio_clients-35.1.0}/lib/rucio/common/utils.py

@@ -1941,7 +1941,8 @@ class StoreAndDeprecateWarningAction(argparse.Action):
             option_strings=option_strings,
             dest=dest,
             **kwargs)
-        assert new_option_string in option_strings
+        if new_option_string not in option_strings:
+            raise ValueError("%s not supported as a string option." % new_option_string)
         self.new_option_string = new_option_string
 
     def __call__(self, parser, namespace, values, option_string: Optional[str] = None):
@@ -1979,7 +1980,8 @@ class StoreTrueAndDeprecateWarningAction(argparse._StoreConstAction):
             default=default,
             required=required,
             help=help)
-        assert new_option_string in option_strings
+        if new_option_string not in option_strings:
+            raise ValueError("%s not supported as a string option." % new_option_string)
         self.new_option_string = new_option_string
 
     def __call__(self, parser, namespace, values, option_string: Optional[str] = None):

{rucio_clients-35.0.0rc2 → rucio_clients-35.1.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 TypeVar
+from typing import Any, TypeVar
 from urllib.parse import urlparse
 
 from rucio.common import config, exception
@@ -41,16 +41,33 @@ class RSEDeterministicScopeTranslation(PolicyPackageAlgorithms):
     """
         Translates a pfn dictionary into a scope and name
     """
+
+    _algorithm_type = "pfn2lfn"
+
     def __init__(self, vo: str = 'def'):
         super().__init__()
         self.register("def", RSEDeterministicScopeTranslation._default)
         self.register("atlas", RSEDeterministicScopeTranslation._atlas)
         policy_module = vo
-        # Uses the same policy as the DeterministicTranslation
-        if super()._supports(self.__class__.__name__, policy_module):
-            self.parser = self._get_one_algorithm(self.__class__.__name__, policy_module)
-        else:
-            self.parser = self._get_one_algorithm(self.__class__.__name__, "def")
+        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
+            else:
+                algorithm_name = "def"
+
+        self.parser = self.get_parser(algo_type, algorithm_name)
+
+    @classmethod
+    def get_parser(cls, algorithm_type: str, algorithm_name: str) -> Callable[..., Any]:
+        return super()._get_one_algorithm(algorithm_type, algorithm_name)
 
     @classmethod
     def register(cls, name: str, func: Callable) -> None:

rucio_clients-35.1.0/lib/rucio/vcsversion.py

@@ -0,0 +1,11 @@
+
+'''
+This file is automatically generated; Do not edit it. :)
+'''
+VERSION_INFO = {
+    'final': True,
+    'version': '35.1.0',
+    'branch_nick': 'release-35-LTS',
+    'revision_id': '7b5902dae33b6e94f6fc07fd4292e5362b3fd2f6',
+    'revno': 13114
+}

{rucio_clients-35.0.0rc2 → rucio_clients-35.1.0}/requirements/requirements.client.txt

@@ -1,7 +1,7 @@
 # All dependencies needed to run rucio client should be defined here
 requests>=2.32.2                                            # Python HTTP for Humans.
 urllib3>=1.26.18                                            # HTTP library with thread-safe connection pooling, file post, etc.
-dogpile.cache>=1.2.2                                        # Caching API plugins (1.1.2 is the first version to support pymemcache)
+dogpile-cache>=1.2.2                                        # Caching API plugins (1.1.2 is the first version to support pymemcache)
 tabulate>=0.9.0                                             # Pretty-print tabular data
 jsonschema>=4.20.0                                          # For JSON schema validation (Policy modules)
 
@@ -12,4 +12,4 @@ pykerberos>=1.2.4                                           # kerberos_extras fo
 requests-kerberos>=0.14.0                                   # kerberos_extras for client and server
 python-swiftclient>=4.4.0                                   # swift_extras
 argcomplete>=3.1.6                                          # argcomplete_extras; Bash tab completion for argparse
-python-magic>=0.4.27                                        # dumper_extras; File type identification using libmagic
+python-magic>=0.4.27                                        # dumper_extras; File type identification using libmagic

rucio_clients-35.0.0rc2/lib/rucio/vcsversion.py

@@ -1,11 +0,0 @@
-
-'''
-This file is automatically generated; Do not edit it. :)
-'''
-VERSION_INFO = {
-    'final': True,
-    'version': '35.0.0rc2',
-    'branch_nick': 'master',
-    'revision_id': 'fb2b459a73eafe428a69b8a4a5ab418af859d0bb',
-    'revno': 13074
-}