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

rucio/{api → gateway}/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");
@@ -13,22 +12,32 @@
 # 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.permission import has_permission
-from rucio.api.scope import list_scopes
 from rucio.common.exception import AccessDenied
 from rucio.common.utils import extract_scope
 from rucio.core import dirac
 from rucio.core.rse import get_rse_id
 from rucio.db.sqla.session import transactional_session
+from rucio.gateway.permission import has_permission
+from rucio.gateway.scope import list_scopes
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from sqlalchemy.orm import Session
 
 
 @transactional_session
-def add_files(lfns, issuer, ignore_availability, vo='def', *, session: "Session"):
+def add_files(
+    lfns: "Iterable[dict[str, Any]]",
+    issuer: 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.
@@ -38,6 +47,7 @@ def add_files(lfns, issuer, 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 blocked sites.
+    :param parents_metadata: Metadata for selected hierarchy DIDs. (dictionary {'lpn': {key : value}}). Default=None
     :param vo: The VO to act on.
     :param session: The database session in use.
 
@@ -68,4 +78,4 @@ def add_files(lfns, issuer, ignore_availability, vo='def', *, session: "Session"
     if not has_permission(issuer=issuer, action='add_dids', kwargs=kwargs, vo=vo, session=session):
         raise AccessDenied('Account %s can not bulk add data identifier for VO %s' % (issuer, vo))
 
-    dirac.add_files(lfns=lfns, account=issuer, ignore_availability=ignore_availability, vo=vo, session=session)
+    dirac.add_files(lfns=lfns, account=issuer, ignore_availability=ignore_availability, parents_metadata=parents_metadata, vo=vo, session=session)

rucio/{api → gateway}/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,20 +12,20 @@
 # 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
 from rucio.core import exporter
 from rucio.core.rse import get_rse_name
 from rucio.db.sqla.session import read_session
+from rucio.gateway import permission
 
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session
 
 
 @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/{api → gateway}/heartbeat.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,19 +12,21 @@
 # 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
 from rucio.core import heartbeat
 from rucio.db.sqla.session import read_session, transactional_session
+from rucio.gateway import permission
 
 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.
 
@@ -42,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/{api → gateway}/identity.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");
@@ -17,22 +16,31 @@
 Interface for identity abstraction layer
 """
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
-from rucio.api import permission
 from rucio.common import exception
 from rucio.common.types import InternalAccount
 from rucio.core import identity
 from rucio.db.sqla.constants import IdentityType
 from rucio.db.sqla.session import read_session, transactional_session
+from rucio.gateway import permission
 
 if TYPE_CHECKING:
-    from typing import Optional
+    from collections.abc import Sequence
+
+    from sqlalchemy import Row
     from sqlalchemy.orm import Session
 
 
 @transactional_session
-def add_identity(identity_key, id_type, email, password=None, *, session: "Session"):
+def add_identity(
+    identity_key: str,
+    id_type: str,
+    email: str,
+    password: Optional[str] = None,
+    *,
+    session: "Session"
+) -> None:
     """
     Creates a user identity.
 
@@ -46,7 +54,14 @@ def add_identity(identity_key, id_type, email, password=None, *, session: "Sessi
 
 
 @transactional_session
-def del_identity(identity_key, id_type, issuer, vo='def', *, session: "Session"):
+def del_identity(
+    identity_key: str,
+    id_type: str,
+    issuer: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> None:
     """
     Deletes a user identity.
     :param identity_key: The identity key name. For example x509 DN, or a username.
@@ -55,16 +70,27 @@ def del_identity(identity_key, id_type, issuer, vo='def', *, session: "Session")
     :param vo: the VO of the issuer.
     :param session: The database session in use.
     """
-    id_type = IdentityType[id_type.upper()]
-    kwargs = {'accounts': identity.list_accounts_for_identity(identity_key, id_type, session=session)}
+    converted_id_type = IdentityType[id_type.upper()]
+    kwargs = {'accounts': identity.list_accounts_for_identity(identity_key, converted_id_type, session=session)}
     if not permission.has_permission(issuer=issuer, vo=vo, action='del_identity', kwargs=kwargs, session=session):
         raise exception.AccessDenied('Account %s can not delete identity' % (issuer))
 
-    return identity.del_identity(identity_key, id_type, session=session)
+    return identity.del_identity(identity_key, converted_id_type, session=session)
 
 
 @transactional_session
-def add_account_identity(identity_key, id_type, account, email, issuer, default=False, password=None, vo='def', *, session: "Session"):
+def add_account_identity(
+    identity_key: str,
+    id_type: str,
+    account: str,
+    email: str,
+    issuer: str,
+    default: bool = False,
+    password: Optional[str] = None,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> None:
     """
     Adds a membership association between identity and account.
 
@@ -82,14 +108,14 @@ def add_account_identity(identity_key, id_type, account, email, issuer, default=
     if not permission.has_permission(issuer=issuer, vo=vo, action='add_account_identity', kwargs=kwargs, session=session):
         raise exception.AccessDenied('Account %s can not add account identity' % (issuer))
 
-    account = InternalAccount(account, vo=vo)
+    internal_account = InternalAccount(account, vo=vo)
 
     return identity.add_account_identity(identity=identity_key, type_=IdentityType[id_type.upper()], default=default,
-                                         email=email, account=account, password=password, session=session)
+                                         email=email, account=internal_account, password=password, session=session)
 
 
 @read_session
-def verify_identity(identity_key: str, id_type: str, password: "Optional[str]" = None, *, session: "Session") -> bool:
+def verify_identity(identity_key: str, id_type: str, password: Optional[str] = None, *, session: "Session") -> bool:
     """
     Verifies a user identity.
     :param identity_key: The identity key name. For example x509 DN, or a username.
@@ -101,7 +127,15 @@ def verify_identity(identity_key: str, id_type: str, password: "Optional[str]" =
 
 
 @transactional_session
-def del_account_identity(identity_key, id_type, account, issuer, vo='def', *, session: "Session"):
+def del_account_identity(
+    identity_key: str,
+    id_type: str,
+    account: str,
+    issuer: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> None:
     """
     Removes a membership association between identity and account.
 
@@ -116,13 +150,13 @@ def del_account_identity(identity_key, id_type, account, issuer, vo='def', *, se
     if not permission.has_permission(issuer=issuer, vo=vo, action='del_account_identity', kwargs=kwargs, session=session):
         raise exception.AccessDenied('Account %s can not delete account identity' % (issuer))
 
-    account = InternalAccount(account, vo=vo)
+    internal_account = InternalAccount(account, vo=vo)
 
-    return identity.del_account_identity(identity_key, IdentityType[id_type.upper()], account, session=session)
+    return identity.del_account_identity(identity_key, IdentityType[id_type.upper()], internal_account, session=session)
 
 
 @read_session
-def list_identities(*, session: "Session", **kwargs):
+def list_identities(*, session: "Session", **kwargs) -> "Sequence[Row[tuple[str, IdentityType]]]":
     """
     Returns a list of all enabled identities.
 
@@ -133,7 +167,12 @@ def list_identities(*, session: "Session", **kwargs):
 
 
 @read_session
-def get_default_account(identity_key, id_type, *, session: "Session"):
+def get_default_account(
+    identity_key: str,
+    id_type: str,
+    *,
+    session: "Session"
+) -> str:
     """
     Returns the default account for this identity.
 
@@ -146,7 +185,12 @@ def get_default_account(identity_key, id_type, *, session: "Session"):
 
 
 @read_session
-def list_accounts_for_identity(identity_key, id_type, *, session: "Session"):
+def list_accounts_for_identity(
+    identity_key: str,
+    id_type: str,
+    *,
+    session: "Session"
+) -> list[str]:
     """
     Returns a list of all accounts for an identity.
 

rucio/{api → gateway}/importer.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,21 @@
 # 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
 from rucio.common.schema import validate_schema
 from rucio.common.types import InternalAccount
 from rucio.core import importer
 from rucio.db.sqla.session import transactional_session
+from rucio.gateway import permission
 
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session
 
 
 @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/{api → gateway}/lifetime_exception.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,31 @@
 # 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
 from rucio.common.types import InternalAccount, InternalScope
-from rucio.common.utils import api_update_return_dict
+from rucio.common.utils import gateway_update_return_dict
 from rucio.core import lifetime_exception
 from rucio.db.sqla.session import stream_session, transactional_session
+from rucio.gateway import permission
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable, Iterator
+
     from sqlalchemy.orm import Session
 
+    from rucio.db.sqla.constants import LifetimeExceptionsState
+
 
 @stream_session
-def list_exceptions(exception_id=None, states=None, vo='def', *, session: "Session"):
+def list_exceptions(
+    exception_id: Optional[str] = None,
+    states: Optional["Iterable[LifetimeExceptionsState]"] = None,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> 'Iterator[dict[str, Any]]':
     """
     List exceptions to Lifetime Model.
 
@@ -40,11 +49,20 @@ def list_exceptions(exception_id=None, states=None, vo='def', *, session: "Sessi
     exceptions = lifetime_exception.list_exceptions(exception_id=exception_id, states=states, session=session)
     for e in exceptions:
         if vo == e['scope'].vo:
-            yield api_update_return_dict(e, session=session)
+            yield gateway_update_return_dict(e, session=session)
 
 
 @transactional_session
-def add_exception(dids, account, pattern, comments, expires_at, vo='def', *, session: "Session"):
+def add_exception(
+    dids: "Iterable[dict[str, Any]]",
+    account: str,
+    pattern: str,
+    comments: str,
+    expires_at: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> dict[str, Any]:
     """
     Add exceptions to Lifetime Model.
 
@@ -59,10 +77,10 @@ def add_exception(dids, account, pattern, comments, expires_at, vo='def', *, ses
     returns:            The id of the exception.
     """
 
-    account = InternalAccount(account, vo=vo)
+    internal_account = InternalAccount(account, vo=vo)
     for did in dids:
         did['scope'] = InternalScope(did['scope'], vo=vo)
-    exceptions = lifetime_exception.add_exception(dids=dids, account=account, pattern=pattern, comments=comments, expires_at=expires_at, session=session)
+    exceptions = lifetime_exception.add_exception(dids=dids, account=internal_account, pattern=pattern, comments=comments, expires_at=expires_at, session=session)
 
     for key in exceptions:
         if key == 'exceptions':
@@ -79,7 +97,14 @@ def add_exception(dids, account, pattern, comments, expires_at, vo='def', *, ses
 
 
 @transactional_session
-def update_exception(exception_id, state, issuer, vo='def', *, session: "Session"):
+def update_exception(
+    exception_id: str,
+    state: 'LifetimeExceptionsState',
+    issuer: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> None:
     """
     Update exceptions state to Lifetime Model.
 

rucio/{api → gateway}/lock.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");
@@ -14,16 +13,18 @@
 # limitations under the License.
 
 import logging
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 from rucio.common.types import InternalScope
-from rucio.common.utils import api_update_return_dict
+from rucio.common.utils import gateway_update_return_dict
 from rucio.core import lock
 from rucio.core.rse import get_rse_id
 from rucio.db.sqla.constants import DIDType
 from rucio.db.sqla.session import stream_session
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable, Iterator
+
     from sqlalchemy.orm import Session
 
 
@@ -32,7 +33,13 @@ LOGGER.setLevel(logging.DEBUG)
 
 
 @stream_session
-def get_dataset_locks(scope, name, vo='def', *, session: "Session"):
+def get_dataset_locks(
+    scope: str,
+    name: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> 'Iterator[dict[str, Any]]':
     """
     Get the dataset locks of a dataset.
 
@@ -43,16 +50,21 @@ def get_dataset_locks(scope, name, vo='def', *, session: "Session"):
     :return:               List of dicts {'rse_id': ..., 'state': ...}
     """
 
-    scope = InternalScope(scope, vo=vo)
+    internal_scope = InternalScope(scope, vo=vo)
 
-    locks = lock.get_dataset_locks(scope=scope, name=name, session=session)
+    locks = lock.get_dataset_locks(scope=internal_scope, name=name, session=session)
 
     for lock_object in locks:
-        yield api_update_return_dict(lock_object, session=session)
+        yield gateway_update_return_dict(lock_object, session=session)
 
 
 @stream_session
-def get_dataset_locks_bulk(dids, vo='def', *, session: "Session"):
+def get_dataset_locks_bulk(
+    dids: 'Iterable[dict[str, Any]]',
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> 'Iterator[dict[str, Any]]':
     """
     Get the dataset locks for multiple datasets or containers.
 
@@ -94,7 +106,12 @@ def get_dataset_locks_bulk(dids, vo='def', *, session: "Session"):
 
 
 @stream_session
-def get_dataset_locks_by_rse(rse, vo='def', *, session: "Session"):
+def get_dataset_locks_by_rse(
+    rse: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> 'Iterator[dict[str, Any]]':
     """
     Get the dataset locks of an RSE.
 
@@ -108,11 +125,16 @@ def get_dataset_locks_by_rse(rse, vo='def', *, session: "Session"):
     locks = lock.get_dataset_locks_by_rse_id(rse_id=rse_id, session=session)
 
     for lock_object in locks:
-        yield api_update_return_dict(lock_object, session=session)
+        yield gateway_update_return_dict(lock_object, session=session)
 
 
 @stream_session
-def get_replica_locks_for_rule_id(rule_id, vo='def', *, session: "Session"):
+def get_replica_locks_for_rule_id(
+    rule_id: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> 'Iterator[dict[str, Any]]':
     """
     Get the replica locks for a rule_id.
 
@@ -128,4 +150,4 @@ def get_replica_locks_for_rule_id(rule_id, vo='def', *, session: "Session"):
         if lock_object['scope'].vo != vo:  # rule is on a different VO, so don't return any locks
             LOGGER.debug('rule id %s is not present on VO %s' % (rule_id, vo))
             break
-        yield api_update_return_dict(lock_object, session=session)
+        yield gateway_update_return_dict(lock_object, session=session)

rucio/{api/meta.py → gateway/meta_conventions.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,33 +12,36 @@
 # 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, Union
 
-from rucio.api.permission import has_permission
 from rucio.common.exception import AccessDenied
-from rucio.core import meta
+from rucio.core import meta_conventions
+from rucio.db.sqla.constants import KeyType
 from rucio.db.sqla.session import read_session, transactional_session
+from rucio.gateway.permission import has_permission
 
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session
 
+    from rucio.common.types import InternalAccount
+
 
 @read_session
-def list_keys(*, session: "Session"):
+def list_keys(*, session: "Session") -> list[str]:
     """
-    Lists all keys.
+    Lists all keys for DID Metadata Conventions.
 
     :param session: The database session in use.
 
     :returns: A list containing all keys.
     """
-    return meta.list_keys(session=session)
+    return meta_conventions.list_keys(session=session)
 
 
 @read_session
-def list_values(key, *, session: "Session"):
+def list_values(key: str, *, session: "Session") -> list[str]:
     """
-    Lists all values for a key.
+    Lists all allowed values for a DID key (all values for a key in DID Metadata Conventions).
 
     :param key: the name for the key.
     :param session: The database session in use.
@@ -47,13 +49,13 @@ def list_values(key, *, session: "Session"):
 
     :returns: A list containing all values.
     """
-    return meta.list_values(key=key, session=session)
+    return meta_conventions.list_values(key=key, session=session)
 
 
 @transactional_session
-def add_key(key, key_type, issuer, value_type=None, value_regexp=None, vo='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 a new allowed key.
+    Add an allowed key for DID metadata (update the DID Metadata Conventions table with a new key).
 
     :param key: the name for the new key.
     :param key_type: the type of the key: all(container, dataset, file), collection(dataset or container), file, derived(compute from file for collection).
@@ -66,13 +68,13 @@ def add_key(key, key_type, issuer, value_type=None, value_regexp=None, vo='def',
     kwargs = {'key': key, 'key_type': key_type, 'value_type': value_type, 'value_regexp': value_regexp}
     if not has_permission(issuer=issuer, vo=vo, action='add_key', kwargs=kwargs, session=session):
         raise AccessDenied('Account %s can not add key' % (issuer))
-    return meta.add_key(key=key, key_type=key_type, value_type=value_type, value_regexp=value_regexp, session=session)
+    return meta_conventions.add_key(key=key, key_type=key_type, value_type=value_type, value_regexp=value_regexp, session=session)
 
 
 @transactional_session
-def add_value(key, value, issuer, vo='def', *, session: "Session"):
+def add_value(key: str, value: str, issuer: "InternalAccount", vo: str = 'def', *, session: "Session") -> None:
     """
-    Add a new value to a key.
+    Add an allowed value for DID metadata (update a key in DID Metadata Conventions table).
 
     :param key: the name for the key.
     :param value: the value.
@@ -82,4 +84,4 @@ def add_value(key, value, issuer, vo='def', *, session: "Session"):
     kwargs = {'key': key, 'value': value}
     if not has_permission(issuer=issuer, vo=vo, action='add_value', kwargs=kwargs, session=session):
         raise AccessDenied('Account %s can not add value %s to key %s' % (issuer, value, key))
-    return meta.add_value(key=key, value=value, session=session)
+    return meta_conventions.add_value(key=key, value=value, session=session)

rucio/{api → gateway}/permission.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");
@@ -14,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
@@ -27,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.
@@ -67,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)