rucio 37.5.0__tar.gz → 37.7.0__tar.gz

{rucio-37.5.0 → rucio-37.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio
-Version: 37.5.0
+Version: 37.7.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-37.5.0 → rucio-37.7.0}/bin/rucio-abacus-account

@@ -27,7 +27,14 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Abacus-Account daemon is responsible for updating account usages. It checks if there are new entries in the UpdatedAccountCounter table and updates the account counters in the AccountCounter table by adding or substrating the amount and size of files and recalculating the quotas.", epilog='''
+    description = (
+        "The Abacus-Account daemon is responsible for updating account usages. "
+        "It checks if there are new entries in the UpdatedAccountCounter table "
+        "and updates the account counters in the AccountCounter table by adding "
+        "or subtracting the amount and size of files and recalculating the quotas."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 Upload a file::
 
   $ rucio upload --rse MOCK --scope mock filename.txt

{rucio-37.5.0 → rucio-37.7.0}/bin/rucio-abacus-rse

@@ -27,7 +27,14 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Abacus-RSE daemon is responsible for updating RSE usages. It checks if there are new entries in the UpdatedRSECounter table and updates the RSE counter in the RSECounter table by adding or substrating the amount of files and the size.", epilog='''
+    description = (
+        "The Abacus-RSE daemon is responsible for updating RSE usages. "
+        "It checks if there are new entries in the UpdatedRSECounter table "
+        "and updates the RSE counter in the RSECounter table "
+        "by adding or subtracting the amount of files and the size."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 Upload a file to your RSE::
 
   $ rucio upload --rse MOCK --scope mock filename.txt

{rucio-37.5.0 → rucio-37.7.0}/bin/rucio-auditor

@@ -145,7 +145,7 @@ def main(args):
             for each in tmp_list:
                 queue.put(each)
 
-    except:
+    except Exception:
         logging.error('Main process failed: %s', sys.exc_info()[0])
 
     terminate.set()

{rucio-37.5.0 → rucio-37.7.0}/bin/rucio-conveyor-throttler

@@ -27,7 +27,13 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Conveyor-Throttler daemon is responsible for managing the internal queue of transfer requests. Depending on transfer limits of current and waiting transfers, it decides whether a transfer should be put in the queue or not.", epilog='''
+    description = (
+        "The Conveyor-Throttler daemon is responsible for managing the internal queue of transfer requests. "
+        "Depending on transfer limits of current and waiting transfers, "
+        "it decides whether a transfer should be put in the queue or not."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 In this example, the transfer limit will be one transfer which means that there should be only one active transfer at the time.
 There will be two waiting transfer requests and no current active transfer.
 After running the daemon, there will be one transfer in the queue which can then be started.

{rucio-37.5.0 → rucio-37.7.0}/bin/rucio-follower

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """
-Follower is a daemon to aggregate all the events affecting the dids
+Follower is a daemon to aggregate all the events affecting the DIDs
 """
 
 import argparse

{rucio-37.5.0 → rucio-37.7.0}/bin/rucio-judge-cleaner

@@ -27,7 +27,15 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Judge-Cleaner daemon is responsible for cleaning expired replication rules. It deletes rules by checking if the 'expired_at' date property is older than the current timestamp. If the rule is expired, it will first remove one lock for the replica and parent datasets if the DID belongs to any. Then it will set a tombstone to the replica to mark it as deletable if there are no rules protecting the replica. After these steps, the rule gets deleted.", epilog='''
+    description = (
+        "The Judge-Cleaner daemon is responsible for cleaning expired replication rules. "
+        "It deletes rules by checking if the 'expired_at' date property is older than the current timestamp. "
+        "If the rule is expired, it will first remove one lock for the replica and parent datasets if the DID belongs to any. "
+        "Then it will set a tombstone to the replica to mark it as deletable if there are no rules protecting the replica. "
+        "After these steps, the rule gets deleted."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 Upload a file to your RSE::
 
   $ rucio upload --rse MOCK --scope mock --name file filename.txt

{rucio-37.5.0 → rucio-37.7.0}/bin/rucio-necromancer

@@ -27,7 +27,13 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Necromancer daemon is responsible for managing bad replicas. If a replica that got declared bad has other replicas, it will try to recover it by requesting a new transfer. If there are no replicas anymore, then the file gets marked as lost.", epilog='''
+    description = (
+        "The Necromancer daemon is responsible for managing bad replicas. "
+        "If a replica that got declared bad has other replicas, it will try to recover it by requesting a new transfer. "
+        "If there are no replicas anymore, then the file gets marked as lost."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 Lost replica:
 In this example the file gets uploaded and will only have this replica as there are no replication rules. If it gets declared bad, there will be no replica to recover from.
 Therefore the replica gets marked as lost.

{rucio-37.5.0 → rucio-37.7.0}/bin/rucio-replica-recoverer

@@ -227,14 +227,29 @@ Note that attempting the use the ``--vos`` argument when in single-VO mode will
   $ rucio-replica-recoverer --run-once --vos abc xyz
   2020-07-28 15:21:33,349 5488    WARNING Ignoring argument vos, this is only applicable in a multi-VO setup.
 ''', formatter_class=argparse.RawDescriptionHelpFormatter)  # NOQA: E501
-    parser.add_argument("--nattempts", action="store", default=5, type=int, help='Minimum count of suspicious file replica appearance in bad_replicas table. Default value is 5.')
-    parser.add_argument("--younger-than", action="store", default=5, type=int, help='Consider all file replicas logged in bad_replicas table since specified number of younger-than days. Default value is 5.')
-    parser.add_argument('--vos', nargs='+', type=str, help='Optional list of VOs to consider. Only used in multi-VO mode.')
-    parser.add_argument("--run-once", action="store_true", default=False, help='One iteration only.')
-    parser.add_argument("--limit-suspicious-files-on-rse", action="store", default=5, type=int, help='Maximum number of suspicious replicas on an RSE before that RSE is considered problematic and the suspicious replicas on that RSE are declared "TEMPORARY_UNAVAILABLE". Default value is 5.')
-    parser.add_argument('--json-file-name', action="store", default="/opt/rucio/etc/suspicious_replica_recoverer.json", type=str, help='Name of the json file that that contains the policies which will be used by the suspicious replica recoverer.')
-    parser.add_argument('--sleep-time', action="store", default=3600, type=int, help='Concurrency control: Thread sleep time after each chunk of work.')
-    parser.add_argument('--active-mode', action="store_true", default=False, help='If NOT specified, the daemon will run without taking any actions on any files. In either case, the log file will be produced normally.')
+    parser.add_argument("--nattempts",
+                        action="store", default=5, type=int,
+                        help='Minimum count of suspicious file replica appearance in bad_replicas table. Default value is 5.')
+    parser.add_argument("--younger-than",
+                        action="store", default=5, type=int,
+                        help='Consider all file replicas logged in bad_replicas table since specified number of younger-than days. Default value is 5.')
+    parser.add_argument('--vos', nargs='+', type=str,
+                        help='Optional list of VOs to consider. Only used in multi-VO mode.')
+    parser.add_argument("--run-once",
+                        action="store_true", default=False,
+                        help='One iteration only.')
+    parser.add_argument("--limit-suspicious-files-on-rse",
+                        action="store", default=5, type=int,
+                        help='Maximum number of suspicious replicas on an RSE before that RSE is considered problematic and the suspicious replicas on that RSE are declared "TEMPORARY_UNAVAILABLE". Default value is 5.')
+    parser.add_argument('--json-file-name',
+                        action="store", default="/opt/rucio/etc/suspicious_replica_recoverer.json", type=str,
+                        help='Name of the json file that that contains the policies which will be used by the suspicious replica recoverer.')
+    parser.add_argument('--sleep-time',
+                        action="store", default=3600, type=int,
+                        help='Concurrency control: Thread sleep time after each chunk of work.')
+    parser.add_argument('--active-mode',
+                        action="store_true", default=False,
+                        help='If NOT specified, the daemon will run without taking any actions on any files. In either case, the log file will be produced normally.')
     return parser
 
 
@@ -243,6 +258,13 @@ if __name__ == "__main__":
     PARSER = get_parser()
     ARGS = PARSER.parse_args()
     try:
-        run(once=ARGS.run_once, younger_than=ARGS.younger_than, nattempts=ARGS.nattempts, vos=ARGS.vos, limit_suspicious_files_on_rse=ARGS.limit_suspicious_files_on_rse, json_file_name=ARGS.json_file_name, sleep_time=ARGS.sleep_time, active_mode=ARGS.active_mode)
+        run(once=ARGS.run_once,
+            younger_than=ARGS.younger_than,
+            nattempts=ARGS.nattempts,
+            vos=ARGS.vos,
+            limit_suspicious_files_on_rse=ARGS.limit_suspicious_files_on_rse,
+            json_file_name=ARGS.json_file_name,
+            sleep_time=ARGS.sleep_time,
+            active_mode=ARGS.active_mode)
     except KeyboardInterrupt:
         stop()

{rucio-37.5.0 → rucio-37.7.0}/bin/rucio-undertaker

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """
-Undertaker is a daemon to manage expired did.
+Undertaker is a daemon to manage expired DID.
 """
 
 import argparse
@@ -27,7 +27,13 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Undertaker daemon is responsible for managing expired DIDs. It deletes DIDs, but not replicas by checking if there are DIDs where the 'expired_at' date property is older than the current timestamp.", epilog='''
+    description = (
+        "The Undertaker daemon is responsible for managing expired DIDs. "
+        "It deletes DIDs, but not replicas by checking if there are DIDs where the "
+        "'expired_at' date property is older than the current timestamp."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 Create a DID that is already expired by setting its lifetime to -1::
 
   $ python

{rucio-37.5.0 → rucio-37.7.0}/lib/rucio/cli/bin_legacy/rucio.py

@@ -26,7 +26,7 @@ import uuid
 from copy import deepcopy
 from datetime import datetime
 from logging import DEBUG
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 from rich.console import Console
 from rich.padding import Padding
@@ -58,6 +58,9 @@ from rucio.common.extra import import_extras
 from rucio.common.test_rucio_server import TestRucioServer
 from rucio.common.utils import Color, StoreAndDeprecateWarningAction, chunks, extract_scope, parse_did_filter_from_string, parse_did_filter_from_string_fe, setup_logger, sizefmt
 
+if TYPE_CHECKING:
+    from rucio.common.types import FileToUploadDict
+
 EXTRA_MODULES = import_extras(['argcomplete'])
 
 if EXTRA_MODULES['argcomplete']:
@@ -947,29 +950,44 @@ def upload(args, client, logger, console, spinner):
         elif len(did) == 2:
             logger.warning('Ignoring input {} because dataset DID is already set {}:{}'.format(arg, dsscope, dsname))
 
-    items = []
+    items: list[FileToUploadDict] = []
     for arg in args.args:
         if arg.count(':') > 0:
             continue
+        if args.pfn and args.impl:
+            logger.warning('Ignoring --impl option because --pfn option given')
+            args.impl = None
+
+        item: FileToUploadDict = {'path': arg, 'rse': args.rse}
+
+        if args.scope:
+            item['did_scope'] = args.scope
+        if args.name:
+            item['did_name'] = args.name
+        if dsscope:
+            item['dataset_scope'] = dsscope
+        if dsname:
+            item['dataset_name'] = dsname
+        if args.impl:
+            item['impl'] = args.impl
+        if args.protocol:
+            item['force_scheme'] = args.protocol
         if args.pfn:
-            if args.impl:
-                logger.warning('Ignoring --impl option because --pfn option given')
-                args.impl = None
-        items.append({'path': arg,
-                      'rse': args.rse,
-                      'did_scope': args.scope,
-                      'did_name': args.name,
-                      'impl': args.impl,
-                      'dataset_scope': dsscope,
-                      'dataset_name': dsname,
-                      'force_scheme': args.protocol,
-                      'pfn': args.pfn,
-                      'no_register': args.no_register,
-                      'lifetime': args.lifetime,
-                      'register_after_upload': args.register_after_upload,
-                      'transfer_timeout': args.transfer_timeout,
-                      'guid': args.guid,
-                      'recursive': args.recursive})
+            item['pfn'] = args.pfn
+        if args.no_register:
+            item['no_register'] = True
+        if args.register_after_upload:
+            item['register_after_upload'] = True
+        if args.lifetime is not None:
+            item['lifetime'] = int(args.lifetime)
+        if args.transfer_timeout is not None:
+            item['transfer_timeout'] = int(args.transfer_timeout)
+        if args.guid:
+            item['guid'] = args.guid
+        if args.recursive:
+            item['recursive'] = True
+
+        items.append(item)
 
     if len(items) < 1:
         raise InputValidationError('No files could be extracted from the given arguments')
@@ -978,6 +996,7 @@ def upload(args, client, logger, console, spinner):
         logger.error("A single GUID was specified on the command line, but there are multiple files to upload.")
         logger.error("If GUID auto-detection is not used, only one file may be uploaded at a time")
         raise InputValidationError('Invalid input argument composition')
+
     if len(items) > 1 and args.name:
         logger.error("A single LFN was specified on the command line, but there are multiple files to upload.")
         logger.error("If LFN auto-detection is not used, only one file may be uploaded at a time")
@@ -991,7 +1010,7 @@ def upload(args, client, logger, console, spinner):
     from rucio.client.uploadclient import UploadClient
     upload_client = UploadClient(client, logger=logger)
     summary_file_path = 'rucio_upload.json' if args.summary else None
-    upload_client.upload(items, summary_file_path)
+    upload_client.upload(items=items, summary_file_path=summary_file_path)
     return SUCCESS
 
 
@@ -1266,7 +1285,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-37.5.0 → rucio-37.7.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-37.5.0 → rucio-37.7.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-37.5.0 → rucio-37.7.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-37.5.0 → rucio-37.7.0}/lib/rucio/cli/rule.py

@@ -116,13 +116,17 @@ def move(ctx, rule_id, rses, activity, source_rses):
 @click.option("--comment", help="Comment about the replication rule")
 @click.option("--account", help="The account owning the rule")
 @click.option("--stuck", is_flag=True, default=False, help="Set state to STUCK.")
+@click.option('--suspend', is_flag=True, default=None, help='Set state to SUSPENDED.')
 @click.option("--activity", help="Activity of the rule.")
 @click.option("--cancel-requests", is_flag=True, default=False, help="Cancel requests when setting rules to stuck.")
 @click.option("--priority", help="Priority of the requests of the rule.")
 @click.option("--child-rule-id", help='Child rule id of the rule. Use "None" to remove an existing parent/child relationship.')
 @click.option("--boost-rule", is_flag=True, default=False, help="Quickens the transition of a rule from STUCK to REPLICATING.")
 @click.pass_context
-def update(ctx, rule_id, lifetime, locked, source_rses, activity, comment, account, stuck, cancel_requests, priority, child_rule_id, boost_rule):
+def update(
+    ctx, rule_id: str, lifetime: str, locked: bool, source_rses: str, activity: str, comment: str,
+    account: str, stuck: bool, suspend: bool, cancel_requests: bool, priority: str, child_rule_id: str, boost_rule: bool
+):
     """Update an existing rule"""
     args = Arguments(
         {
@@ -134,6 +138,7 @@ def update(ctx, rule_id, lifetime, locked, source_rses, activity, comment, accou
             "rule_account": account,
             "source_replica_expression": source_rses,
             "state_stuck": stuck,
+            "state_suspended": suspend,
             "cancel_requests": cancel_requests,
             "priority": priority,
             "child_rule_id": child_rule_id,
@@ -144,15 +149,14 @@ def update(ctx, rule_id, lifetime, locked, source_rses, activity, comment, accou
 
 
 @rule.command("list")
-@click.option("--did")
-@click.option("--id", "rule_id", help="List by rule id", hidden=True)  # TODO: Remove. This doesn't work and does the same thing as show
+@click.argument("did")
 @click.option("--traverse", is_flag=True, default=False, help="Traverse the did tree and search for rules affecting this did")
 @click.option("--csv", is_flag=True, default=False, help="Comma Separated Value output")
 @click.option("--file", help="Filter by file")
 @click.option("--account", help="Filter by account")
 @click.option("--subscription", help="Filter by subscription name")
 @click.pass_context
-def list_(ctx, did, rule_id, traverse, csv, file, account, subscription):
+def list_(ctx, did, traverse, csv, file, account, subscription):
     """List all rules impacting a given DID"""
-    args = Arguments({"no_pager": ctx.obj.no_pager, "did": did, "rule_id": rule_id, "traverse": traverse, "csv": csv, "file": file, "subscription": (account if account is not None else ctx.obj.client.account, subscription)})
+    args = Arguments({"no_pager": ctx.obj.no_pager, "did": did, "rule_id": None, "traverse": traverse, "csv": csv, "file": file, "subscription": (account if account is not None else ctx.obj.client.account, subscription)})
     list_rules(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)

{rucio-37.5.0 → rucio-37.7.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-37.5.0 → rucio-37.7.0}/lib/rucio/client/baseclient.py

@@ -38,6 +38,7 @@ from requests.status_codes import codes
 from rucio import version
 from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool, config_get_int, config_has_section
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import CannotAuthenticate, ClientProtocolNotFound, ClientProtocolNotSupported, ConfigNotFound, MissingClientParameter, MissingModuleException, NoAuthInformation, ServerConnectionException
 from rucio.common.extra import import_extras
 from rucio.common.utils import build_url, get_tmp_dir, my_key_generator, parse_response, setup_logger, ssh_sign
@@ -225,10 +226,10 @@ class BaseClient:
                     self.vo = config_get('client', 'vo')
                 except (NoOptionError, NoSectionError):
                     self.logger.debug('No VO found. Using default VO.')
-                    self.vo = 'def'
+                    self.vo = DEFAULT_VO
                 except ConfigNotFound:
                     self.logger.debug('No configuration found. Using default VO.')
-                    self.vo = 'def'
+                    self.vo = DEFAULT_VO
 
         self.auth_token_file_path, self.token_exp_epoch_file, self.token_file, self.token_path = self._get_auth_tokens()
         self.__authenticate()
@@ -251,7 +252,7 @@ class BaseClient:
 
         else:
             token_path = self.TOKEN_PATH_PREFIX + getpass.getuser()
-            if self.vo != 'def':
+            if self.vo != DEFAULT_VO:
                 token_path += '@%s' % self.vo
 
             token_file = token_path + '/' + self.TOKEN_PREFIX + token_filename_suffix
@@ -967,7 +968,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-37.5.0 → rucio-37.7.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)