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

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

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

{rucio_clients-37.4.0 → rucio_clients-37.6.0}/lib/rucio/cli/bin_legacy/rucio.py

@@ -1266,7 +1266,7 @@ def add_rule(args, client, logger, console, spinner):
     """
     %(prog)s add-rule <did> <copies> <rse-expression> [options]
 
-    Add a rule to a did.
+    Add a rule to a DID.
     """
 
     dids = []

{rucio_clients-37.4.0 → rucio_clients-37.6.0}/lib/rucio/cli/bin_legacy/rucio_admin.py

@@ -752,7 +752,7 @@ def add_scope(args, client, logger, console, spinner):
 
     """
     client.add_scope(account=args.account, scope=args.scope)
-    print('Added new scope to account: %s-%s' % (args.scope, args.account))
+    print(f'Added new scope to {args.account}: {args.scope}')
     return SUCCESS
 
 

{rucio_clients-37.4.0 → rucio_clients-37.6.0}/lib/rucio/cli/did.py

@@ -130,7 +130,7 @@ def content_history(ctx, dids):
 @click.argument("dids", nargs=-1)
 @click.pass_context
 def content_add_(ctx, to_did, from_file, dids):
-    """Attach a list [dids] of Data IDentifiers (file or collection-type) to an other Data IDentifier (collection-type)"""
+    """Attach a list [dids] of data identifiers (file or collection-type) to another data identifier (collection-type)"""
     args = Arguments({"no_pager": ctx.obj.no_pager, "dids": dids, "todid": to_did, "fromfile": from_file})
     attach(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
 
@@ -140,7 +140,7 @@ def content_add_(ctx, to_did, from_file, dids):
 @click.argument("dids", nargs=-1)
 @click.pass_context
 def content_remove(ctx, dids, from_did):
-    """Detach [dids], a list of DIDs (file or collection-type) from an other Data Identifier (collection type)"""
+    """Detach [dids], a list of DIDs (file or collection-type) from another Data Identifier (collection type)"""
     args = Arguments({"no_pager": ctx.obj.no_pager, "dids": dids, "fromdid": from_did})
     detach(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
 

{rucio_clients-37.4.0 → rucio_clients-37.6.0}/lib/rucio/cli/rse.py

@@ -55,11 +55,10 @@ def list_(ctx, rses, csv):
 
 @rse.command("show")
 @click.argument("rse-name")
-@click.option("--csv", is_flag=True, default=False, help="Output list of RSE property key and values as a csv")
 @click.pass_context
-def show(ctx, rse_name, csv):
+def show(ctx, rse_name):
     """Usage, protocols, settings, and attributes for a given RSE"""
-    info_rse(Arguments({"no_pager": ctx.obj.no_pager, "rse": rse_name, "csv": csv}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+    info_rse(Arguments({"no_pager": ctx.obj.no_pager, "rse": rse_name}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
 
 
 @rse.command("add")

{rucio_clients-37.4.0 → rucio_clients-37.6.0}/lib/rucio/cli/subscription.py

@@ -68,6 +68,6 @@ def add_(ctx, subscription_name, did_filter, rule, comment, lifetime, account, p
 @click.pass_context
 def touch(ctx, dids):
     """Reevaluate list of DIDs against all active subscriptions"""
-    # TODO make reeval accept dids as a list
+    # TODO make reeval accept DIDs as a list
     dids = ",".join(dids)
     reevaluate_did_for_subscription(Arguments({"no_pager": ctx.obj.no_pager, "dids": dids}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)

{rucio_clients-37.4.0 → rucio_clients-37.6.0}/lib/rucio/client/baseclient.py

@@ -967,7 +967,11 @@ class BaseClient:
         if not os.path.isdir(self.token_path):
             try:
                 self.logger.debug('rucio token folder \'%s\' not found. Create it.' % self.token_path)
-                makedirs(self.token_path, 0o700)
+                try:
+                    makedirs(self.token_path, 0o700)
+                except FileExistsError:
+                    msg = f'Token directory already exists at {self.token_path} - skipping'
+                    self.logger.debug(msg)
             except Exception:
                 raise
 

{rucio_clients-37.4.0 → rucio_clients-37.6.0}/lib/rucio/client/didclient.py

@@ -55,7 +55,7 @@ class DIDClient(BaseClient):
                 like <key>.<operation>, e.g. key1 >= value1 is equivalent to {'key1.gte': value}, where <operation> belongs to one
                 of the set {'lte', 'gte', 'gt', 'lt', 'ne' or ''}. Equivalence doesn't require an operator.
             did_type :
-                The type of the did: 'all'(container, dataset or file)|'collection'(dataset or container)|'dataset'|'container'|'file'
+                The type of the DID: 'all'(container, dataset or file)|'collection'(dataset or container)|'dataset'|'container'|'file'
             long :
                 Long format option to display more information for each DID.
             recursive :
@@ -325,14 +325,14 @@ class DIDClient(BaseClient):
             ignore_duplicate: bool = False
     ) -> bool:
         """
-        Add dids to dids.
+        Add DIDs to DIDs.
 
         Parameters
         ----------
         attachments :
             The attachments.
-            An attachment contains: "scope", "name", "dids".
-            dids is: [{'scope': scope, 'name': name}, ...]
+            An attachment contains: "scope", "name", "DIDs".
+            DIDs is: [{'scope': scope, 'name': name}, ...]
         ignore_duplicate :
             If True, ignore duplicate entries.
         """
@@ -358,8 +358,8 @@ class DIDClient(BaseClient):
         ----------
         attachments :
             The attachments.
-            An attachment contains: "scope", "name", "dids".
-            dids is: [{'scope': scope, 'name': name}, ...]
+            An attachment contains: "scope", "name", "DIDs".
+            DIDs is: [{'scope': scope, 'name': name}, ...]
         ignore_duplicate :
             If True, ignore duplicate entries.
         """
@@ -377,8 +377,8 @@ class DIDClient(BaseClient):
         ----------
         attachments :
             The attachments.
-            An attachment contains: "scope", "name", "dids".
-            dids is: [{'scope': scope, 'name': name}, ...]
+            An attachment contains: "scope", "name", "DIDs".
+            DIDs is: [{'scope': scope, 'name': name}, ...]
         """
         return self.attach_dids_to_dids(attachments=attachments)
 
@@ -393,8 +393,8 @@ class DIDClient(BaseClient):
         ----------
         attachments :
             The attachments.
-            An attachment contains: "scope", "name", "dids".
-            dids is: [{'scope': scope, 'name': name}, ...]
+            An attachment contains: "scope", "name", "DIDs".
+            DIDs is: [{'scope': scope, 'name': name}, ...]
         """
         return self.attach_dids_to_dids(attachments=attachments)
 
@@ -661,7 +661,7 @@ class DIDClient(BaseClient):
         Parameters
         ----------
         dids :
-            A list of dids.
+            A list of DIDs.
         inherit :
             A boolean. If set to true, the metadata of the parent are concatenated.
         plugin :
@@ -752,7 +752,7 @@ class DIDClient(BaseClient):
         Parameters
         ----------
         dids :
-            A list of dids including metadata, i.e.
+            A list of DIDs including metadata, i.e.
             [{'scope': scope1, 'name': name1, 'meta': {key1: value1, key2: value2}}, ...].
         recursive :
             Option to propagate the metadata update to content.
@@ -902,7 +902,7 @@ class DIDClient(BaseClient):
         Returns
         -------
 
-            A did
+            A DID
         """
 
         path = '/'.join([self.DIDS_BASEURL, guid, 'guid'])
@@ -954,7 +954,7 @@ class DIDClient(BaseClient):
             name: str
     ) -> "Iterator[dict[str, Any]]":
         """
-        List parent dataset/containers of a did.
+        List parent dataset/containers of a DID.
 
         Parameters
         ----------
@@ -1016,12 +1016,12 @@ class DIDClient(BaseClient):
 
     def resurrect(self, dids: "Sequence[Mapping[str, Any]]") -> bool:
         """
-        Resurrect a list of dids.
+        Resurrect a list of DIDs.
 
         Parameters
         ----------
         dids :
-            A list of dids [{'scope': scope, 'name': name}, ...]
+            A list of DIDs [{'scope': scope, 'name': name}, ...]
         """
         path = '/'.join([self.DIDS_BASEURL, 'resurrect'])
         url = build_url(choice(self.list_hosts), path=path)

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

@@ -285,7 +285,7 @@ class DownloadClient:
         -------
 
             A list of dictionaries with an entry for each file, containing the input options,
-            the did, and the clientState. clientState can be one of the following:
+            the DID, and the clientState. clientState can be one of the following:
             ALREADY_DONE, DONE, FILE_NOT_FOUND, FAIL_VALIDATE, FAILED
 
         Raises
@@ -422,7 +422,7 @@ class DownloadClient:
         -------
 
             A list of dictionaries with an entry for each file, containing the input options,
-            the did, and the clientState.
+            the DID, and the clientState.
 
         Raises
         ------
@@ -499,7 +499,7 @@ class DownloadClient:
         -------
 
             A list of dictionaries with an entry for each file, containing the input options,
-            the did, and the clientState.
+            the DID, and the clientState.
 
         Raises
         ------
@@ -1021,7 +1021,7 @@ class DownloadClient:
         -------
 
             A list of dictionaries with an entry for each file, containing the input options,
-            the did, and the clientState.
+            the DID, and the clientState.
 
 
         Raises
@@ -1173,7 +1173,7 @@ class DownloadClient:
         -------
 
             A list of dictionaries with an entry for each file, containing the input options,
-            the did, and the clientState.
+            the DID, and the clientState.
         """
         trace_custom_fields = trace_custom_fields or {}
         logger = self.logger
@@ -1322,8 +1322,8 @@ 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:
-        
+        Resolve scopes or wildcard DIDs to lists of full DID names:
+
         Parameters
         ----------
         item :
@@ -1456,10 +1456,10 @@ class DownloadClient:
             if not found_compatible_group:
                 item_groups.append([item])
 
-        # List replicas for dids
+        # List replicas for DIDs
         merged_items_with_sources = []
         for item_group in item_groups:
-            # Take configuration from the first item in the group; but dids from all items
+            # Take configuration from the first item in the group; but DIDs from all items
             item = item_group[0]
             input_dids = {DID(did): did
                           for item in item_group
@@ -1512,15 +1512,15 @@ class DownloadClient:
             logger(logging.DEBUG, 'num resolved files: %s' % len(file_items))
 
             if not nrandom or nrandom != len(file_items):
-                # If list_replicas didn't resolve any file DIDs for any input did, we pass through the input DID.
+                # If list_replicas didn't resolve any file DIDs for any input DID, we pass through the input DID.
                 # This is done to keep compatibility with later code which generates "FILE_NOT_FOUND" traces
                 # and output items.
                 # In the special case of nrandom, when serverside filtering is applied, it's "normal" for some input
-                # dids to be ignored as long as we got exactly nrandom file_items from the server.
+                # DIDs to be ignored as long as we got exactly nrandom file_items from the server.
                 for input_did in input_dids:
                     if not any([input_did == f['did'] or str(input_did) in f['parent_dids'] for f in file_items]):
                         logger(logging.ERROR, 'DID does not exist: %s' % input_did)
-                        # TODO: store did directly as DIDType object
+                        # TODO: store DID directly as DIDType object
                         file_items.append({'did': str(input_did), 'adler32': None, 'md5': None, 'sources': [], 'parent_dids': set(), 'impl': impl or None})
 
             # filtering out tape sources
@@ -1534,7 +1534,7 @@ class DownloadClient:
                         logger(logging.WARNING, 'The requested DID {} only has replicas on tape. Direct download from tape is prohibited. '
                                                 'Please request a transfer to a non-tape endpoint.'.format(file_item['did']))
 
-            # Match the file did back to the dids which were provided to list_replicas.
+            # Match the file DID back to the DIDs which were provided to list_replicas.
             # Later, this will allow to match the file back to input_items via did_to_input_items
             for file_item in file_items:
                 file_did = DID(file_item['did'])
@@ -1628,7 +1628,7 @@ class DownloadClient:
 
         all_dest_file_paths = set()
 
-        # get replicas for every file of the given dids
+        # get replicas for every file of the given DIDs
         for file_item in file_items:
             file_did = DID(file_item['did'])
             input_items = list(itertools.chain.from_iterable(did_to_input_items.get(did, []) for did in file_item['input_dids']))
@@ -1676,7 +1676,7 @@ class DownloadClient:
             file_item['dest_file_paths'] = list(dest_file_paths)
             file_item['temp_file_path'] = '%s.part' % file_item['dest_file_paths'][0]
 
-            # the file did str is not an unique key for this dict because multiple calls of list_replicas
+            # the file DID str is not a unique key for this dict because multiple calls of list_replicas
             # could result in the same DID multiple times. So we're using the id of the dictionary objects
             fiid = id(file_item)
             fiid_to_file_item[fiid] = file_item

{rucio_clients-37.4.0 → rucio_clients-37.6.0}/lib/rucio/client/lockclient.py

@@ -41,9 +41,9 @@ class LockClient(BaseClient):
         Parameters
         ----------
         scope :
-            The scope of the did of the locks to list.
+            The scope of the DID of the locks to list.
         name :
-            The name of the did of the locks to list.
+            The name of the DID of the locks to list.
 
         """
 
@@ -80,7 +80,7 @@ class LockClient(BaseClient):
             list of dictionaries with lock info
         """
 
-        # convert did list to list of dictionaries
+        # convert DID list to list of dictionaries
         if not all(did.get("type", "dataset") in ("dataset", "container") for did in dids):
             raise ValueError("DID type can be either 'container' or 'dataset'")
 

{rucio_clients-37.4.0 → rucio_clients-37.6.0}/lib/rucio/client/replicaclient.py

@@ -416,7 +416,7 @@ class ReplicaClient(BaseClient):
 
     def list_dataset_replicas(self, scope, name, deep=False):
         """
-        List dataset replicas for a did (scope:name).
+        List dataset replicas for a DID (scope:name).
 
         Parameters
         ----------
@@ -446,7 +446,7 @@ class ReplicaClient(BaseClient):
 
     def list_dataset_replicas_bulk(self, dids):
         """
-        List dataset replicas for a did (scope:name).
+        List dataset replicas for a DID (scope:name).
 
         Parameters
         ----------

{rucio_clients-37.4.0 → rucio_clients-37.6.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.6.0}/lib/rucio/client/touchclient.py

@@ -49,7 +49,7 @@ class TouchClient(BaseClient):
         Raises
         ------
         DataIdentifierNotFound
-            If given dids does not exist.
+            If given DIDs does not exist.
         RSENotFound
             If rse is not None and given rse does not exist.
         UnsupportedDIDType