rucio 32.8.6__py3-none-any.whl → 35.8.0__py3-none-any.whl

rucio/core/did_meta_plugins/json_meta.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,17 +14,17 @@
 
 import json as json_lib
 import operator
-from typing import TYPE_CHECKING, cast, Any
+from typing import TYPE_CHECKING, Any, cast
 
-from sqlalchemy.exc import DataError
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy import and_, select
+from sqlalchemy.exc import DataError, NoResultFound
 
 from rucio.common import exception
 from rucio.core.did_meta_plugins.did_meta_plugin_interface import DidMetaPlugin
 from rucio.core.did_meta_plugins.filter_engine import FilterEngine
 from rucio.db.sqla import models
 from rucio.db.sqla.constants import DIDType
-from rucio.db.sqla.session import read_session, transactional_session, stream_session
+from rucio.db.sqla.session import read_session, stream_session, transactional_session
 from rucio.db.sqla.util import json_implemented
 
 if TYPE_CHECKING:
@@ -54,7 +53,13 @@ class JSONDidMeta(DidMetaPlugin):
             raise NotImplementedError
 
         try:
-            row = session.query(models.DidMeta).filter_by(scope=scope, name=name).one()
+            stmt = select(
+                models.DidMeta
+            ).where(
+                and_(models.DidMeta.scope == scope,
+                     models.DidMeta.name == name)
+            )
+            row = session.execute(stmt).scalar_one()
             meta = getattr(row, 'meta')
             return json_lib.loads(meta) if session.bind.dialect.name in ['oracle', 'sqlite'] else meta
         except NoResultFound:
@@ -69,10 +74,22 @@ class JSONDidMeta(DidMetaPlugin):
         if not json_implemented(session=session):
             raise NotImplementedError
 
-        if session.query(models.DataIdentifier).filter_by(scope=scope, name=name).one_or_none() is None:
+        stmt = select(
+            models.DataIdentifier
+        ).where(
+            and_(models.DataIdentifier.scope == scope,
+                 models.DataIdentifier.name == name)
+        )
+        if session.execute(stmt).one_or_none() is None:
             raise exception.DataIdentifierNotFound("Data identifier '%s:%s' not found" % (scope, name))
 
-        row_did_meta = session.query(models.DidMeta).filter_by(scope=scope, name=name).scalar()
+        stmt = select(
+            models.DidMeta
+        ).where(
+            and_(models.DidMeta.scope == scope,
+                 models.DidMeta.name == name)
+        )
+        row_did_meta = session.execute(stmt).scalar_one_or_none()
         if row_did_meta is None:
             # Add metadata column to new table (if not already present)
             row_did_meta = models.DidMeta(scope=scope, name=name)
@@ -83,9 +100,9 @@ class JSONDidMeta(DidMetaPlugin):
             if row_did_meta.meta:
                 if session.bind.dialect.name in ['oracle', 'sqlite']:
                     # Oracle and sqlite returns a string instead of a dict
-                    existing_meta = json_lib.loads(cast(str, row_did_meta.meta))
+                    existing_meta = json_lib.loads(cast("str", row_did_meta.meta))
                 else:
-                    existing_meta = cast(dict[str, Any], row_did_meta.meta)
+                    existing_meta = cast("dict[str, Any]", row_did_meta.meta)
 
         for key, value in metadata.items():
             existing_meta[key] = value
@@ -114,7 +131,13 @@ class JSONDidMeta(DidMetaPlugin):
             raise NotImplementedError
 
         try:
-            row = session.query(models.DidMeta).filter_by(scope=scope, name=name).one()
+            stmt = select(
+                models.DidMeta
+            ).where(
+                and_(models.DidMeta.scope == scope,
+                     models.DidMeta.name == name)
+            )
+            row = session.execute(stmt).scalar_one()
             existing_meta = getattr(row, 'meta')
             # Oracle returns a string instead of a dict
             if session.bind.dialect.name in ['oracle', 'sqlite'] and existing_meta is not None:
@@ -145,14 +168,14 @@ class JSONDidMeta(DidMetaPlugin):
         if not ignore_dids:
             ignore_dids = set()
 
-        # backwards compatability for filters as single {}.
+        # backwards compatibility for filters as single {}.
         if isinstance(filters, dict):
             filters = [filters]
 
         # instantiate fe and create sqla query, note that coercion to a model keyword
         # is not appropriate here as the filter words are stored in a single json column.
         fe = FilterEngine(filters, model_class=models.DidMeta, strict_coerce=False)
-        query = fe.create_sqla_query(
+        stmt = fe.create_sqla_query(
             additional_model_attributes=[
                 models.DidMeta.scope,
                 models.DidMeta.name
@@ -164,13 +187,15 @@ class JSONDidMeta(DidMetaPlugin):
         )
 
         if limit:
-            query = query.limit(limit)
+            stmt = stmt.limit(
+                limit
+            )
         if recursive:
             from rucio.core.did import list_content
 
             # Get attached DIDs and save in list because query has to be finished before starting a new one in the recursion
             collections_content = []
-            for did in query.yield_per(100):
+            for did in session.execute(stmt).yield_per(100):
                 if (did.did_type == DIDType.CONTAINER or did.did_type == DIDType.DATASET):
                     collections_content += [d for d in list_content(scope=did.scope, name=did.name)]
 
@@ -183,7 +208,7 @@ class JSONDidMeta(DidMetaPlugin):
                     yield result
 
         try:
-            for did in query.yield_per(5):                  # don't unpack this as it makes it dependent on query return order!
+            for did in session.execute(stmt).yield_per(5):                  # don't unpack this as it makes it dependent on query return order!
                 if long:
                     did_full = "{}:{}".format(did.scope, did.name)
                     if did_full not in ignore_dids:         # concatenating results of OR clauses may contain duplicate DIDs if query result sets not mutually exclusive.

rucio/core/did_meta_plugins/mongo_meta.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,14 +17,14 @@ from typing import TYPE_CHECKING
 
 import pymongo
 
-from rucio.common import config
-from rucio.common import exception
+from rucio.common import config, exception
 from rucio.common.types import InternalScope
 from rucio.core.did_meta_plugins.did_meta_plugin_interface import DidMetaPlugin
 from rucio.core.did_meta_plugins.filter_engine import FilterEngine
 
 if TYPE_CHECKING:
     from typing import Optional
+
     from sqlalchemy.orm import Session
 
 IMMUTABLE_KEYS = [
@@ -37,7 +36,15 @@ IMMUTABLE_KEYS = [
 
 
 class MongoDidMeta(DidMetaPlugin):
-    def __init__(self, host=None, port=None, db=None, collection=None):
+    def __init__(
+        self,
+        host: "Optional[str]" = None,
+        port: "Optional[int]" = None,
+        db: "Optional[str]" = None,
+        collection: "Optional[str]" = None,
+        user: "Optional[str]" = None,
+        password: "Optional[str]" = None,
+    ):
         super(MongoDidMeta, self).__init__()
         if host is None:
             host = config.config_get('metadata', 'mongo_service_host')
@@ -48,7 +55,17 @@ class MongoDidMeta(DidMetaPlugin):
         if collection is None:
             collection = config.config_get('metadata', 'mongo_collection')
 
-        self.client = pymongo.MongoClient("mongodb://{}:{}/".format(host, port))
+        if user is None and config.config_has_section("metadata"):
+            user = config.config_get("metadata", "mongo_user", default=None)
+
+        if user is not None:
+            if password is None:
+                password = config.config_get("metadata", "mongo_password")
+            auth = "{user}:{password}@".format(user=user, password=password)
+        else:
+            auth = ""
+
+        self.client = pymongo.MongoClient("mongodb://{auth}{host}:{port}/".format(auth=auth, host=host, port=port))
         self.db = self.client[db]
         self.col = self.db[collection]
 
@@ -143,7 +160,7 @@ class MongoDidMeta(DidMetaPlugin):
         if not ignore_dids:
             ignore_dids = set()
 
-        # backwards compatability for filters as single {}.
+        # backwards compatibility for filters as single {}.
         if isinstance(filters, dict):
             filters = [filters]
 
@@ -167,7 +184,7 @@ class MongoDidMeta(DidMetaPlugin):
             if limit:
                 query_result = query_result.limit(limit)
             for did in query_result:
-                did_full = did_full = "{}:{}".format(did['scope'], did['name'])
+                did_full = "{}:{}".format(did['scope'], did['name'])
                 if did_full not in ignore_dids:         # aggregating recursive queries may contain duplicate DIDs
                     ignore_dids.add(did_full)
                     yield {
@@ -182,7 +199,7 @@ class MongoDidMeta(DidMetaPlugin):
             if limit:
                 query_result = query_result.limit(limit)
             for did in query_result:
-                did_full = did_full = "{}:{}".format(did['scope'], did['name'])
+                did_full = "{}:{}".format(did['scope'], did['name'])
                 if did_full not in ignore_dids:         # aggregating recursive queries may contain duplicate DIDs
                     ignore_dids.add(did_full)
                     yield did['name']

rucio/core/did_meta_plugins/postgres_meta.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,14 +19,14 @@ from typing import TYPE_CHECKING
 import psycopg2
 import psycopg2.extras
 
-from rucio.common import config
-from rucio.common import exception
+from rucio.common import config, exception
 from rucio.common.types import InternalScope
 from rucio.core.did_meta_plugins.did_meta_plugin_interface import DidMetaPlugin
 from rucio.core.did_meta_plugins.filter_engine import FilterEngine
 
 if TYPE_CHECKING:
     from typing import Optional
+
     from sqlalchemy.orm import Session
 
 
@@ -252,7 +251,7 @@ class ExternalPostgresJSONDidMeta(DidMetaPlugin):
         if not ignore_dids:
             ignore_dids = set()
 
-        # backwards compatability for filters as single {}.
+        # backwards compatibility for filters as single {}.
         if isinstance(filters, dict):
             filters = [filters]
 

rucio/core/dirac.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,13 +15,14 @@
 import re
 from json import loads
 from json.decoder import JSONDecodeError
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Optional
 
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy import and_, select
+from sqlalchemy.exc import NoResultFound
 
 from rucio.common.config import config_get
-from rucio.common.exception import InvalidType, UnsupportedOperation, ConfigNotFound, RucioException
-from rucio.common.types import InternalScope, InternalAccount
+from rucio.common.exception import ConfigNotFound, InvalidType, RucioException, UnsupportedOperation
+from rucio.common.types import InternalAccount, InternalScope
 from rucio.common.utils import extract_scope
 from rucio.core.did import add_did, attach_dids_to_dids
 from rucio.core.replica import add_replicas
@@ -30,14 +30,21 @@ from rucio.core.rule import add_rule, list_rules, update_rule
 from rucio.core.scope import list_scopes
 from rucio.db.sqla import models
 from rucio.db.sqla.constants import DIDType
-from rucio.db.sqla.session import transactional_session, read_session
+from rucio.db.sqla.session import read_session, transactional_session
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from sqlalchemy.orm import Session
 
 
 @read_session
-def _exists(scope, name, *, session: "Session"):
+def _exists(
+    scope: str,
+    name: str,
+    *,
+    session: "Session"
+) -> tuple[bool, Optional[DIDType]]:
     """
     Check if the did exists
 
@@ -46,15 +53,31 @@ def _exists(scope, name, *, session: "Session"):
     :session: The session used
     """
     try:
-        res = session.query(models.DataIdentifier).filter_by(scope=scope, name=name).\
-            with_hint(models.DataIdentifier, "INDEX(DIDS DIDS_PK)", 'oracle').one()
-        return True, res.did_type
+        stmt = select(
+            models.DataIdentifier.did_type
+        ).with_hint(
+            models.DataIdentifier,
+            "INDEX(DIDS DIDS_PK)",
+            'oracle'
+        ).where(
+            and_(models.DataIdentifier.scope == scope,
+                 models.DataIdentifier.name == name)
+        )
+        return True, session.execute(stmt).scalar_one()
     except NoResultFound:
         return False, None
 
 
 @transactional_session
-def add_files(lfns, account, ignore_availability, vo='def', *, session: "Session"):
+def add_files(
+    lfns: "Iterable[dict[str, Any]]",
+    account: str,
+    ignore_availability: bool,
+    parents_metadata: Optional[dict[str, Any]] = None,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> None:
     """
     Bulk add files :
     - Create the file and replica.
@@ -64,19 +87,22 @@ def add_files(lfns, account, ignore_availability, vo='def', *, session: "Session
     :param lfns: List of lfn (dictionary {'lfn': <lfn>, 'rse': <rse>, 'bytes': <bytes>, 'adler32': <adler32>, 'guid': <guid>, 'pfn': <pfn>}
     :param issuer: The issuer account.
     :param ignore_availability: A boolean to ignore blocklisted sites.
+    :param parents_metadata: Metadata for selected hierarchy DIDs. (dictionary {'lpn': {key : value}})
     :param vo: The VO to act on
     :param session: The session used
     """
     rule_extension_list = []
     attachments = []
+    if not parents_metadata:
+        parents_metadata = {}
     # The list of scopes is necessary for the extract_scope
     filter_ = {'scope': InternalScope(scope='*', vo=vo)}
     scopes = list_scopes(filter_=filter_, session=session)
     scopes = [scope.external for scope in scopes]
     exist_lfn = []
     try:
-        lifetime_dict: str = config_get(section='dirac', option='lifetime', default='{}', session=session)
-        lifetime_dict = loads(lifetime_dict)
+        config_lifetime: str = config_get(section='dirac', option='lifetime', default='{}', session=session)
+        lifetime_dict: dict = loads(config_lifetime)
     except ConfigNotFound:
         lifetime_dict = {}
     except JSONDecodeError as err:
@@ -104,6 +130,7 @@ def add_files(lfns, account, ignore_availability, vo='def', *, session: "Session
         dsn_name = lpns[0]
         dsn_scope, _ = extract_scope(dsn_name, scopes)
         dsn_scope = InternalScope(dsn_scope, vo=vo)
+        dsn_meta = parents_metadata.get(dsn_name, {})
 
         # Compute lifetime
         lifetime = None
@@ -126,7 +153,7 @@ def add_files(lfns, account, ignore_availability, vo='def', *, session: "Session
                     DIDType.DATASET,
                     account=InternalAccount(account, vo=vo),
                     statuses=None,
-                    meta=None,
+                    meta=dsn_meta,
                     rules=[{'copies': 1, 'rse_expression': 'ANY=true', 'weight': None, 'account': InternalAccount(account, vo=vo), 'lifetime': lifetime, 'grouping': 'NONE'}],
                     lifetime=None,
                     dids=None,
@@ -153,11 +180,12 @@ def add_files(lfns, account, ignore_availability, vo='def', *, session: "Session
         guid = lfn.get('guid', None)
         adler32 = lfn.get('adler32', None)
         pfn = lfn.get('pfn', None)
-        files = {'scope': lfn_scope, 'name': filename, 'bytes': bytes_, 'adler32': adler32}
+        meta = lfn.get('meta', {})
+        files = {'scope': lfn_scope, 'name': filename, 'bytes': bytes_, 'adler32': adler32, 'meta': meta}
         if pfn:
             files['pfn'] = str(pfn)
         if guid:
-            files['meta'] = {'guid': guid}
+            files['meta']['guid'] = guid
         add_replicas(rse_id=rse_id,
                      files=[files],
                      dataset_meta=None,
@@ -181,6 +209,7 @@ def add_files(lfns, account, ignore_availability, vo='def', *, session: "Session
             child_scope, _ = extract_scope(lpn, scopes)
             child_scope = InternalScope(child_scope, vo=vo)
             exists, did_type = _exists(child_scope, lpn)
+            child_meta = parents_metadata.get(lpn, {})
             if exists and did_type == DIDType.DATASET:
                 raise UnsupportedOperation('Cannot create %s as container' % lpn)
             if (lpn not in exist_lfn) and not exists:
@@ -190,7 +219,7 @@ def add_files(lfns, account, ignore_availability, vo='def', *, session: "Session
                         DIDType.CONTAINER,
                         account=InternalAccount(account, vo=vo),
                         statuses=None,
-                        meta=None,
+                        meta=child_meta,
                         rules=None,
                         lifetime=None,
                         dids=None,

rucio/core/distance.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,21 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Optional
 
+from sqlalchemy import and_, delete, select, update
 from sqlalchemy.exc import DatabaseError, IntegrityError
 from sqlalchemy.orm import aliased
 
 from rucio.common import exception
-from rucio.db.sqla.models import Distance, RSE
-from rucio.db.sqla.session import transactional_session, read_session
+from rucio.db.sqla.models import RSE, Distance
+from rucio.db.sqla.session import read_session, transactional_session
 
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session
 
 
 @transactional_session
-def add_distance(src_rse_id, dest_rse_id, distance=None, *, session: "Session"):
+def add_distance(src_rse_id: str, dest_rse_id: str, distance: Optional[int] = None, *, session: "Session") -> None:
     """
     Add a src-dest distance.
 
@@ -47,9 +47,9 @@ def add_distance(src_rse_id, dest_rse_id, distance=None, *, session: "Session"):
 
 
 @read_session
-def get_distances(src_rse_id=None, dest_rse_id=None, *, session: "Session") -> list[dict]:
+def get_distances(src_rse_id: Optional[str] = None, dest_rse_id: Optional[str] = None, *, session: "Session") -> list[dict[str, Any]]:
     """
-    Get distances between rses.
+    Get distances between RSEs.
 
     :param src_rse_id: The source RSE ID.
     :param dest_rse_id: The destination RSE ID.
@@ -59,81 +59,95 @@ def get_distances(src_rse_id=None, dest_rse_id=None, *, session: "Session") -> l
     """
 
     try:
-        query = session.query(Distance)
+        stmt = select(
+            Distance
+        )
         if src_rse_id:
-            query = query.filter(Distance.src_rse_id == src_rse_id)
+            stmt = stmt.where(
+                Distance.src_rse_id == src_rse_id
+            )
         if dest_rse_id:
-            query = query.filter(Distance.dest_rse_id == dest_rse_id)
+            stmt = stmt.where(
+                Distance.dest_rse_id == dest_rse_id
+            )
 
         distances = []
-        tmp = query.all()
-        if tmp:
-            for t in tmp:
-                t2 = t.to_dict()
-                t2['ranking'] = t2['distance']  # Compatibility with old clients
-                distances.append(t2)
+        for t in session.execute(stmt).scalars().all():
+            t2 = t.to_dict()
+            t2['ranking'] = t2['distance']  # Compatibility with old clients
+            distances.append(t2)
         return distances
     except IntegrityError as error:
         raise exception.RucioException(error.args)
 
 
 @transactional_session
-def delete_distances(src_rse_id=None, dest_rse_id=None, *, session: "Session"):
+def delete_distances(src_rse_id: Optional[str] = None, dest_rse_id: Optional[str] = None, *, session: "Session") -> None:
     """
-    Delete distances with the given RSE ids.
+    Delete distances with the given RSE IDs.
 
     :param src_rse_id: The source RSE ID.
     :param dest_rse_id: The destination RSE ID.
     :param session: The database session to use.
     """
 
+    if not dest_rse_id or not src_rse_id:
+        return
     try:
-        query = session.query(Distance)
-
-        if src_rse_id:
-            query = query.filter(Distance.src_rse_id == src_rse_id)
-        if dest_rse_id:
-            query = query.filter(Distance.dest_rse_id == dest_rse_id)
-
-        query.delete()
+        stmt = delete(
+            Distance
+        ).where(
+            and_(Distance.src_rse_id == src_rse_id,
+                 Distance.dest_rse_id == dest_rse_id)
+        )
+        session.execute(stmt)
     except IntegrityError as error:
         raise exception.RucioException(error.args)
 
 
 @transactional_session
-def update_distances(src_rse_id=None, dest_rse_id=None, distance=None, *, session: "Session"):
+def update_distances(src_rse_id: Optional[str] = None, dest_rse_id: Optional[str] = None, distance: Optional[str] = None, *, session: "Session") -> None:
     """
-    Update distances with the given RSE ids.
+    Update distances with the given RSE IDs.
 
     :param src_rse_id: The source RSE ID.
     :param dest_rse_id: The destination RSE ID.
     :param distance: The new distance to set
     :param session: The database session to use.
     """
+    if not dest_rse_id or not src_rse_id:
+        return
     try:
-        query = session.query(Distance)
-        if src_rse_id:
-            query = query.filter(Distance.src_rse_id == src_rse_id)
-        if dest_rse_id:
-            query = query.filter(Distance.dest_rse_id == dest_rse_id)
-        query.update({Distance.distance: distance})
+        stmt = update(
+            Distance
+        ).where(
+            and_(Distance.src_rse_id == src_rse_id,
+                 Distance.dest_rse_id == dest_rse_id)
+        ).values({
+            Distance.distance: distance
+        })
+        session.execute(stmt)
     except IntegrityError as error:
         raise exception.RucioException(error.args)
 
 
 @read_session
-def list_distances(filter_={}, *, session: "Session"):
+def list_distances(filter_: Optional[dict[str, Any]] = None, *, session: "Session") -> list[dict[str, Any]]:
     """
     Get distances between all the RSEs.
 
     :param filter_: dictionary to filter distances.
     :param session: The database session in use.
     """
-    return [distance.to_dict() for distance in session.query(Distance).all()]
+    filter_ = filter_ or {}
+    stmt = select(
+        Distance
+    )
+    return [distance.to_dict() for distance in session.execute(stmt).scalars().all()]
 
 
 @read_session
-def export_distances(vo='def', *, session: "Session"):
+def export_distances(vo: str = 'def', *, session: "Session") -> dict[str, Any]:
     """
     Export distances between all the RSEs using RSE ids.
     :param vo: The VO to export.
@@ -145,12 +159,21 @@ def export_distances(vo='def', *, session: "Session"):
     try:
         rse_src = aliased(RSE)
         rse_dest = aliased(RSE)
-        query = session.query(Distance, rse_src.id, rse_dest.id)\
-                       .join(rse_src, rse_src.id == Distance.src_rse_id)\
-                       .join(rse_dest, rse_dest.id == Distance.dest_rse_id)\
-                       .filter(rse_src.vo == vo)\
-                       .filter(rse_dest.vo == vo)
-        for result in query.all():
+        stmt = select(
+            Distance,
+            rse_src.id,
+            rse_dest.id
+        ).join(
+            rse_src,
+            rse_src.id == Distance.src_rse_id
+        ).join(
+            rse_dest,
+            rse_dest.id == Distance.dest_rse_id
+        ).where(
+            and_(rse_src.vo == vo,
+                 rse_dest.vo == vo)
+        )
+        for result in session.execute(stmt).all():
             distance = result[0]
             src_id = result[1]
             dst_id = result[2]

rucio/core/exporter.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
-from rucio.core import rse as rse_module, distance as distance_module
+from rucio.core import distance as distance_module
+from rucio.core import rse as rse_module
 from rucio.db.sqla.session import transactional_session
 
 if TYPE_CHECKING:
@@ -23,7 +23,7 @@ if TYPE_CHECKING:
 
 
 @transactional_session
-def export_rses(vo='def', *, session: "Session"):
+def export_rses(vo: str = 'def', *, session: "Session") -> dict[str, dict[str, Any]]:
     """
     Export RSE data.
 
@@ -39,7 +39,7 @@ def export_rses(vo='def', *, session: "Session"):
 
 
 @transactional_session
-def export_data(vo='def', distance=True, *, session: "Session"):
+def export_data(vo: str = 'def', distance: bool = True, *, session: "Session") -> dict[str, Any]:
     """
     Export data.