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

rucio/core/did_meta_plugins/json_meta.py

@@ -122,8 +122,8 @@ class JSONDidMeta(DidMetaPlugin):
         """
         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
         :param session: The database session in use.
         """

rucio/core/did_meta_plugins/mongo_meta.py

@@ -93,9 +93,9 @@ class MongoDidMeta(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
         """
-        # get first document with this did == _id
+        # get first document with this DID == _id
         doc = self.col.find_one({
             "_id": "{}:{}".format(scope.internal, name)
         })
@@ -113,8 +113,8 @@ class MongoDidMeta(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)
@@ -126,8 +126,8 @@ class MongoDidMeta(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 metadata: dictionary of metadata keypairs to be added
         :param recursive: recurse into DIDs (not supported)
         :param session: The database session in use
@@ -137,7 +137,7 @@ class MongoDidMeta(DidMetaPlugin):
             if key in metadata:
                 metadata.pop(key)
 
-        # set first document with did == _id
+        # set first document with DID == _id
         self.col.update_one(
             {
                 "_id": "{}:{}".format(scope.internal, name)
@@ -157,8 +157,8 @@ class MongoDidMeta(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
         """
         meta = {key: ""}

rucio/core/did_meta_plugins/postgres_meta.py

@@ -199,7 +199,7 @@ class ExternalPostgresJSONDidMeta(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
         """
         statement = sql.SQL("SELECT data from {} WHERE scope = {} AND name = {}").format(
             sql.Identifier(self.table),
@@ -221,8 +221,8 @@ class ExternalPostgresJSONDidMeta(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)
@@ -234,8 +234,8 @@ class ExternalPostgresJSONDidMeta(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 metadata: dictionary of metadata keypairs to be added
         :param recursive: recurse into DIDs (not supported)
         :param session: The database session in use
@@ -262,8 +262,8 @@ class ExternalPostgresJSONDidMeta(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
         :param session: the database session in use
         """

rucio/core/dirac.py

@@ -21,6 +21,7 @@ from sqlalchemy import and_, select
 from sqlalchemy.exc import NoResultFound
 
 from rucio.common.config import config_get
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import ConfigNotFound, InvalidType, RucioException, UnsupportedOperation
 from rucio.common.types import InternalAccount, InternalScope
 from rucio.common.utils import extract_scope
@@ -46,7 +47,7 @@ def _exists(
     session: "Session"
 ) -> tuple[bool, Optional[DIDType]]:
     """
-    Check if the did exists
+    Check if the DID exists
 
     :scope: The scope
     :name: The name
@@ -74,7 +75,7 @@ def add_files(
     account: str,
     ignore_availability: bool,
     parents_metadata: Optional[dict[str, Any]] = None,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     *,
     session: "Session"
 ) -> None:

rucio/core/distance.py

@@ -19,6 +19,7 @@ from sqlalchemy.exc import DatabaseError, IntegrityError
 from sqlalchemy.orm import aliased
 
 from rucio.common import exception
+from rucio.common.constants import DEFAULT_VO
 from rucio.db.sqla.models import RSE, Distance
 from rucio.db.sqla.session import read_session, transactional_session
 
@@ -147,7 +148,7 @@ def list_distances(filter_: Optional[dict[str, Any]] = None, *, session: "Sessio
 
 
 @read_session
-def export_distances(vo: str = 'def', *, session: "Session") -> dict[str, Any]:
+def export_distances(vo: str = DEFAULT_VO, *, session: "Session") -> dict[str, Any]:
     """
     Export distances between all the RSEs using RSE ids.
     :param vo: The VO to export.

rucio/core/exporter.py

@@ -14,6 +14,7 @@
 
 from typing import TYPE_CHECKING, Any
 
+from rucio.common.constants import DEFAULT_VO
 from rucio.core import distance as distance_module
 from rucio.core import rse as rse_module
 from rucio.db.sqla.session import transactional_session
@@ -23,7 +24,7 @@ if TYPE_CHECKING:
 
 
 @transactional_session
-def export_rses(vo: str = 'def', *, session: "Session") -> dict[str, dict[str, Any]]:
+def export_rses(vo: str = DEFAULT_VO, *, session: "Session") -> dict[str, dict[str, Any]]:
     """
     Export RSE data.
 
@@ -39,7 +40,7 @@ def export_rses(vo: str = 'def', *, session: "Session") -> dict[str, dict[str, A
 
 
 @transactional_session
-def export_data(vo: str = 'def', distance: bool = True, *, session: "Session") -> dict[str, Any]:
+def export_data(vo: str = DEFAULT_VO, distance: bool = True, *, session: "Session") -> dict[str, Any]:
     """
     Export data.
 

rucio/core/importer.py

@@ -17,7 +17,7 @@ from typing import TYPE_CHECKING, Any
 from sqlalchemy import select
 
 from rucio.common.config import config_get
-from rucio.common.constants import RseAttr
+from rucio.common.constants import DEFAULT_VO, RseAttr
 from rucio.common.exception import RSEOperationNotSupported
 from rucio.common.types import InternalAccount
 from rucio.core import account as account_module
@@ -35,7 +35,7 @@ if TYPE_CHECKING:
 
 
 @transactional_session
-def import_rses(rses: dict[str, dict[str, Any]], rse_sync_method: str = 'edit', attr_sync_method: str = 'edit', protocol_sync_method: str = 'edit', vo: str = 'def', *, session: "Session") -> None:
+def import_rses(rses: dict[str, dict[str, Any]], rse_sync_method: str = 'edit', attr_sync_method: str = 'edit', protocol_sync_method: str = 'edit', vo: str = DEFAULT_VO, *, session: "Session") -> None:
     new_rses = []
     for rse_name in rses:
         rse = rses[rse_name]
@@ -143,7 +143,7 @@ def import_rses(rses: dict[str, dict[str, Any]], rse_sync_method: str = 'edit',
 
 
 @transactional_session
-def import_distances(distances, vo: str = 'def', *, session: "Session") -> None:
+def import_distances(distances, vo: str = DEFAULT_VO, *, session: "Session") -> None:
     for src_rse_name in distances:
         src = rse_module.get_rse_id(rse=src_rse_name, vo=vo, session=session)
         for dest_rse_name in distances[src_rse_name]:
@@ -192,7 +192,7 @@ def import_identities(identities: 'Iterable[dict[str, Any]]', account_name: str,
 
 
 @transactional_session
-def import_accounts(accounts: 'Iterable[dict[str, Any]]', vo: str = 'def', *, session: "Session") -> None:
+def import_accounts(accounts: 'Iterable[dict[str, Any]]', vo: str = DEFAULT_VO, *, session: "Session") -> None:
     vo_filter = {'account': InternalAccount(account='*', vo=vo)}
     old_accounts = {account['account']: account for account in account_module.list_accounts(filter_=vo_filter, session=session)}
     missing_accounts = [account for account in accounts if account['account'] not in old_accounts]
@@ -234,7 +234,7 @@ def import_accounts(accounts: 'Iterable[dict[str, Any]]', vo: str = 'def', *, se
 
 
 @transactional_session
-def import_data(data: dict[str, Any], vo: str = 'def', *, session: "Session") -> None:
+def import_data(data: dict[str, Any], vo: str = DEFAULT_VO, *, session: "Session") -> None:
     """
     Import data to add and update records in Rucio.
 

rucio/core/lifetime_exception.py

@@ -85,7 +85,7 @@ def add_exception(
     """
     Add exceptions to Lifetime Model.
 
-    :param dids:        The list of dids
+    :param dids:        The list of DIDs
     :param account:     The account of the requester.
     :param pattern:     The account.
     :param comments:    The comments associated to the exception.
@@ -160,7 +160,7 @@ def __add_exception(
     """
     Add exceptions to Lifetime Model.
 
-    :param dids:                   The list of dids
+    :param dids:                   The list of DIDs
     :param account:                The account of the requester.
     :param pattern:                The pattern of the exception (not used).
     :param comments:               The comments associated to the exception.

rucio/core/lock.py

@@ -81,7 +81,7 @@ def get_dataset_locks_bulk(dids: "Iterable[dict[str, Any]]", *, session: "Sessio
     Get the dataset locks of a list of datasets or containers, recursively
 
     :param dids:           List of dictionaries {"scope":scope(type:InternalScope), "name":name,
-                           "type":did type(DIDType.DATASET or DIDType.CONTAINER)}, "type" is optional
+                           "type":DID type(DIDType.DATASET or DIDType.CONTAINER)}, "type" is optional
     :param session:        The db session to use.
     :return:               Generator of lock_info dicts, may contain duplicates
     """
@@ -156,8 +156,8 @@ def get_replica_locks(scope: InternalScope, name: str, nowait: bool = False, res
     """
     Get the active replica locks for a file
 
-    :param scope:          Scope of the did.
-    :param name:           Name of the did.
+    :param scope:          Scope of the DID.
+    :param name:           Name of the DID.
     :param nowait:         Nowait parameter for the FOR UPDATE statement.
     :param restrict_rses:  Possible RSE_ids to filter on.
     :param session:        The db session.
@@ -334,8 +334,8 @@ def successful_transfer(scope: InternalScope, name: str, rse_id: str, nowait: bo
     """
     Update the state of all replica locks because of an successful transfer
 
-    :param scope:    Scope of the did
-    :param name:     Name of the did
+    :param scope:    Scope of the DID
+    :param name:     Name of the DID
     :param rse_id:   RSE id
     :param nowait:   Nowait parameter for the for_update queries.
     :param session:  DB Session.
@@ -426,8 +426,8 @@ def failed_transfer(scope: InternalScope, name: str, rse_id: str, error_message:
     Update the state of all replica locks because of a failed transfer.
     If a transfer is permanently broken for a rule, the broken_rule_id should be filled which puts this rule into the SUSPENDED state.
 
-    :param scope:           Scope of the did.
-    :param name:            Name of the did.
+    :param scope:           Scope of the DID.
+    :param name:            Name of the DID.
     :param rse_id:          RSE id.
     :param error_message:   The error why this transfer failed.
     :param broken_rule_id:  Id of the rule which will be suspended.

rucio/core/meta_conventions.py

@@ -180,10 +180,10 @@ def list_values(key: str, *, session: "Session") -> list[str]:
 @read_session
 def validate_meta(meta: dict, did_type: DIDType, *, session: "Session") -> None:
     """
-    Validates metadata for a did.
+    Validates metadata for a DID.
 
     :param meta: the dictionary of metadata.
-    :param meta: the type of the did, e.g, DATASET, CONTAINER, FILE.
+    :param meta: the type of the DID, e.g, DATASET, CONTAINER, FILE.
     :param session: The database session in use.
 
     :raises InvalidObject:

rucio/core/monitor.py

@@ -444,5 +444,5 @@ class MetricManager:
         for server in self.push_gateways:
             try:
                 push_to_gateway(server.strip(), job=job, registry=self.registry, grouping_key=grouping_key)
-            except:
+            except Exception:
                 continue

rucio/core/naming_convention.py

@@ -69,7 +69,7 @@ def add_naming_convention(
         new_convention.save(session=session)
     except IntegrityError:
         raise Duplicate('Naming convention already exists!')
-    except:
+    except Exception:
         raise RucioException(str(format_exc()))
 
 

rucio/core/nongrid_trace.py

@@ -59,7 +59,7 @@ ROTATING_LOGGER.addHandler(ROTATING_HANDLER)
 BROKERS_ALIAS, BROKERS_RESOLVED = [], []
 try:
     BROKERS_ALIAS = config_get_list('nongrid-trace', 'brokers')
-except:
+except Exception:
     raise Exception('Could not load brokers from configuration')
 
 PORT = config_get_int('nongrid-trace', 'port')
@@ -74,7 +74,7 @@ for broker in BROKERS_ALIAS:
     try:
         addrinfos = socket.getaddrinfo(broker, 0, socket.AF_INET, 0, socket.IPPROTO_TCP)
         BROKERS_RESOLVED = [ai[4][0] for ai in addrinfos]
-    except:
+    except Exception:
         pass
 
 CONNS = []

rucio/core/oidc.py

@@ -173,7 +173,7 @@ def __get_rucio_oidc_clients(keytimeout: int = 43200) -> tuple[dict, dict]:
     try:
         with open(IDPSECRETS) as client_secret_file:
             client_secrets = json.load(client_secret_file)
-    except:
+    except Exception:
         return (clients, admin_clients)
     for iss in client_secrets:
         try:
@@ -1426,7 +1426,7 @@ def validate_jwt(json_web_token: str, *, session: "Session") -> dict[str, Any]:
             try:
                 token_dict['audience'] = inspect_claims['aud']
                 token_dict['authz_scope'] = inspect_claims['scope']
-            except:
+            except Exception:
                 pass
         METRICS.counter(name='JSONWebToken.valid').inc()
         # if token is valid and coming from known issuer --> check aud and scope and save it if unknown

rucio/core/permission/__init__.py

@@ -20,7 +20,8 @@ from typing import TYPE_CHECKING, Any
 
 import rucio.core.permission.generic
 from rucio.common import config, exception
-from rucio.common.plugins import check_policy_package_version
+from rucio.common.constants import DEFAULT_VO
+from rucio.common.plugins import check_policy_module_version
 from rucio.common.policy import get_policy
 
 if TYPE_CHECKING:
@@ -54,9 +55,10 @@ if not multivo:
                 policy = environ['RUCIO_POLICY_PACKAGE']
             else:
                 policy = config.config_get('policy', 'package', check_config_table=False)
-            check_policy_package_version(policy)
+            package_module = importlib.import_module(policy)
+            check_policy_module_version(package_module)
             policy = policy + ".permission"
-        except (NoOptionError, NoSectionError):
+        except (NoOptionError, NoSectionError, ModuleNotFoundError):
             # fall back to old system for now
             policy = 'rucio.core.permission.' + fallback_policy.lower()
     else:
@@ -79,7 +81,7 @@ if not multivo:
     except ImportError:
         raise exception.ErrorLoadingPolicyPackage(policy)
 
-    permission_modules["def"] = module
+    permission_modules[DEFAULT_VO] = module
 
 
 def load_permission_for_vo(vo: str) -> None:
@@ -91,9 +93,10 @@ def load_permission_for_vo(vo: str) -> None:
                 policy = environ[env_name]
             else:
                 policy = config.config_get('policy', 'package-' + vo)
-            check_policy_package_version(policy)
+            package_module = importlib.import_module(policy)
+            check_policy_module_version(package_module)
             policy = policy + ".permission"
-        except (NoOptionError, NoSectionError):
+        except (NoOptionError, NoSectionError, ModuleNotFoundError):
             # fall back to old system for now
             try:
                 policy = config.config_get('policy', 'permission')

rucio/core/permission/generic.py

@@ -1086,7 +1086,7 @@ def perm_add_bad_pfns(issuer: "InternalAccount", kwargs: dict[str, Any], *, sess
 
 def perm_remove_did_from_followed(issuer: "InternalAccount", kwargs: dict[str, Any], *, session: "Optional[Session]" = None) -> bool:
     """
-    Checks if an account can remove did from followed table.
+    Checks if an account can remove DID from followed table.
 
     :param issuer: Account identifier which issues the command.
     :param kwargs: List of arguments for the action.
@@ -1101,7 +1101,7 @@ def perm_remove_did_from_followed(issuer: "InternalAccount", kwargs: dict[str, A
 
 def perm_remove_dids_from_followed(issuer: "InternalAccount", kwargs: dict[str, Any], *, session: "Optional[Session]" = None) -> bool:
     """
-    Checks if an account can bulk remove dids from followed table.
+    Checks if an account can bulk remove DIDs from followed table.
 
     :param issuer: Account identifier which issues the command.
     :param kwargs: List of arguments for the action.

rucio/core/permission/generic_multi_vo.py

@@ -1055,7 +1055,7 @@ def perm_add_bad_pfns(issuer, kwargs, *, session: "Optional[Session]" = None):
 
 def perm_remove_did_from_followed(issuer, kwargs, *, session: "Optional[Session]" = None):
     """
-    Checks if an account can remove did from followed table.
+    Checks if an account can remove DID from followed table.
 
     :param issuer: Account identifier which issues the command.
     :param kwargs: List of arguments for the action.
@@ -1070,7 +1070,7 @@ def perm_remove_did_from_followed(issuer, kwargs, *, session: "Optional[Session]
 
 def perm_remove_dids_from_followed(issuer, kwargs, *, session: "Optional[Session]" = None):
     """
-    Checks if an account can bulk remove dids from followed table.
+    Checks if an account can bulk remove DIDs from followed table.
 
     :param issuer: Account identifier which issues the command.
     :param kwargs: List of arguments for the action.

rucio/core/replica.py

@@ -41,7 +41,7 @@ import rucio.core.lock
 from rucio.common import exception
 from rucio.common.cache import MemcacheRegion
 from rucio.common.config import config_get, config_get_bool
-from rucio.common.constants import RseAttr, SuspiciousAvailability
+from rucio.common.constants import DEFAULT_VO, RseAttr, SuspiciousAvailability
 from rucio.common.types import InternalAccount, InternalScope, IPDict, LFNDict, is_str_list
 from rucio.common.utils import add_url_query, chunks, clean_pfns, str_to_date
 from rucio.core.credential import get_signed_url
@@ -249,7 +249,7 @@ def list_bad_replicas_status(
     older_than: Optional[datetime] = None,
     limit: Optional[int] = None,
     list_pfns: Optional[bool] = False,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     *,
     session: "Session"
 ) -> list[dict[str, Any]]:
@@ -536,7 +536,7 @@ def declare_bad_file_replicas(
 @read_session
 def get_pfn_to_rse(
     pfns: "Iterable[str]",
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     *,
     session: "Session"
 ) -> tuple[Optional[str], dict[str, Any], dict[str, list[str]]]:
@@ -711,7 +711,7 @@ def list_bad_replicas(
 def get_did_from_pfns(
     pfns: "Iterable[str]",
     rse_id: Optional[str] = None,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     *,
     session: "Session"
 ) -> 'Iterator[dict[str, dict[str, Any]]]':
@@ -1298,7 +1298,7 @@ def list_replicas(
             session: "Session"
     ) -> tuple[int, Any]:
         """
-        Find all FILE dids contained in collections from temp_table and return them in a newly
+        Find all FILE DIDs contained in collections from temp_table and return them in a newly
         created temporary table.
         """
         resolved_files_temp_table = temp_table_mngr(session).create_scope_name_table()
@@ -1391,7 +1391,7 @@ def list_replicas(
         Builds a query which list the replicas of FILEs from users input, but ignores
         collections in the same input.
 
-        Note: These FILE dids must be returned to the user even if they don't have replicas,
+        Note: These FILE DIDs must be returned to the user even if they don't have replicas,
         hence the outerjoin against the replicas_subquery.
         """
         return select(
@@ -1426,7 +1426,7 @@ def list_replicas(
             session: "Session"
     ) -> tuple[int, int, int]:
         """
-        Find how many files, collections and constituents are among the dids in the temp_table
+        Find how many files, collections and constituents are among the DIDs in the temp_table
         """
         stmt = select(
             func.sum(
@@ -1450,7 +1450,7 @@ def list_replicas(
     if dids:
         filter_ = {'vo': dids[0]['scope'].vo}
     else:
-        filter_ = {'vo': 'def'}
+        filter_ = {'vo': DEFAULT_VO}
 
     dids = {(did['scope'], did['name']): did for did in dids}  # type: ignore (Deduplicate input)
     if not dids:
@@ -1493,7 +1493,7 @@ def list_replicas(
             nrandom
             # Only try this optimisation if list_replicas was called on collection(s).
             # I didn't consider handling the case when list_replica is called with a mix of
-            # file/archive/collection dids: database queries in those cases are more complex
+            # file/archive/collection DIDs: database queries in those cases are more complex
             # and people don't usually call list_replicas with nrandom on file/archive_constituents anyway.
             and (num_files_in_collections and not num_constituents and not num_files)
             # The following code introduces overhead if it fails to pick n random replicas.
@@ -1533,7 +1533,7 @@ def list_replicas(
         )
         session.execute(stmt)
 
-        # Fetch all replicas for randomly selected dids and apply filters on python side
+        # Fetch all replicas for randomly selected DIDs and apply filters on python side
         stmt = _list_replicas_for_collection_files_stmt(random_dids_temp_table, replicas_subquery)
         stmt = stmt.order_by('scope', 'name')
         replica_tuples = session.execute(stmt)
@@ -1583,7 +1583,7 @@ def __bulk_add_new_file_dids(
     session: "Session"
 ) -> Literal[True]:
     """
-    Bulk add new dids.
+    Bulk add new DIDs.
 
     :param dids: the list of new files.
     :param account: The account owner.
@@ -1636,7 +1636,7 @@ def __bulk_add_file_dids(
     session: "Session"
 ) -> list[dict[str, Any]]:
     """
-    Bulk add new dids.
+    Bulk add new DIDs.
 
     :param dids: the list of files.
     :param account: The account owner.
@@ -1703,7 +1703,7 @@ def __bulk_add_replicas(
     session: "Session"
 ) -> tuple[int, int]:
     """
-    Bulk add new dids.
+    Bulk add new DIDs.
 
     :param rse_id: the RSE id.
     :param dids: the list of files.
@@ -2016,7 +2016,7 @@ def __cleanup_after_replica_deletion(
     session: "Session"
 ) -> None:
     """
-    Perform update of collections/archive associations/dids after the removal of their replicas
+    Perform update of collections/archive associations/DIDs after the removal of their replicas
     :param rse_id: the rse id
     :param files: list of files whose replica got deleted
     :param session: The database session in use.
@@ -2080,7 +2080,7 @@ def __cleanup_after_replica_deletion(
                                             rse_id=rse_id). \
                 save(session=session, flush=False)
 
-    # Delete did from the content for the last did
+    # Delete DID from the content for the last DID
     while parents_to_analyze:
         did_associations_to_remove = set()
 
@@ -2287,7 +2287,7 @@ def __cleanup_after_replica_deletion(
 
         session.execute(stmt)
 
-    # delete empty dids
+    # delete empty DIDs
     if did_condition:
         for chunk in chunks(did_condition, 10):
             stmt = select(
@@ -2426,7 +2426,7 @@ def __cleanup_after_replica_deletion(
         for chunk in chunks(messages, 100):
             add_messages(chunk, session=session)
 
-        # Delete dids
+        # Delete DIDs
         dids_to_delete_filter = exists(select(1)
                                        .where(and_(models.DataIdentifier.scope == scope_name_temp_table.scope,
                                                    models.DataIdentifier.name == scope_name_temp_table.name)))
@@ -2806,7 +2806,7 @@ def touch_replica(
     session: "Session"
 ) -> bool:
     """
-    Update the accessed_at timestamp of the given file replica/did but don't wait if row is locked.
+    Update the accessed_at timestamp of the given file replica/DID but don't wait if row is locked.
 
     :param replica: a dictionary with the information of the affected replica.
     :param session: The database session in use.
@@ -2921,8 +2921,8 @@ def get_and_lock_file_replicas(
     """
     Get file replicas for a specific scope:name.
 
-    :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 nowait:         Nowait parameter for the FOR UPDATE statement
     :param restrict_rses:  Possible RSE_ids to filter on.
     :param session:        The db session in use.
@@ -2957,8 +2957,8 @@ def get_source_replicas(
     """
     Get source replicas for a specific scope:name.
 
-    :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 soruce_rses:    Possible RSE_ids to filter on.
     :param session:        The db session in use.
     :returns:              List of SQLAlchemy Replica Objects

rucio/core/request.py

@@ -31,7 +31,7 @@ from sqlalchemy.orm import aliased
 from sqlalchemy.sql.expression import asc, false, func, null, true
 
 from rucio.common.config import config_get_bool, config_get_int
-from rucio.common.constants import RseAttr, TransferLimitDirection
+from rucio.common.constants import DEFAULT_VO, RseAttr, TransferLimitDirection
 from rucio.common.exception import InvalidRSEExpression, RequestNotFound, RucioException, UnsupportedOperation
 from rucio.common.types import FilterDict, InternalAccount, InternalScope, LoggerFunction, RequestDict
 from rucio.common.utils import chunks, generate_uuid
@@ -2918,7 +2918,7 @@ def add_monitor_message(
     if not message.get('vo') and request.get('source_rse_id'):
         src_id = request['source_rse_id']
         vo = get_rse_vo(rse_id=src_id, session=session)
-        if vo != 'def':
+        if vo != DEFAULT_VO:
             message['vo'] = vo
     for time_field in ('created_at', 'submitted_at', 'started_at', 'transferred_at'):
         field_value = message[time_field]