rucio-clients 37.1.0.post1__tar.gz → 37.2.0__tar.gz

{rucio_clients-37.1.0.post1 → rucio_clients-37.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio-clients
-Version: 37.1.0.post1
+Version: 37.2.0
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio
@@ -26,7 +26,6 @@ Requires-Dist: dogpile-cache<=1.2.2
 Requires-Dist: packaging
 Requires-Dist: tabulate
 Requires-Dist: jsonschema
-Requires-Dist: dataclasses
 Requires-Dist: rich
 Requires-Dist: typing_extensions
 Provides-Extra: ssh

{rucio_clients-37.1.0.post1 → rucio_clients-37.2.0}/lib/rucio/common/utils.py

@@ -595,20 +595,17 @@ class ScopeExtractionAlgorithms(PolicyPackageAlgorithms):
     @staticmethod
     def extract_scope_default(did: str, scopes: Optional['Sequence[str]']) -> 'Sequence[str]':
         """
-        Default fallback scope extraction algorithm, based on the ATLAS scope extraction algorithm.
+        Default scope extraction algorithm. Extracts the scope from the DID.
 
         :param did: The DID to extract the scope from.
+        :param scopes: Not used in the default algorithm.
 
-        :returns: A tuple containing the extracted scope and the DID.
+        :returns: A tuple containing the extracted scope and the name.
         """
-        if did.find(':') > -1:
-            if len(did.split(':')) > 2:
-                raise RucioException('Too many colons. Cannot extract scope and name')
-            scope, name = did.split(':')[0], did.split(':')[1]
-            if name.endswith('/'):
-                name = name[:-1]
-            return scope, name
-        else:
+
+        # This block is ATLAS specific, to be removed in the future.
+        # More info at https://github.com/rucio/rucio/pull/7521
+        if did.find(':') == -1:
             scope = did.split('.')[0]
             if did.startswith('user') or did.startswith('group'):
                 scope = ".".join(did.split('.')[0:2])
@@ -616,6 +613,16 @@ class ScopeExtractionAlgorithms(PolicyPackageAlgorithms):
                 did = did[:-1]
             return scope, did
 
+        parts = did.split(':')
+        if len(parts) != 2:
+            msg = f"Cannot extract scope and name from DID {did}. The DID should have exactly one colon but found {len(parts)} colons."
+            raise RucioException(msg)
+        scope, name = parts
+        if not scope or not name:
+            msg = f"Cannot extract scope and name from DID {did}. Found empty scope or name."
+            raise RucioException(msg)
+        return scope, name
+
     @staticmethod
     def extract_scope_dirac(did: str, scopes: Optional['Sequence[str]']) -> 'Sequence[str]':
         # Default dirac scope extract algorithm. Scope is the second element in the LFN or the first one (VO name)

{rucio_clients-37.1.0.post1 → rucio_clients-37.2.0}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '37.1.0.post1',
+    'version': '37.2.0',
     'branch_nick': 'release-37',
-    'revision_id': '420fea7843ab9f55e21b71eb93709f7621db8873',
-    'revno': 13642
+    'revision_id': 'ebd2ace1ae33234044fc2d70c35f6ae8f59127ce',
+    'revno': 13666
 }

{rucio_clients-37.1.0.post1 → rucio_clients-37.2.0}/setuputil.py

@@ -24,7 +24,6 @@ clients_requirements_table = {
         'packaging',
         'tabulate',
         'jsonschema',
-        'dataclasses',
         'rich',
         'typing_extensions'
     ],

{rucio_clients-37.1.0.post1 → rucio_clients-37.2.0}/tests/test_did.py

@@ -17,7 +17,7 @@ from datetime import datetime, timedelta
 import pytest
 
 from rucio.common import exception
-from rucio.common.exception import DataIdentifierAlreadyExists, DataIdentifierNotFound, FileAlreadyExists, FileConsistencyMismatch, InvalidPath, ScopeNotFound, UnsupportedOperation, UnsupportedStatus
+from rucio.common.exception import DataIdentifierAlreadyExists, DataIdentifierNotFound, DuplicateContent, FileAlreadyExists, FileConsistencyMismatch, InvalidPath, ScopeNotFound, UnsupportedOperation, UnsupportedStatus
 from rucio.common.types import InternalScope
 from rucio.common.utils import generate_uuid
 from rucio.core.did import (
@@ -180,6 +180,31 @@ class TestDIDCore:
 
         detach_dids(scope=mock_scope, name=parent_name, dids=files)
 
+    def test_attach_dids_ignore_duplicates(self, vo, mock_scope, root_account, rse_factory):
+        """ DATA IDENTIFIERS (CORE): Attach DIDs with the ignore duplicates flag """
+        rse, rse_id = rse_factory.make_mock_rse()
+
+        parent_name = did_name_generator('container')
+        child_name = did_name_generator('dataset')
+
+        dids_attachment = [{'scope': mock_scope, 'name': child_name}]
+
+        add_did(scope=mock_scope, name=parent_name, did_type=DIDType.CONTAINER, account=root_account)
+        add_did(scope=mock_scope, name=child_name, did_type=DIDType.DATASET, account=root_account)
+
+        # Attach once
+        attach_dids(scope=mock_scope, name=parent_name, rse_id=rse_id, dids=dids_attachment, account=root_account,
+                    ignore_duplicate=True)
+
+        # Attach again with ignore_duplicate flag, should work
+        attach_dids(scope=mock_scope, name=parent_name, rse_id=rse_id, dids=dids_attachment, account=root_account,
+                    ignore_duplicate=True)
+
+        # Attach again without the flag, should produce error
+        with pytest.raises(DuplicateContent):
+            attach_dids(scope=mock_scope, name=parent_name, rse_id=rse_id, dids=dids_attachment, account=root_account,
+                        ignore_duplicate=False)
+
     @pytest.mark.dirty
     def test_add_did_to_followed(self, mock_scope, root_account):
         """ DATA IDENTIFIERS (CORE): Mark a did as followed """