rucio 37.5.0__py3-none-any.whl → 37.7.0__py3-none-any.whl

rucio/core/did.py

@@ -28,6 +28,7 @@ import rucio.core.replica  # import add_replicas
 import rucio.core.rule
 from rucio.common import exception
 from rucio.common.config import config_get_bool, config_get_int
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.utils import chunks, is_archive
 from rucio.core import did_meta_plugins
 from rucio.core.message import add_message
@@ -163,7 +164,7 @@ def add_dids(
     """
     Bulk add data identifiers.
 
-    :param dids: A list of dids.
+    :param dids: A list of DIDs.
     :param account: The account owner.
     :param session: The database session in use.
     """
@@ -211,7 +212,7 @@ def add_dids(
                                'scope': did['scope'].external,
                                'name': did['name'],
                                'expired_at': str(expired_at) if expired_at is not None else None}
-                    if account.vo != 'def':
+                    if account.vo != DEFAULT_VO:
                         message['vo'] = account.vo
 
                     add_message(event_type, message, session=session)
@@ -375,7 +376,7 @@ def __add_files_to_archive(
         session: "Session"
 ) -> None:
     """
-    Add files to archive.
+    Add files to the archive.
 
     :param parent_did: the DataIdentifier object of the parent did
     :param files: archive content.
@@ -773,7 +774,7 @@ def __add_collections_to_container(
                    'childscope': c['scope'].external,
                    'childname': c['name'],
                    'childtype': chld_type}
-        if account.vo != 'def':
+        if account.vo != DEFAULT_VO:
             message['vo'] = account.vo
         messages.append(message)
 
@@ -809,11 +810,11 @@ def delete_dids(
     """
     Delete data identifiers
 
-    :param dids:          The list of dids to delete.
+    :param dids:          The list of DIDs to delete.
     :param account:       The account.
     :param expire_rules:  Expire large rules instead of deleting them right away. This should only be used in Undertaker mode, as it can be that
-                          the method returns normally, but a did was not deleted; This trusts in the fact that the undertaker will retry an
-                          expired did.
+                          the method returns normally, but a DID was not deleted; This trusts in the fact that the undertaker will retry an
+                          expired DID.
     :param session:       The database session in use.
     :param logger:        Optional decorated logger that can be passed from the calling daemons or servers.
     """
@@ -857,7 +858,7 @@ def delete_dids(
         message = {'account': account.external,
                    'scope': did['scope'].external,
                    'name': did['name']}
-        if did['scope'].vo != 'def':
+        if did['scope'].vo != DEFAULT_VO:
             message['vo'] = did['scope'].vo
 
         add_message('ERASE', message, session=session)
@@ -879,7 +880,7 @@ def delete_dids(
     )
     session.execute(stmt, values)
 
-    # Delete rules on did
+    # Delete rules on DID
     skip_deletion = False  # Skip deletion in case of expiration of a rule
     with METRICS.timer('delete_dids.rules'):
         stmt = select(
@@ -899,7 +900,7 @@ def delete_dids(
         for (rule_id, scope, name, rse_expression, locks_ok_cnt, locks_replicating_cnt, locks_stuck_cnt) in session.execute(stmt):
             logger(logging.DEBUG, 'Removing rule %s for did %s:%s on RSE-Expression %s' % (str(rule_id), scope, name, rse_expression))
 
-            # Propagate purge_replicas from did to rules
+            # Propagate purge_replicas from DID to rules
             if (scope, name) in not_purge_replicas:
                 purge_replicas = False
             else:
@@ -907,7 +908,7 @@ def delete_dids(
             if expire_rules and locks_ok_cnt + locks_replicating_cnt + locks_stuck_cnt > int(config_get_int('undertaker', 'expire_rules_locks_size', default=10000, session=session)):
                 # Expire the rule (soft=True)
                 rucio.core.rule.delete_rule(rule_id=rule_id, purge_replicas=purge_replicas, soft=True, delete_parent=True, nowait=True, session=session)
-                # Update expiration of did
+                # Update expiration of DID
                 set_metadata(scope=scope, name=name, key='lifetime', value=3600 * 24, session=session)
                 skip_deletion = True
             else:
@@ -916,7 +917,7 @@ def delete_dids(
     if skip_deletion:
         return
 
-    # Detach from parent dids:
+    # Detach from parent DIDs:
     existing_parent_dids = False
     with METRICS.timer('delete_dids.parent_content'):
         stmt = select(
@@ -931,7 +932,7 @@ def delete_dids(
             existing_parent_dids = True
             detach_dids(scope=parent_did.scope, name=parent_did.name, dids=[{'scope': parent_did.child_scope, 'name': parent_did.child_name}], session=session)
 
-    # Remove generic did metadata
+    # Remove generic DID metadata
     must_delete_did_meta = True
     if session.bind.dialect.name == 'oracle':
         oracle_version = int(session.connection().connection.version.split('.')[0])
@@ -1036,7 +1037,7 @@ def delete_dids(
         )
         session.execute(stmt)
 
-        # Set Epoch tombstone for the files replicas inside the did
+        # Set Epoch tombstone for the files replicas inside the DID
         if config_get_bool('undertaker', 'purge_all_replicas', default=False, session=session):
             with METRICS.timer('delete_dids.file_content'):
                 stmt = update(
@@ -1093,7 +1094,7 @@ def delete_dids(
 
     # remove data identifier
     if existing_parent_dids:
-        # Exit method early to give Judge time to remove locks (Otherwise, due to foreign keys, did removal does not work
+        # Exit method early to give Judge time to remove locks (Otherwise, due to foreign keys, DID removal does not work
         logger(logging.DEBUG, 'Leaving delete_dids early for Judge-Evaluator checks')
         return
 
@@ -1195,7 +1196,7 @@ def detach_dids(
     :param dids: The content.
     :param session: The database session in use.
     """
-    # Row Lock the parent did
+    # Row Lock the parent DID
     stmt = select(
         models.DataIdentifier
     ).where(
@@ -1215,7 +1216,7 @@ def detach_dids(
     except NoResultFound:
         raise exception.DataIdentifierNotFound(f"Data identifier '{scope}:{name}' not found")
 
-    # TODO: should judge target did's status: open, monotonic, close.
+    # TODO: should judge target DID's status: open, monotonic, close.
     stmt = select(
         models.DataIdentifierAssociation
     ).where(
@@ -1286,7 +1287,7 @@ def detach_dids(
                        'childscope': source['scope'].external,
                        'childname': source['name'],
                        'childtype': chld_type}
-            if scope.vo != 'def':
+            if scope.vo != DEFAULT_VO:
                 message['vo'] = scope.vo
 
             add_message('ERASE_CNT', message, session=session)
@@ -1297,7 +1298,7 @@ def detach_dids(
                    'child_scope': source['scope'].external,
                    'child_name': str(source['name']),
                    'child_type': str(child_type)}
-        if scope.vo != 'def':
+        if scope.vo != DEFAULT_VO:
             message['vo'] = scope.vo
 
         add_message('DETACH', message, session=session)
@@ -1374,7 +1375,7 @@ def set_new_dids(
     """
     Set/reset the flag new
 
-    :param dids: A list of dids
+    :param dids: A list of DIDs
     :param new_flag: A boolean to flag new DIDs.
     :param session: The database session in use.
     """
@@ -1436,7 +1437,7 @@ def list_content(
         yield {'scope': tmp_did.child_scope, 'name': tmp_did.child_name, 'type': tmp_did.child_type,
                'bytes': tmp_did.bytes, 'adler32': tmp_did.adler32, 'md5': tmp_did.md5}
     if not children_found:
-        # Raise exception if the did doesn't exist
+        # Raise exception if the DID doesn't exist
         __get_did(scope=scope, name=name, session=session)
 
 
@@ -1480,13 +1481,13 @@ def list_parent_dids(
     session: "Session"
 ) -> "Iterator[dict[str, Any]]":
     """
-    List parent datasets and containers of a did.
+    List parent datasets and containers of a DID.
 
     :param scope:     The scope.
     :param name:      The name.
     :param order_by:  List of parameters to order the query by. Possible values: ['scope', 'name', 'did_type', 'created_at'].
     :param session:   The database session.
-    :returns:         List of dids.
+    :returns:         List of DIDs.
     :rtype:           Generator.
     """
 
@@ -1519,12 +1520,12 @@ def list_all_parent_dids(
     session: "Session"
 ) -> "Iterator[dict[str, Any]]":
     """
-    List all parent datasets and containers of a did, no matter on what level.
+    List all parent datasets and containers of a DID, no matter on what level.
 
     :param scope:     The scope.
     :param name:      The name.
     :param session:   The database session.
-    :returns:         List of dids.
+    :returns:         List of DIDs.
     :rtype:           Generator.
     """
 
@@ -1548,8 +1549,8 @@ def list_child_dids_stmt(
         did_type: DIDType,
 ) -> "Select[tuple[InternalScope, str]]":
     """
-    Build and returns a query which recursively lists children dids of type `did_type`
-    for the dids given as input in a scope/name (temporary) table.
+    Build and returns a query which recursively lists children DIDs of type `did_type`
+    for the DIDs given as input in a scope/name (temporary) table.
 
     did_type defines the desired type of DIDs in the result. If set to DIDType.Dataset,
     will only resolve containers and return datasets. If set to DIDType.File, will
@@ -1605,7 +1606,7 @@ def list_one_did_childs_stmt(
         did_type: DIDType,
 ) -> "Select[tuple[InternalScope, str]]":
     """
-    Returns the sqlalchemy query for recursively fetching the child dids of type
+    Returns the sqlalchemy query for recursively fetching the child DIDs of type
     'did_type' for the input did.
 
     did_type defines the desired type of DIDs in the result. If set to DIDType.Dataset,
@@ -1667,7 +1668,7 @@ def list_child_datasets(
     :param scope:     The scope.
     :param name:      The name.
     :param session:   The database session
-    :returns:         List of dids
+    :returns:         List of DIDs
     :rtype:           Generator
     """
     stmt = list_one_did_childs_stmt(scope, name, did_type=DIDType.DATASET)
@@ -1939,7 +1940,7 @@ def get_did(scope: "InternalScope", name: str, dynamic_depth: "Optional[DIDType]
     :param scope: The scope name.
     :param name: The data identifier name.
     :param dynamic_depth: the DID type to use as source for estimation of this DIDs length/bytes.
-    If set to None, or to a value which doesn't make sense (ex: requesting depth = CONTAINER for a did of type DATASET)
+    If set to None, or to a value which doesn't make sense (ex: requesting depth = CONTAINER for a DID of type DATASET)
     will not compute the size dynamically.
     :param session: The database session in use.
     """
@@ -2017,7 +2018,7 @@ def set_dids_metadata_bulk(
     """
     Add metadata to a list of data identifiers.
 
-    :param dids: A list of dids including metadata.
+    :param dids: A list of DIDs including metadata.
     :param recursive: Option to propagate the metadata change to content.
     :param session: The database session in use.
     """
@@ -2043,7 +2044,7 @@ def get_metadata(
     :param session: The database session in use.
 
 
-    :returns: List of HARDCODED metadata for did.
+    :returns: List of HARDCODED metadata for DID.
     """
     return did_meta_plugins.get_metadata(scope, name, plugin=plugin, session=session)
 
@@ -2055,11 +2056,11 @@ def list_parent_dids_bulk(
     session: "Session"
 ) -> "Iterator[dict[str, Any]]":
     """
-    List parent datasets and containers of a did.
+    List parent datasets and containers of a DID.
 
-    :param dids:               A list of dids.
+    :param dids:               A list of DIDs.
     :param session:            The database session in use.
-    :returns:                  List of dids.
+    :returns:                  List of DIDs.
     :rtype:                    Generator.
     """
     condition = []
@@ -2093,8 +2094,8 @@ def get_metadata_bulk(
     session: "Session"
 ) -> "Iterator[dict[str, Any]]":
     """
-    Get metadata for a list of dids
-    :param dids:               A list of dids.
+    Get metadata for a list of DIDs
+    :param dids:               A list of DIDs.
     :param inherit:            A boolean. If set to true, the metadata of the parent are concatenated.
     :param plugin:             A string. The metadata plugin to use or 'ALL' for all.
     :param session:            The database session in use.
@@ -2172,8 +2173,8 @@ def delete_metadata(
     """
     Delete a key from the metadata column
 
-    :param scope: the scope of did
-    :param name: the name of the did
+    :param scope: the scope of DID
+    :param name: the name of the DID
     :param key: the key to be deleted
     """
     did_meta_plugins.delete_metadata(scope, name, key, session=session)
@@ -2241,7 +2242,7 @@ def set_status(
                            'bytes': values['bytes'],
                            'length': values['length'],
                            'events': values['events']}
-                if scope.vo != 'def':
+                if scope.vo != DEFAULT_VO:
                     message['vo'] = scope.vo
 
                 add_message('CLOSE', message, session=session)
@@ -2259,7 +2260,7 @@ def set_status(
                 values['is_open'] = True
 
                 message = {'scope': scope.external, 'name': name}
-                if scope.vo != 'def':
+                if scope.vo != DEFAULT_VO:
                     message['vo'] = scope.vo
                 add_message('OPEN', message, session=session)
 
@@ -2312,7 +2313,7 @@ def list_dids(
 
     :param scope: the scope name.
     :param filters: dictionary of attributes by which the results should be filtered.
-    :param did_type: the type of the did: all(container, dataset, file), collection(dataset or container), dataset, container, file.
+    :param did_type: the type of the DID: all(container, dataset, file), collection(dataset or container), dataset, container, file.
     :param ignore_case: ignore case distinctions.
     :param limit: limit number.
     :param offset: offset number.
@@ -2332,7 +2333,7 @@ def get_did_atime(
     session: "Session"
 ) -> datetime:
     """
-    Get the accessed_at timestamp for a did. Just for testing.
+    Get the accessed_at timestamp for a DID. Just for testing.
     :param scope: the scope name.
     :param name: The data identifier name.
     :param session: Database session to use.
@@ -2356,7 +2357,7 @@ def get_did_access_cnt(
     session: "Session"
 ) -> int:
     """
-    Get the access_cnt for a did. Just for testing.
+    Get the access_cnt for a DID. Just for testing.
     :param scope: the scope name.
     :param name: The data identifier name.
     :param session: Database session to use.
@@ -2383,7 +2384,7 @@ def get_dataset_by_guid(
     :param guid: The GUID.
     :param session: Database session to use.
 
-    :returns: A did.
+    :returns: A DID.
     """
     stmt = select(
         models.DataIdentifier
@@ -2422,9 +2423,9 @@ def touch_dids(
     session: "Session"
 ) -> bool:
     """
-    Update the accessed_at timestamp and the access_cnt of the given dids.
+    Update the accessed_at timestamp and the access_cnt of the given DIDs.
 
-    :param replicas: the list of dids.
+    :param replicas: the list of DIDs.
     :param session: The database session in use.
 
     :returns: True, if successful, False otherwise.
@@ -2489,11 +2490,11 @@ def __resolve_bytes_length_events_did(
         *, session: "Session",
 ) -> tuple[int, int, int]:
     """
-    Resolve bytes, length and events of a did
+    Resolve bytes, length and events of a DID
 
     :did: the DID ORM object for which we perform the resolution
     :param dynamic_depth: the DID type to use as source for estimation of this DIDs length/bytes.
-    If set to None, or to a value which doesn't make sense (ex: requesting depth = DATASET for a did of type FILE)
+    If set to None, or to a value which doesn't make sense (ex: requesting depth = DATASET for a DID of type FILE)
     will not compute the size dynamically.
     :param session: The database session in use.
     """
@@ -2554,7 +2555,7 @@ def resurrect(dids: "Iterable[Mapping[str, Any]]", *, session: "Session") -> Non
     """
     Resurrect data identifiers.
 
-    :param dids: The list of dids to resurrect.
+    :param dids: The list of DIDs to resurrect.
     :param session: The database session in use.
     """
     for did in dids:
@@ -2651,7 +2652,7 @@ def add_did_to_followed(
     session: "Session"
 ) -> None:
     """
-    Mark a did as followed by the given account
+    Mark a DID as followed by the given account
 
     :param scope: The scope name.
     :param name: The data identifier name.
@@ -2672,13 +2673,13 @@ def add_dids_to_followed(
     """
     Bulk mark datasets as followed
 
-    :param dids: A list of dids.
+    :param dids: A list of DIDs.
     :param account: The account owner.
     :param session: The database session in use.
     """
     try:
         for did in dids:
-            # Get the did details corresponding to the scope and name passed.
+            # Get the DID details corresponding to the scope and name passed.
             stmt = select(
                 models.DataIdentifier
             ).where(
@@ -2705,7 +2706,7 @@ def get_users_following_did(
     session: "Session"
 ) -> "Iterator[dict[str, InternalAccount]]":
     """
-    Return list of users following a did
+    Return list of users following a DID
 
     :param scope: The scope name.
     :param name: The data identifier name.
@@ -2735,7 +2736,7 @@ def remove_did_from_followed(
     session: "Session"
 ) -> None:
     """
-    Mark a did as not followed
+    Mark a DID as not followed
 
     :param scope: The scope name.
     :param name: The data identifier name.
@@ -2756,7 +2757,7 @@ def remove_dids_from_followed(
     """
     Bulk mark datasets as not followed
 
-    :param dids: A list of dids.
+    :param dids: A list of DIDs.
     :param account: The account owner.
     :param session: The database session in use.
     """
@@ -2786,11 +2787,11 @@ def trigger_event(
     session: "Session"
 ) -> None:
     """
-    Records changes occurring in the did to the FollowEvent table
+    Records changes occurring in the DID to the FollowEvent table
 
     :param scope: The scope name.
     :param name: The data identifier name.
-    :param event_type: The type of event affecting the did.
+    :param event_type: The type of event affecting the DID.
     :param payload: Any message to be stored along with the event.
     :param session: The database session in use.
     """
@@ -2887,10 +2888,10 @@ def insert_content_history(
     session: "Session"
 ) -> None:
     """
-    Insert into content history a list of did
+    Insert into content history a list of DID
 
     :param filter_: Content clause of the files to archive
-    :param did_created_at: Creation date of the did
+    :param did_created_at: Creation date of the DID
     :param session: The database session in use.
     """
     new_did_created_at = did_created_at
@@ -2940,7 +2941,7 @@ def insert_deleted_dids(filter_: "ColumnExpressionArgument[bool]", *, session: "
     """
     Insert into deleted_dids a list of did
 
-    :param filter_: The database filter to retrieve dids for archival
+    :param filter_: The database filter to retrieve DIDs for archival
     :param session: The database session in use.
     """
     stmt = select(

rucio/core/did_meta_plugins/__init__.py

@@ -76,16 +76,16 @@ RESTRICTED_CHARACTERS = {
 @read_session
 def get_metadata(scope, name, plugin="DID_COLUMN", *, session: "Session"):
     """
-    Gets the metadata for a given did from a specified plugin.
+    Gets the metadata for a given DID from a specified plugin.
 
     If [plugin] is set to "all", metadata from all available metadata plugins will be returned,
     else [plugin] can be used to only return the metadata using a specific plugin.
 
-    :param scope: The scope of the did.
+    :param scope: The scope of the DID.
     :param name: The data identifier name.
     :param plugin: (optional) Filter specific metadata plugins.
     :param session: (optional) The database session in use.
-    :returns: Dictionary containing metadata for did.
+    :returns: Dictionary containing metadata for DID.
     :raises: UnsupportedMetadataPlugin: If the specified plugin is not enabled/available
     """
     if plugin.lower() == "all":
@@ -104,9 +104,9 @@ def get_metadata(scope, name, plugin="DID_COLUMN", *, session: "Session"):
 @transactional_session
 def set_metadata(scope, name, key, value, recursive=False, *, session: "Session"):
     """
-    Sets metadata for a given did.
+    Sets metadata for a given DID.
 
-    :param scope: The scope of the did.
+    :param scope: The scope of the DID.
     :param name: The data identifier name.
     :param key: Metadata key.
     :param value: Metadata value.
@@ -138,7 +138,7 @@ def set_metadata(scope, name, key, value, recursive=False, *, session: "Session"
 @transactional_session
 def set_metadata_bulk(scope, name, meta, recursive=False, *, session: "Session"):
     """
-    Bulk sets metadata for a given did.
+    Bulk sets metadata for a given DID.
 
     :param scope: The scope name.
     :param name: The data identifier name.
@@ -188,8 +188,8 @@ def delete_metadata(scope, name, key, *, session: "Session"):
     """
     Deletes metadata stored for a given key.
 
-    :param scope: The scope of the did.
-    :param name: The name of the did.
+    :param scope: The scope of the DID.
+    :param name: The name of the DID.
     :param key: Key of the metadata.
     """
     for metadata_plugin in METADATA_PLUGIN_MODULES:
@@ -207,7 +207,7 @@ def list_dids(scope=None, filters=None, did_type='collection', ignore_case=False
 
     :param scope: the scope name.
     :param filters: dictionary of attributes by which the results should be filtered.
-    :param did_type: the type of the did: all(container, dataset, file), collection(dataset or container), dataset, container, file.
+    :param did_type: the type of the DID: all(container, dataset, file), collection(dataset or container), dataset, container, file.
     :param ignore_case: ignore case distinctions.
     :param limit: limit number.
     :param offset: offset number.
@@ -215,7 +215,7 @@ def list_dids(scope=None, filters=None, did_type='collection', ignore_case=False
     :param recursive: Recursively list DIDs content.
     :param ignore_dids: List of DIDs to refrain from yielding.
     :param session: The database session in use.
-    :returns: List of dids satisfying metadata criteria.
+    :returns: List of DIDs satisfying metadata criteria.
     :raises: InvalidMetadata
     """
     # backwards compatibility for filters as single {}.

rucio/core/did_meta_plugins/did_column_meta.py

@@ -37,7 +37,7 @@ if TYPE_CHECKING:
 
 class DidColumnMeta(DidMetaPlugin):
     """
-    A metadata plugin to interact with the base did table metadata.
+    A metadata plugin to interact with the base DID table metadata.
     """
     def __init__(self):
         super(DidColumnMeta, self).__init__()
@@ -78,7 +78,7 @@ class DidColumnMeta(DidMetaPlugin):
                 except TypeError as error:
                     raise exception.InvalidValueForKey(error)
                 if not rowcount:
-                    # check for did presence
+                    # check for DID presence
                     raise exception.UnsupportedOperation('%s for %s:%s cannot be updated' % (key, scope, name))
             elif key == 'lifetime':
                 try:
@@ -89,12 +89,12 @@ class DidColumnMeta(DidMetaPlugin):
                 except TypeError as error:
                     raise exception.InvalidValueForKey(error)
                 if not rowcount:
-                    # check for did presence
+                    # check for DID presence
                     raise exception.UnsupportedOperation('%s for %s:%s cannot be updated' % (key, scope, name))
             elif key in ['guid', 'events']:
                 rowcount = did_query.filter_by(did_type=DIDType.FILE).update({key: value}, synchronize_session=False)
                 if not rowcount:
-                    # check for did presence
+                    # check for DID presence
                     raise exception.UnsupportedOperation('%s for %s:%s cannot be updated' % (key, scope, name))
 
                 session.query(models.DataIdentifierAssociation).filter_by(child_scope=scope, child_name=name, child_type=DIDType.FILE).update({key: value}, synchronize_session=False)
@@ -105,7 +105,7 @@ class DidColumnMeta(DidMetaPlugin):
             elif key == 'adler32':
                 rowcount = did_query.filter_by(did_type=DIDType.FILE).update({key: value}, synchronize_session=False)
                 if not rowcount:
-                    # check for did presence
+                    # check for DID presence
                     raise exception.UnsupportedOperation('%s for %s:%s cannot be updated' % (key, scope, name))
 
                 session.query(models.DataIdentifierAssociation).filter_by(child_scope=scope, child_name=name, child_type=DIDType.FILE).update({key: value}, synchronize_session=False)
@@ -114,7 +114,7 @@ class DidColumnMeta(DidMetaPlugin):
             elif key == 'bytes':
                 rowcount = did_query.filter_by(did_type=DIDType.FILE).update({key: value}, synchronize_session=False)
                 if not rowcount:
-                    # check for did presence
+                    # check for DID presence
                     raise exception.UnsupportedOperation('%s for %s:%s cannot be updated' % (key, scope, name))
 
                 session.query(models.DataIdentifierAssociation).filter_by(child_scope=scope, child_name=name, child_type=DIDType.FILE).update({key: value}, synchronize_session=False)
@@ -176,7 +176,7 @@ class DidColumnMeta(DidMetaPlugin):
 
         :param scope: the scope name.
         :param filters: dictionary of attributes by which the results should be filtered.
-        :param did_type: the type of the did: all(container, dataset, file), collection(dataset or container), dataset, container, file.
+        :param did_type: the type of the DID: all(container, dataset, file), collection(dataset or container), dataset, container, file.
         :param ignore_case: ignore case distinctions.
         :param limit: limit number.
         :param offset: offset number.
@@ -281,8 +281,8 @@ class DidColumnMeta(DidMetaPlugin):
         """
         Deletes the metadata stored for the given key.
 
-        :param scope: The scope of the did.
-        :param name: The name of the did.
+        :param scope: The scope of the DID.
+        :param name: The name of the DID.
         :param key: Key of the metadata.
         """
         raise NotImplementedError('The DidColumnMeta plugin does not currently support deleting metadata.')

rucio/core/did_meta_plugins/did_meta_plugin_interface.py

@@ -113,8 +113,8 @@ class DidMetaPlugin(metaclass=ABCMeta):
         """
         Deletes the metadata stored for the given key.
 
-        :param scope: The scope of the did.
-        :param name: The name of the did.
+        :param scope: The scope of the DID.
+        :param name: The name of the DID.
         :param key: Key of the metadata.
         :param session: The database session in use.
         """
@@ -139,7 +139,7 @@ class DidMetaPlugin(metaclass=ABCMeta):
 
         :param scope: the scope name.
         :param filters: dictionary of attributes by which the results should be filtered.
-        :param did_type: the type of the did: all(container, dataset, file), collection(dataset or container), dataset, container, file.
+        :param did_type: the type of the DID: all(container, dataset, file), collection(dataset or container), dataset, container, file.
         :param ignore_case: ignore case distinctions.
         :param limit: limit number.
         :param offset: offset number.

rucio/core/did_meta_plugins/elasticsearch_meta.py

@@ -109,7 +109,7 @@ class ElasticDidMeta(DidMetaPlugin):
         :param scope: The scope name
         :param name: The data identifier name
         :param session: The database session in use
-        :returns: The metadata for the did
+        :returns: The metadata for the DID
         :raises DataIdentifierNotFound: If the DID metadata is not found.
         :raises RucioException: If another error occurs during the process.
         """
@@ -136,8 +136,8 @@ class ElasticDidMeta(DidMetaPlugin):
         """
         Set single metadata key.
 
-        :param scope: the scope of did
-        :param name: the name of the did
+        :param scope: the scope of DID
+        :param name: the name of the DID
         :param key: the key to be added
         :param value: the value of the key to be added
         :param recursive: recurse into DIDs (not supported)
@@ -159,8 +159,8 @@ class ElasticDidMeta(DidMetaPlugin):
         """
         Bulk set metadata keys.
 
-        :param scope: the scope of did
-        :param name: the name of the did
+        :param scope: the scope of DID
+        :param name: the name of the DID
         :param meta: dictionary of metadata keypairs to be added
         :param recursive: recurse into DIDs (not supported)
         :param session: The database session in use
@@ -201,8 +201,8 @@ class ElasticDidMeta(DidMetaPlugin):
         """
         Delete a key from metadata.
 
-        :param scope: the scope of did
-        :param name: the name of the did
+        :param scope: the scope of DID
+        :param name: the name of the DID
         :param key: the key to be deleted
         :raises DataIdentifierNotFound: If the DID is not found.
         :raises RucioException: If an error occurs while setting the metadata.