rucio 34.2.0__tar.gz → 34.4.0__tar.gz

{rucio-34.2.0 → rucio-34.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rucio
-Version: 34.2.0
+Version: 34.4.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-34.2.0 → rucio-34.4.0}/bin/rucio

@@ -166,7 +166,7 @@ def exception_handler(function):
                     used_account = '%s (from rucio.cfg)' % config_get('client', 'account')
                 except:
                     pass
-                try:  # are we overriden by the environment?
+                try:  # are we overridden by the environment?
                     used_account = '%s (from RUCIO_ACCOUNT)' % os.environ['RUCIO_ACCOUNT']
                 except:
                     pass
@@ -1550,7 +1550,7 @@ def list_rse_attributes(args):
     """
     client = get_client(args)
     attributes = client.list_rse_attributes(rse=args.rse)
-    table = [(k + ':', str(v)) for (k, v) in sorted(attributes.items())]  # columns hav mixed datatypes
+    table = [(k + ':', str(v)) for (k, v) in sorted(attributes.items())]  # columns have mixed datatypes
     print(tabulate(table, tablefmt='plain', disable_numparse=True))  # disabling number parsing
     return SUCCESS
 

{rucio-34.2.0 → rucio-34.4.0}/bin/rucio-admin

@@ -33,6 +33,7 @@ from tabulate import tabulate
 from rucio import version
 from rucio.client import Client
 from rucio.common.config import config_get
+from rucio.common.constants import RseAttr
 from rucio.common.exception import (
     AccessDenied,
     AccountNotFound,
@@ -385,7 +386,7 @@ def set_limits(args):
             try:
                 byte_limit = int(limit_input)
             except ValueError:
-                logger.error('The limit could not be set. Either you misspelled infinity or your input could not be converted to integer or you used a wrong pattern. Please use a format like 10GB with B,KB,MB,GB,TB,PB as units (not case sensistive)')
+                logger.error('The limit could not be set. Either you misspelled infinity or your input could not be converted to integer or you used a wrong pattern. Please use a format like 10GB with B,KB,MB,GB,TB,PB as units (not case sensitive)')
                 return FAILURE
 
     client.set_account_limit(account=args.account, rse=args.rse, bytes_=byte_limit, locality=locality)
@@ -1244,7 +1245,7 @@ def list_pfns(args):
                 if not rse_info['deterministic']:
                     logger.warning('This is a non-deterministic site, so the real PFN might be different from the on suggested')
                     rse_attr = client.list_rse_attributes(rse)
-                    naming_convention = rse_attr.get('naming_convention', None)
+                    naming_convention = rse_attr.get(RseAttr.NAMING_CONVENTION, None)
                     parents = [did for did in client.list_parent_dids(scope, name)]
                     if len(parents) > 1:
                         logger.warning('The file has multiple parents')
@@ -1383,7 +1384,7 @@ def get_parser():
     oparser.add_argument('--oidc-refresh-lifetime', dest='oidc_refresh_lifetime', default=None, help='Max lifetime in hours for this an access token will be refreshed by asynchronous Rucio daemon. '
                          + 'If not specified, refresh will be stopped after 4 days. This option is effective only if --oidc-scope includes offline_access scope for a refresh token to be granted to Rucio.')  # NOQA: W503
     oparser.add_argument('--oidc-issuer', dest='oidc_issuer', default=None,
-                         help='Defines which Identity Provider is goign to be used. The issuer string must correspond '
+                         help='Defines which Identity Provider is going to be used. The issuer string must correspond '
                          + 'to the keys configured in the /etc/idpsecrets.json auth server configuration file.')  # NOQA: W503
 
     # Options for the x509  auth_strategy
@@ -1432,7 +1433,7 @@ def get_parser():
                                                               '"""""""""""""\n'
                                                               '::\n'
                                                               '\n'
-                                                              '    $ rucio-admin account list --type \'user\'\n'
+                                                              '    $ rucio-admin account list --type USER\n'
                                                               '\n')
     list_account_parser.add_argument('--type', dest='account_type', action='store', help='Account Type (USER, GROUP, SERVICE)')
     list_account_parser.add_argument('--id', dest='identity', action='store', help='Identity (e.g. DN)')
@@ -1708,7 +1709,7 @@ def get_parser():
                                                                   '    $ rucio-admin identity delete --account jdoe --type X509 --id \'CN=Joe Doe,CN=707658,CN=jdoe,OU=Users,OU=Organic Units,DC=cern,DC=ch\'\n'
                                                                   '    Deleted identity: CN=Joe Doe,CN=707658,CN=jdoe,OU=Users,OU=Organic Units,DC=cern,DC=ch\n'
                                                                   '\n'
-                                                                  'Note: if the identity was accidentaly deleted, use add option.\n'
+                                                                  'Note: if the identity was accidentally deleted, use add option.\n'
                                                                   '\n')
     identity_delete_parser.set_defaults(which='identity_delete')
     identity_delete_parser.add_argument('--account', dest='account', action='store', help='Account name', required=True)
@@ -1956,7 +1957,7 @@ def get_parser():
                                                               '    $ rucio-admin rse add-protocol --hostname jdoes.test.org --scheme gsiftp --prefix \'/atlasdatadisk/rucio/\' --port 8443 JDOE_DATADISK\n'
                                                               '\n'
                                                               'Note: no printed stdout.\n'
-                                                              'Note: examples of optional parametres::\n'
+                                                              'Note: examples of optional parameters::\n'
                                                               '\n'
                                                               '    --space-token DATADISK\n'
                                                               '    --web-service-path \'/srm/managerv2?SFN=\'\n'
@@ -2110,7 +2111,7 @@ def get_parser():
 
     # The config subparser
     config_parser = subparsers.add_parser('config',
-                                          help='Configuration methods. The global configuration of data mangement system can by modified.',
+                                          help='Configuration methods. The global configuration of data management system can by modified.',
                                           formatter_class=argparse.RawDescriptionHelpFormatter,
                                           epilog='''e.g. quotas, daemons, rses''')
     config_subparser = config_parser.add_subparsers(dest='config_subcommand', **required_arg)
@@ -2311,9 +2312,9 @@ def get_parser():
     declare_bad_file_replicas_parser.add_argument('--inputfile', dest='inputfile', nargs='?', action='store', help='File containing list of bad items')
     declare_bad_file_replicas_parser.add_argument('--allow-collection', dest='allow_collection', action='store_true', help='Allow passing a collection DID as bad item')
 
-    declare_bad_file_replicas_parser.add_argument('--lfns', dest='lfns', nargs='?', action='store', help='File cotaining list of LFNs for bad replicas. Requires --rse and --scope')
-    declare_bad_file_replicas_parser.add_argument('--scope', dest='scope', nargs='?', action='store', help='Common scope for bad replicas secified with LFN list, ignored wthout --lfns')
-    declare_bad_file_replicas_parser.add_argument('--rse', dest='rse', nargs='?', action='store', help='Common RSE for bad replicas secified with LFN list, ignored wthout --lfns')
+    declare_bad_file_replicas_parser.add_argument('--lfns', dest='lfns', nargs='?', action='store', help='File containing list of LFNs for bad replicas. Requires --rse and --scope')
+    declare_bad_file_replicas_parser.add_argument('--scope', dest='scope', nargs='?', action='store', help='Common scope for bad replicas specified with LFN list, ignored without --lfns')
+    declare_bad_file_replicas_parser.add_argument('--rse', dest='rse', nargs='?', action='store', help='Common RSE for bad replicas specified with LFN list, ignored without --lfns')
 
     # The declare-temporary-unavailable command
     declare_temporary_unavailable_replicas_parser = rep_subparser.add_parser('declare-temporary-unavailable',

{rucio-34.2.0 → rucio-34.4.0}/bin/rucio-auditor

@@ -129,7 +129,7 @@ def main(args):
             time.sleep(RETRY_AFTER)
 
             # Avoid infinite loop if an alternative check() implementation doesn't
-            # decrement the number of attemps and keeps pushing failed checks.
+            # decrement the number of attempts and keeps pushing failed checks.
             tmp_list = []
             while not retry.empty():
                 tmp_list.append(retry.get())
@@ -149,7 +149,7 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The auditor daemon is the one responsable for the detection of inconsistencies on storage, i.e.: dark data discovery.",
+    parser = argparse.ArgumentParser(description="The auditor daemon is the one responsible for the detection of inconsistencies on storage, i.e.: dark data discovery.",
                                      formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument(
         '--nprocs',

{rucio-34.2.0 → rucio-34.4.0}/bin/rucio-automatix

@@ -27,7 +27,7 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="Automatix is a daemon used to inject random generated files to an RSE. It is used to continuosly check that an RSE is reachable and operating as spected.")
+    parser = argparse.ArgumentParser(description="Automatix is a daemon used to inject random generated files to an RSE. It is used to continuously check that an RSE is reachable and operating as expected.")
     parser.add_argument("--run-once", action="store_true", default=False, help='Runs one loop iteration')
     parser.add_argument("--input-file", action="store", default="/opt/rucio/etc/automatix.json", type=str, help='Automatix configuration')
     parser.add_argument("--threads-per-process", action="store", default=1, type=int, help='Total number of workers per process')

{rucio-34.2.0 → rucio-34.4.0}/bin/rucio-conveyor-finisher

@@ -27,7 +27,7 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="Conveyor is a group of daemons to manage file transfers. The conveyor-finisher is the resposible to update Rucio internal state after the transfer has finished.")
+    parser = argparse.ArgumentParser(description="Conveyor is a group of daemons to manage file transfers. The conveyor-finisher is the responsible to update Rucio internal state after the transfer has finished.")
     parser.add_argument("--run-once", action="store_true", default=False,
                         help='One iteration only')
     parser.add_argument("--total-threads", action="store", default=1, type=int,

{rucio-34.2.0 → rucio-34.4.0}/bin/rucio-conveyor-submitter

@@ -34,7 +34,7 @@ Upload a file and create a replication rule::
   $ rucio add-rule mock:file 1 MOCK2
   $ rucio-admin rse add-distance MOCK2 MOCK --distance 1
 
-The rule should replicate the file from RSE MOCK to RSE MOCK2. Therefor a distance between these RSEs is needed.
+The rule should replicate the file from RSE MOCK to RSE MOCK2. Therefore a distance between these RSEs is needed.
 
 Check transfer requests for the DID::
 
@@ -56,7 +56,7 @@ Check again the transfer requests for the DID::
     session.get_session().query(models.Request).filter_by(scope='mock', name='file').first()
     # {'request_type': TRANSFER, 'state': SUBMITTED', ...}
 
-A tranfer request got created by executing the transfer. Depending on the transfer submission, the request state can be different. In this example the transfer got submitted successfully.
+A transfer request got created by executing the transfer. Depending on the transfer submission, the request state can be different. In this example the transfer got submitted successfully.
 
 When run in multi-VO mode, by default the daemon will run on RSEs from all VOs::
 

{rucio-34.2.0 → rucio-34.4.0}/bin/rucio-judge-evaluator

@@ -113,11 +113,11 @@ Check the replicas for the DID mock:file::
   from rucio.db.sqla import session, models
   session.get_session().query(models.RSEFileAssociation).filter_by(name='file', scope='mock').first()
   // [{'name': 'file','lock_cnt': 1, 'state': COPYING, 'scope': 'mock', 'rse_id': 'f81f366593754c01b0c340fa5ea0ab90'},
-  //  {'scope': 'mock', 'rse_id': '1330d5daee37474c88ba888101d7b859', 'name': 'file', 'state': AVAIABLE, 'lock_cnt': 1}]
+  //  {'scope': 'mock', 'rse_id': '1330d5daee37474c88ba888101d7b859', 'name': 'file', 'state': AVAILABLE, 'lock_cnt': 1}]
 
 The DID mock:file has now two replicas with one lock each.
 As the file replica is attached to the dataset and the rule for the dataset specifies another RSE MOCK instead of the upload RSE, it has to be replicated to this RSE.
-Therefor a second replica in state COPYING got created on RSE MOCK.
+Therefore a second replica in state COPYING got created on RSE MOCK.
     ''', formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument("--run-once", action="store_true", default=False, help='One iteration only')
     parser.add_argument("--threads", action="store", default=1, type=int, help='Concurrency control: total number of threads for this process')

{rucio-34.2.0 → rucio-34.4.0}/bin/rucio-necromancer

@@ -30,7 +30,7 @@ def get_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='''
 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.
-Therefor the replica gets marked as lost.
+Therefore the replica gets marked as lost.
 
 Upload a file::
 

{rucio-34.2.0 → rucio-34.4.0}/bin/rucio-oauth-manager

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """
-OAuth Manager is a daemon which is reponsible for:
+OAuth Manager is a daemon which is responsible for:
 - deletion of expired access tokens (in case there is a valid refresh token, expired access tokens will be kept until refresh_token expires as well.)
 - deletion of expired OAuth session parameters
 - refreshing access tokens via their refresh tokens.
@@ -32,7 +32,7 @@ def get_parser():
     """
     parser = argparse.ArgumentParser(description='''
 
-OAuth Manager is a daemon which is reponsible for:
+OAuth Manager is a daemon which is responsible for:
 - deletion of expired access tokens (in case there is a valid refresh token,
   expired access tokens will be kept until refresh_token expires as well.)
 - deletion of expired OAuth session parameters

{rucio-34.2.0 → rucio-34.4.0}/bin/rucio-replica-recoverer

@@ -67,7 +67,7 @@ $ id0=`uuidgen`
 $ id1=`uuidgen`
 $ id2=`uuidgen`
 $ id3=`uuidgen`
-$ echo "file available on MOCK_RECOVERY and decalred suspicious on MOCK_SUSPICIOUS  (11 times)" > /tmp/file_available_suspicious'_'$id1
+$ echo "file available on MOCK_RECOVERY and declared suspicious on MOCK_SUSPICIOUS  (11 times)" > /tmp/file_available_suspicious'_'$id1
 $ echo "file available on MOCK_RECOVERY and declared suspicious on MOCK_SUSPICIOUS  (11 times) and 1 time bad/deleted/lost on MOCK_SUSPICIOUS" > /tmp/file_available_suspicious_and_bad'_'$id2
 $ echo "file declared as unavailable on MOCK_RECOVERY and declared as suspicious 11 times on MOCK_SUSPICIOUS" > /tmp/file_notavailable_suspicious'_'$id3
 
@@ -228,7 +228,7 @@ Note that attempting the use the ``--vos`` argument when in single-VO mode will
   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, 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, help='Consider all file replicas logged in bad_replicas table since speicified number of younger-than days. Default value is 5.')
+    parser.add_argument("--younger-than", action="store", default=5, 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, 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.')

{rucio-34.2.0 → rucio-34.4.0}/etc/ldap.cfg.template

@@ -12,7 +12,7 @@ ldap_host = ldap-host.domain.name
 baseDN = dc=foo,dc=bar,dc=domain,dc=
 searchFilter = (objectClass=OpenLDAPperson)
 
-# set as DEFAULT to use annonymous bind
+# set as DEFAULT to use anonymous bind
 username = DEFAULT
 # Leave blank for prompt
 password =

{rucio-34.2.0 → rucio-34.4.0}/lib/rucio/api/account.py

@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import TYPE_CHECKING
+from collections.abc import Iterator
+from typing import TYPE_CHECKING, Any, Optional
 
 import rucio.api.permission
 import rucio.common.exception
@@ -115,7 +116,7 @@ def update_account(account, key, value, issuer='root', vo='def', *, session: "Se
 
 
 @stream_session
-def list_accounts(filter_={}, vo='def', *, session: "Session"):
+def list_accounts(filter_: Optional[dict[str, Any]] = None, vo: str = 'def', *, session: "Session") -> Iterator[dict[str, Any]]:
     """
     Lists all the Rucio account names.
 
@@ -128,8 +129,7 @@ def list_accounts(filter_={}, vo='def', *, session: "Session"):
     :returns: List of all accounts.
     """
     # If filter is empty, create a new dict to avoid overwriting the function's default
-    if not filter_:
-        filter_ = {}
+    filter_ = filter_ or {}
 
     if 'account' in filter_:
         filter_['account'] = InternalAccount(filter_['account'], vo=vo)

{rucio-34.2.0 → rucio-34.4.0}/lib/rucio/api/account_limit.py

@@ -35,7 +35,7 @@ def get_rse_account_usage(rse, vo='def', *, session: "Session"):
     :param rse:      The RSE name.
     :param vo:       The VO to act on.
     :param session:  The database session in use.
-    :return:         List of dictionnaries.
+    :return:         List of dictionaries.
     """
     rse_id = get_rse_id(rse=rse, vo=vo, session=session)
 

{rucio-34.2.0 → rucio-34.4.0}/lib/rucio/api/config.py

@@ -12,7 +12,7 @@
 # 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 rucio.api import permission
 from rucio.common import exception
@@ -32,7 +32,7 @@ ConfigParser compatible interface.
 
 
 @read_session
-def sections(issuer=None, vo='def', *, session: "Session"):
+def sections(issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> list[str]:
     """
     Return a list of the sections available.
 
@@ -49,7 +49,7 @@ def sections(issuer=None, vo='def', *, session: "Session"):
 
 
 @transactional_session
-def add_section(section, issuer=None, vo='def', *, session: "Session"):
+def add_section(section: str, issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> None:
     """
     Add a section to the configuration.
 
@@ -66,7 +66,7 @@ def add_section(section, issuer=None, vo='def', *, session: "Session"):
 
 
 @read_session
-def has_section(section, issuer=None, vo='def', *, session: "Session"):
+def has_section(section: str, issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> bool:
     """
     Indicates whether the named section is present in the configuration.
 
@@ -84,7 +84,7 @@ def has_section(section, issuer=None, vo='def', *, session: "Session"):
 
 
 @read_session
-def options(section, issuer=None, vo='def', *, session: "Session"):
+def options(section: str, issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> list[str]:
     """
     Returns a list of options available in the specified section.
 
@@ -102,7 +102,7 @@ def options(section, issuer=None, vo='def', *, session: "Session"):
 
 
 @read_session
-def has_option(section, option, issuer=None, vo='def', *, session: "Session"):
+def has_option(section: str, option: str, issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> bool:
     """
     Check if the given section exists and contains the given option.
 
@@ -121,7 +121,7 @@ def has_option(section, option, issuer=None, vo='def', *, session: "Session"):
 
 
 @read_session
-def get(section, option, issuer=None, vo='def', *, session: "Session"):
+def get(section: str, option: str, issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> Any:
     """
     Get an option value for the named section. Value can be auto-coerced to int, float, and bool; string otherwise.
 
@@ -143,7 +143,7 @@ def get(section, option, issuer=None, vo='def', *, session: "Session"):
 
 
 @read_session
-def items(section, issuer=None, vo='def', *, session: "Session"):
+def items(section: str, issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> list[tuple[str, Any]]:
     """
     Return a list of (option, value) pairs for each option in the given section. Values are auto-coerced as in get().
 
@@ -162,7 +162,7 @@ def items(section, issuer=None, vo='def', *, session: "Session"):
 
 
 @transactional_session
-def set(section, option, value, issuer=None, vo='def', *, session: "Session"):
+def set(section: str, option: str, value: Any, issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> None:
     """
     Set the given option to the specified value.
 
@@ -181,7 +181,7 @@ def set(section, option, value, issuer=None, vo='def', *, session: "Session"):
 
 
 @transactional_session
-def remove_section(section, issuer=None, vo='def', *, session: "Session"):
+def remove_section(section: str, issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> bool:
     """
     Remove the specified option from the specified section.
 
@@ -199,7 +199,7 @@ def remove_section(section, issuer=None, vo='def', *, session: "Session"):
 
 
 @transactional_session
-def remove_option(section, option, issuer=None, vo='def', *, session: "Session"):
+def remove_option(section: str, option: str, issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> bool:
     """
     Remove the specified section from the configuration.
 

{rucio-34.2.0 → rucio-34.4.0}/lib/rucio/api/did.py

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from collections.abc import Iterator, Sequence
 from copy import deepcopy
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 import rucio.api.permission
 from rucio.common.constants import RESERVED_KEYS
@@ -28,7 +29,7 @@ from rucio.db.sqla.constants import DIDType
 from rucio.db.sqla.session import read_session, stream_session, transactional_session
 
 if TYPE_CHECKING:
-    from typing import Any, Iterator, Optional
+    from typing import Optional
 
     from sqlalchemy.orm import Session
 
@@ -66,7 +67,22 @@ def list_dids(scope, filters, did_type='collection', ignore_case=False, limit=No
 
 
 @transactional_session
-def add_did(scope, name, did_type, issuer, account=None, statuses={}, meta={}, rules=[], lifetime=None, dids=[], rse=None, vo='def', *, session: "Session"):
+def add_did(
+    scope: str,
+    name: str,
+    did_type: str,
+    issuer: str,
+    account: "Optional[str]" = None,
+    statuses: "Optional[dict[str, str]]" = None,
+    meta: "Optional[dict[str, str]]" = None,
+    rules: "Optional[Sequence[dict[str, Any]]]" = None,
+    lifetime: "Optional[str]" = None,
+    dids: "Optional[Sequence[dict[str, Any]]]" = None,
+    rse: "Optional[str]" = None,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> None:
     """
     Add data did.
 
@@ -84,6 +100,10 @@ def add_did(scope, name, did_type, issuer, account=None, statuses={}, meta={}, r
     :param vo: The VO to act on.
     :param session: The database session in use.
     """
+    statuses = statuses or {}
+    meta = meta or {}
+    rules = rules or []
+    dids = dids or []
     v_did = {'name': name, 'type': did_type.upper(), 'scope': scope}
     validate_schema(name='did', obj=v_did, vo=vo)
     validate_schema(name='dids', obj=dids, vo=vo)
@@ -92,10 +112,9 @@ def add_did(scope, name, did_type, issuer, account=None, statuses={}, meta={}, r
     if not rucio.api.permission.has_permission(issuer=issuer, vo=vo, action='add_did', kwargs=kwargs, session=session):
         raise rucio.common.exception.AccessDenied('Account %s can not add data identifier to scope %s' % (issuer, scope))
 
-    if account is not None:
-        account = InternalAccount(account, vo=vo)
-    issuer = InternalAccount(issuer, vo=vo)
-    scope = InternalScope(scope, vo=vo)
+    owner_account = None if account is None else InternalAccount(account, vo=vo)
+    issuer_account = InternalAccount(issuer, vo=vo)
+    internal_scope = InternalScope(scope, vo=vo)
     for d in dids:
         d['scope'] = InternalScope(d['scope'], vo=vo)
     for r in rules:
@@ -107,7 +126,7 @@ def add_did(scope, name, did_type, issuer, account=None, statuses={}, meta={}, r
 
     if did_type == 'DATASET':
         # naming_convention validation
-        extra_meta = naming_convention.validate_name(scope=scope, name=name, did_type='D', session=session)
+        extra_meta = naming_convention.validate_name(scope=internal_scope, name=name, did_type='D', session=session)
 
         # merge extra_meta with meta
         for k in extra_meta or {}:
@@ -120,7 +139,7 @@ def add_did(scope, name, did_type, issuer, account=None, statuses={}, meta={}, r
         # Validate metadata
         meta_convention_core.validate_meta(meta=meta, did_type=DIDType[did_type.upper()], session=session)
 
-    return did.add_did(scope=scope, name=name, did_type=DIDType[did_type.upper()], account=account or issuer,
+    return did.add_did(scope=internal_scope, name=name, did_type=DIDType[did_type.upper()], account=owner_account or issuer_account,
                        statuses=statuses, meta=meta, rules=rules, lifetime=lifetime,
                        dids=dids, rse_id=rse_id, session=session)
 
@@ -329,7 +348,7 @@ def list_content_history(scope, name, vo='def', *, session: "Session"):
 
 
 @stream_session
-def bulk_list_files(dids: "list[dict[str, Any]]", long: bool = False, vo: str = 'def', *, session: "Session") -> "Iterator[dict[str, Any]]":
+def bulk_list_files(dids: list[dict[str, Any]], long: bool = False, vo: str = 'def', *, session: "Session") -> Iterator[dict[str, Any]]:
     """
     List file contents of a list of data identifiers.
 

{rucio-34.2.0 → rucio-34.4.0}/lib/rucio/api/exporter.py

@@ -12,7 +12,7 @@
 # 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.api import permission
 from rucio.common import exception
@@ -25,7 +25,7 @@ if TYPE_CHECKING:
 
 
 @read_session
-def export_data(issuer, distance=True, vo='def', *, session: "Session"):
+def export_data(issuer: str, distance: bool = True, vo: str = 'def', *, session: "Session") -> dict[str, Any]:
     """
     Export data from Rucio.
 

{rucio-34.2.0 → rucio-34.4.0}/lib/rucio/api/heartbeat.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 from rucio.api import permission
 from rucio.common import exception
@@ -20,11 +20,13 @@ from rucio.core import heartbeat
 from rucio.db.sqla.session import read_session, transactional_session
 
 if TYPE_CHECKING:
+    from threading import Thread
+
     from sqlalchemy.orm import Session
 
 
 @read_session
-def list_heartbeats(issuer=None, vo='def', *, session: "Session"):
+def list_heartbeats(issuer: Optional[str] = None, vo: str = 'def', *, session: "Session") -> list["heartbeat.HeartbeatDict"]:
     """
     Return a list of tuples of all heartbeats.
 
@@ -41,7 +43,18 @@ def list_heartbeats(issuer=None, vo='def', *, session: "Session"):
 
 
 @transactional_session
-def create_heartbeat(executable, hostname, pid, older_than, payload, thread=None, issuer=None, vo='def', *, session: "Session"):
+def create_heartbeat(
+    executable: str,
+    hostname: str,
+    pid: int,
+    older_than: int,
+    payload: Optional[str],
+    thread: Optional["Thread"] = None,
+    issuer: Optional[str] = None,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> None:
     """
     Creates a heartbeat.
     :param issuer: The issuer account.

{rucio-34.2.0 → rucio-34.4.0}/lib/rucio/api/importer.py

@@ -12,7 +12,7 @@
 # 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.api import permission
 from rucio.common import exception
@@ -26,7 +26,7 @@ if TYPE_CHECKING:
 
 
 @transactional_session
-def import_data(data, issuer, vo='def', *, session: "Session"):
+def import_data(data: dict[str, Any], issuer: str, vo: str = 'def', *, session: "Session") -> None:
     """
     Import data to add/update/delete records in Rucio.
 

{rucio-34.2.0 → rucio-34.4.0}/lib/rucio/api/meta_conventions.py

@@ -27,7 +27,7 @@ if TYPE_CHECKING:
 
 
 @read_session
-def list_keys(*, session: "Session"):
+def list_keys(*, session: "Session") -> list[str]:
     """
     Lists all keys for DID Metadata Conventions.
 
@@ -39,7 +39,7 @@ def list_keys(*, session: "Session"):
 
 
 @read_session
-def list_values(key: str, *, session: "Session"):
+def list_values(key: str, *, session: "Session") -> list[str]:
     """
     Lists all allowed values for a DID key (all values for a key in DID Metadata Conventions).
 
@@ -53,7 +53,7 @@ def list_values(key: str, *, session: "Session"):
 
 
 @transactional_session
-def add_key(key: str, key_type: Union[KeyType, str], issuer: "InternalAccount", value_type: Optional[str] = None, value_regexp: Optional[str] = None, vo: str = 'def', *, session: "Session"):
+def add_key(key: str, key_type: Union[KeyType, str], issuer: "InternalAccount", value_type: Optional[str] = None, value_regexp: Optional[str] = None, vo: str = 'def', *, session: "Session") -> None:
     """
     Add an allowed key for DID metadata (update the DID Metadata Conventions table with a new key).
 
@@ -72,7 +72,7 @@ def add_key(key: str, key_type: Union[KeyType, str], issuer: "InternalAccount",
 
 
 @transactional_session
-def add_value(key: str, value: str, issuer: "InternalAccount", vo: str = 'def', *, session: "Session"):
+def add_value(key: str, value: str, issuer: "InternalAccount", vo: str = 'def', *, session: "Session") -> None:
     """
     Add an allowed value for DID metadata (update a key in DID Metadata Conventions table).
 

{rucio-34.2.0 → rucio-34.4.0}/lib/rucio/api/permission.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from copy import deepcopy
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 from rucio.common.exception import RSENotFound
 from rucio.common.types import InternalAccount, InternalScope
@@ -26,7 +26,7 @@ if TYPE_CHECKING:
 
 
 @read_session
-def has_permission(issuer, action, kwargs, vo='def', *, session: "Session"):
+def has_permission(issuer: str, action: str, kwargs: dict[str, Any], vo: str = 'def', *, session: "Session") -> bool:
     """
     Checks if an account has the specified permission to
     execute an action with parameters.
@@ -66,6 +66,6 @@ def has_permission(issuer, action, kwargs, vo='def', *, session: "Session"):
                 for r in d['rules']:
                     r['account'] = InternalAccount(r['account'], vo=vo)
 
-    issuer = InternalAccount(issuer, vo=vo)
+    issuer_account = InternalAccount(issuer, vo=vo)
 
-    return permission.has_permission(issuer=issuer, action=action, kwargs=kwargs, session=session)
+    return permission.has_permission(issuer=issuer_account, action=action, kwargs=kwargs, session=session)