rucio 35.7.0__py3-none-any.whl → 37.0.0rc2__py3-none-any.whl

rucio/transfertool/fts3.py

@@ -28,12 +28,14 @@ from dogpile.cache.api import NoValue
 from requests.adapters import ReadTimeout
 from requests.packages.urllib3 import disable_warnings  # pylint: disable=import-error
 
-from rucio.common.cache import make_region_memcached
+from rucio.common.cache import MemcacheRegion
+from rucio.common.checksum import PREFERRED_CHECKSUM
 from rucio.common.config import config_get, config_get_bool, config_get_int, config_get_list
 from rucio.common.constants import FTS_COMPLETE_STATE, FTS_JOB_TYPE, FTS_STATE, RseAttr
 from rucio.common.exception import DuplicateFileTransferSubmission, TransferToolTimeout, TransferToolWrongAnswer
+from rucio.common.policy import get_policy
 from rucio.common.stopwatch import Stopwatch
-from rucio.common.utils import PREFERRED_CHECKSUM, APIEncoder, chunks, deep_merge_dict
+from rucio.common.utils import APIEncoder, chunks, deep_merge_dict
 from rucio.core.monitor import MetricManager
 from rucio.core.oidc import request_token
 from rucio.core.request import get_source_rse, get_transfer_error
@@ -54,7 +56,7 @@ if TYPE_CHECKING:
 logging.getLogger("requests").setLevel(logging.CRITICAL)
 disable_warnings()
 
-REGION_SHORT = make_region_memcached(expiration_time=900)
+REGION_SHORT = MemcacheRegion(expiration_time=900)
 METRICS = MetricManager(module=__name__)
 
 SUBMISSION_COUNTER = METRICS.counter(name='{host}.submission.{state}',
@@ -109,6 +111,9 @@ _SCITAGS_NEXT_REFRESH = datetime.datetime.utcnow()
 _SCITAGS_EXP_ID = None
 _SCITAGS_ACTIVITY_IDS = {}
 
+FTS_FILE_EXISTS_ERROR_MSG = 'Destination file exists and is on tape'  # used in FTS  >= 3.12.12
+FTS_FILE_EXISTS_ERROR_MSG_LEGACY = 'Destination file exists and overwrite is not enabled'  # Error message used in FTS < 3.12.12, checked in Rucio for backwards compatibility
+
 
 def _scitags_ids(logger: "LoggerFunction" = logging.log) -> "tuple[int | None, dict[str, int]]":
     """
@@ -613,9 +618,9 @@ class Fts3TransferStatusReport(TransferStatusReport):
     def _transfer_link(self) -> str:
         return '%s/fts3/ftsmon/#/job/%s' % (self._fts_address.replace('8446', '8449'), self._transfer_id)
 
-    def _find_attribute_updates(self, request: dict, new_state: RequestState, reason: str, overwrite_corrupted_files: Optional[bool] = None) -> Optional[dict[str, Any]]:
+    def _find_attribute_updates(self, request: dict, new_state: RequestState, reason: Optional[str], overwrite_corrupted_files: Optional[bool] = None) -> Optional[dict[str, Any]]:
         attributes = None
-        if new_state == RequestState.FAILED and 'Destination file exists and overwrite is not enabled' in (reason or ''):
+        if new_state == RequestState.FAILED and (reason and any(s in reason for s in (FTS_FILE_EXISTS_ERROR_MSG, FTS_FILE_EXISTS_ERROR_MSG_LEGACY))):
             dst_file = self._file_metadata.get('dst_file', {})
             if self._dst_file_set_and_file_corrupted(request, dst_file):
                 if overwrite_corrupted_files:
@@ -668,7 +673,7 @@ class Fts3TransferStatusReport(TransferStatusReport):
         return False
 
     @classmethod
-    def _is_recoverable_fts_overwrite_error(cls, request: dict[str, Any], reason: str,
+    def _is_recoverable_fts_overwrite_error(cls, request: dict[str, Any], reason: Optional[str],
                                             file_metadata: dict[str, Any]) -> bool:
         """
         Verify the special case when FTS cannot copy a file because destination exists and overwrite is disabled,
@@ -685,7 +690,7 @@ class Fts3TransferStatusReport(TransferStatusReport):
         dst_type = file_metadata.get('dst_type', None)
         METRICS.counter('overwrite.check.{rsetype}.{rse}').labels(rse=file_metadata["dst_rse"], rsetype=dst_type).inc()
 
-        if 'Destination file exists and overwrite is not enabled' in (reason or ''):
+        if reason and any(s in reason for s in (FTS_FILE_EXISTS_ERROR_MSG, FTS_FILE_EXISTS_ERROR_MSG_LEGACY)):
             if cls._dst_file_set_and_file_correct(request, dst_file):
                 if dst_type == 'DISK' or dst_file.get('file_on_tape'):
                     METRICS.counter('overwrite.ok.{rsetype}.{rse}').labels(rse=file_metadata["dst_rse"], rsetype=dst_type).inc()
@@ -869,7 +874,6 @@ class FTS3Transfertool(Transfertool):
 
     def __init__(self,
                  external_host: str,
-                 oidc_account: Optional[str] = None,
                  oidc_support: bool = False,
                  vo: Optional[str] = None,
                  group_bulk: int = 1,
@@ -1045,6 +1049,9 @@ class FTS3Transfertool(Transfertool):
             for plugin in self.tape_metadata_plugins:
                 t_file = deep_merge_dict(source=plugin.hints(t_file['metadata']), destination=t_file)
 
+        if t_file['metadata']['src_type'] == 'TAPE':
+            t_file['staging_metadata'] = {"default": {"activity": rws.activity}}
+
         return t_file
 
     def submit(self, transfers: "Sequence[DirectTransfer]", job_params: dict[str, str], timeout: Optional[int] = None) -> str:
@@ -1338,8 +1345,8 @@ class FTS3Transfertool(Transfertool):
         except Exception:
             self.logger(logging.WARNING, 'Could not get config of %s on %s - %s', storage_element, self.external_host, str(traceback.format_exc()))
         if result and result.status_code == 200:
-            C = result.json()
-            config_se = C[storage_element]
+            result_json = result.json()
+            config_se = result_json[storage_element]
             return config_se
         raise Exception('Could not get the configuration of %s , status code returned : %s', (storage_element, result.status_code if result else None))
 
@@ -1366,10 +1373,7 @@ class FTS3Transfertool(Transfertool):
 
         params_dict = {storage_element: {'operations': {}, 'se_info': {}}}
         if staging is not None:
-            try:
-                policy = config_get('policy', 'permission')
-            except Exception:
-                self.logger(logging.WARNING, 'Could not get policy from config')
+            policy = get_policy()
             params_dict[storage_element]['operations'] = {policy: {'staging': staging}}
         # A lot of try-excepts to avoid dictionary overwrite's,
         # see https://stackoverflow.com/questions/27118687/updating-nested-dictionaries-when-data-has-existing-key/27118776
@@ -1407,8 +1411,8 @@ class FTS3Transfertool(Transfertool):
         except Exception:
             self.logger(logging.WARNING, 'Could not set the config of %s on %s - %s', storage_element, self.external_host, str(traceback.format_exc()))
         if result and result.status_code == 200:
-            configSe = result.json()
-            return configSe
+            config_se = result.json()
+            return config_se
         raise Exception('Could not set the configuration of %s , status code returned : %s', (storage_element, result.status_code if result else None))
 
     def set_se_status(self, storage_element: str, message: str, ban: bool = True, timeout: Optional[int] = None) -> int:

rucio/transfertool/mock.py

@@ -15,14 +15,13 @@
 import itertools
 import logging
 import uuid
-from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any, Optional
 
 from rucio.db.sqla.constants import RequestState
 from rucio.transfertool.transfertool import TransferStatusReport, Transfertool, TransferToolBuilder
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable, Mapping
+    from collections.abc import Iterable, Mapping, Sequence
 
     from rucio.common.types import LoggerFunction
     from rucio.core.request import DirectTransfer
@@ -83,7 +82,7 @@ class MockTransfertool(Transfertool):
                 response.setdefault(transfer_id, {})[request_id] = MockTransferStatusReport(request_id, transfer_id)
         return response
 
-    def cancel(self, transfer_ids: Sequence[str], timeout: Optional[int] = None) -> bool:
+    def cancel(self, transfer_ids: 'Sequence[str]', timeout: Optional[int] = None) -> bool:
         return True
 
     def update_priority(self, transfer_id: str, priority: int, timeout: Optional[int] = None) -> bool:

rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '35.7.0',
-    'branch_nick': 'release-35-LTS',
-    'revision_id': 'c96dca5cf90ca93cb024f30f987ed8c48815a64d',
-    'revno': 13202
+    'version': '37.0.0rc2',
+    'branch_nick': 'master',
+    'revision_id': '6fb393d63e8f50733e00ce0b0234380ac12cd607',
+    'revno': 13608
 }

rucio/version.py

@@ -35,4 +35,11 @@ def vcs_version_string() -> str:
 
 def version_string_with_vcs() -> str:
     """ Get the version string with VCS """
+
     return "%s-%s" % (canonical_version_string(), vcs_version_string())
+
+
+def current_version() -> str:
+    """ Get the current version """
+    components = 2 if version_string().startswith("1.") else 1
+    return ".".join(version_string().split(".")[:components])

rucio/web/rest/flaskapi/v1/accounts.py

@@ -682,6 +682,13 @@ class Identities(ErrorHandlingMethodView):
         identity = param_get(parameters, 'identity')
         authtype = param_get(parameters, 'authtype')
         email = param_get(parameters, 'email')
+
+        issuer = request.environ.get('issuer')
+        vo = request.environ.get('vo')
+
+        if not issuer or not vo:
+            return generate_http_error_flask(400, ValueError.__name__, 'Issuer and VO must be set.')
+
         try:
             add_account_identity(
                 identity_key=identity,
@@ -689,9 +696,9 @@ class Identities(ErrorHandlingMethodView):
                 account=account,
                 email=email,
                 password=param_get(parameters, 'password', default=None),
-                issuer=request.environ.get('issuer'),
+                issuer=issuer,
                 default=param_get(parameters, 'default', default=False),
-                vo=request.environ.get('vo'),
+                vo=vo,
             )
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
@@ -788,8 +795,15 @@ class Identities(ErrorHandlingMethodView):
         parameters = json_parameters()
         identity = param_get(parameters, 'identity')
         authtype = param_get(parameters, 'authtype')
+
+        issuer = request.environ.get('issuer')
+        vo = request.environ.get('vo')
+
+        if not issuer or not vo:
+            return generate_http_error_flask(400, ValueError.__name__, 'Issuer and VO must be set.')
+
         try:
-            del_account_identity(identity, authtype, account, request.environ.get('issuer'), vo=request.environ.get('vo'))
+            del_account_identity(identity, authtype, account, issuer, vo=vo)
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except (AccountNotFound, IdentityError) as error:

rucio/web/rest/flaskapi/v1/auth.py

@@ -939,7 +939,7 @@ class GSS(ErrorHandlingMethodView):
         return '', 200, headers
 
 
-class x509(ErrorHandlingMethodView):
+class x509(ErrorHandlingMethodView):  # noqa: N801
     """
     Authenticate a Rucio account temporarily via an x509 certificate.
     """
@@ -1476,10 +1476,10 @@ class SAML(ErrorHandlingMethodView):
             return '', 200, headers
 
         # Path to the SAML config folder
-        SAML_PATH = config_get('saml', 'config_path')
+        saml_path = config_get('saml', 'config_path')
 
         req = prepare_saml_request(request.environ, dict(request.args.items(multi=False)))
-        auth = OneLogin_Saml2_Auth(req, custom_base_path=SAML_PATH)
+        auth = OneLogin_Saml2_Auth(req, custom_base_path=saml_path)
 
         headers.set('X-Rucio-SAML-Auth-URL', auth.login())
         return '', 200, headers
@@ -1500,9 +1500,9 @@ class SAML(ErrorHandlingMethodView):
         if not EXTRA_MODULES['onelogin']:
             return "SAML not configured on the server side.", 200, [('X-Rucio-Auth-Token', '')]
 
-        SAML_PATH = config_get('saml', 'config_path')
+        saml_path = config_get('saml', 'config_path')
         req = prepare_saml_request(request.environ, dict(request.args.items(multi=False)))
-        auth = OneLogin_Saml2_Auth(req, custom_base_path=SAML_PATH)
+        auth = OneLogin_Saml2_Auth(req, custom_base_path=saml_path)
 
         auth.process_response()
         errors = auth.get_errors()

rucio/web/rest/flaskapi/v1/credentials.py

@@ -17,6 +17,7 @@ from typing import TYPE_CHECKING
 from flask import Flask, request
 from werkzeug.datastructures import Headers
 
+from rucio.common.constants import RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS, SUPPORTED_SIGN_URL_SERVICES
 from rucio.common.exception import CannotAuthenticate
 from rucio.gateway.credential import get_signed_url
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
@@ -177,10 +178,10 @@ class SignURL(ErrorHandlingMethodView):
             return generate_http_error_flask(400, ValueError.__name__, 'Parameter "url" not found', headers=headers)
         url = request.args.get('url')
 
-        if service not in ['gcs', 's3', 'swift']:
+        if service not in SUPPORTED_SIGN_URL_SERVICES:
             return generate_http_error_flask(400, ValueError.__name__, 'Parameter "svc" must be either empty(=gcs), gcs, s3 or swift', headers=headers)
 
-        if operation not in ['read', 'write', 'delete']:
+        if operation not in RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS:
             return generate_http_error_flask(400, ValueError.__name__, 'Parameter "op" must be either empty(=read), read, write, or delete.', headers=headers)
 
         result = get_signed_url(account, appid, ip, rse=rse, service=service, operation=operation, url=url, lifetime=lifetime, vo=vo)

rucio/web/rest/flaskapi/v1/dids.py

@@ -88,28 +88,29 @@ class Scope(ErrorHandlingMethodView):
         - name: scope
           in: path
           description: The scope.
+          required: true
           schema:
             type: string
           style: simple
-        requestBody:
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  name:
-                    description: The name of the did.
-                    type: string
-                  recursive:
-                    description: If specified, also returns the child ids recursively.
-                    type: boolean
+        - name: name
+          in: query
+          description: The name of the data identifier (did).
+          required: false
+          schema:
+            type: string
+        - name: recursive
+          in: query
+          description: If true, retrieves child identifiers recursively for non-file types.
+          required: false
+          schema:
+            type: boolean
         responses:
           200:
             description: OK
             content:
               application/x-json-stream:
                 schema:
-                  description: Line separated dictionary of dids.
+                  description: Line-separated dictionary of dids.
                   type: array
                   items:
                     type: object
@@ -143,7 +144,7 @@ class Scope(ErrorHandlingMethodView):
                 for did in scope_list(scope=scope, name=name, recursive=recursive, vo=vo):
                     yield render_json(**did) + '\n'
 
-            recursive = 'recursive' in request.args
+            recursive = request.args.get('recursive', 'false').lower() in ['true', '1']
 
             return try_stream(
                 generate(
@@ -1699,6 +1700,10 @@ class BulkMeta(ErrorHandlingMethodView):
                     description: Concatenated the metadata of the parent if set to true.
                     type: boolean
                     default: false
+                  plugin:
+                    description: The did meta plugin to query or "ALL" for all available plugins
+                    type: string
+                    default: "JSON"
         responses:
           200:
             description: OK
@@ -1722,10 +1727,11 @@ class BulkMeta(ErrorHandlingMethodView):
         parameters = json_parameters()
         dids = param_get(parameters, 'dids')
         inherit = param_get(parameters, 'inherit', default=False)
+        plugin = param_get(parameters, 'plugin', default='JSON')
 
         try:
             def generate(vo):
-                for meta in get_metadata_bulk(dids, inherit=inherit, vo=vo):
+                for meta in get_metadata_bulk(dids, inherit=inherit, plugin=plugin, vo=vo):
                     yield render_json(**meta) + '\n'
 
             return try_stream(generate(vo=request.environ.get('vo')))

rucio/web/rest/flaskapi/v1/identities.py

@@ -16,7 +16,7 @@ from flask import Flask, jsonify, request
 
 from rucio.gateway.identity import add_account_identity, add_identity, list_accounts_for_identity
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, response_headers
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, response_headers
 
 
 class UserPass(ErrorHandlingMethodView):
@@ -74,8 +74,14 @@ class UserPass(ErrorHandlingMethodView):
         password = request.headers.get('X-Rucio-Password', default=None)
         email = request.headers.get('X-Rucio-Email', default=None)
 
-        if not username or not password:
-            return 'Username and Password must be set.', 400
+        if not username or not password or not email:
+            return generate_http_error_flask(400, ValueError.__name__, 'Username, Email and Password must be set.')
+
+        issuer = request.environ.get('issuer')
+        vo = request.environ.get('vo')
+
+        if not issuer or not vo:
+            return generate_http_error_flask(400, ValueError.__name__, 'Issuer and VO must be set.')
 
         add_identity(username, 'userpass', email, password)
 
@@ -85,8 +91,8 @@ class UserPass(ErrorHandlingMethodView):
             account=account,
             email=email,
             password=password,
-            issuer=request.environ.get('issuer'),
-            vo=request.environ.get('vo'),
+            issuer=issuer,
+            vo=vo,
         )
 
         return 'Created', 201
@@ -130,14 +136,23 @@ class X509(ErrorHandlingMethodView):
         dn = request.environ.get('SSL_CLIENT_S_DN')
         email = request.headers.get('X-Rucio-Email', default=None)
 
+        if not dn or not email:
+            return generate_http_error_flask(400, ValueError.__name__, 'SSL_CLIENT_S_DN and email must be set.')
+
+        issuer = request.environ.get('issuer')
+        vo = request.environ.get('vo')
+
+        if not issuer or not vo:
+            return generate_http_error_flask(400, ValueError.__name__, 'Issuer and VO must be set.')
+
         add_identity(dn, 'x509', email=email)
         add_account_identity(
             identity_key=dn,
             id_type='x509',
             account=account,
             email=email,
-            issuer=request.environ.get('issuer'),
-            vo=request.environ.get('vo'),
+            issuer=issuer,
+            vo=vo,
         )
 
         return 'Created', 201
@@ -181,14 +196,23 @@ class GSS(ErrorHandlingMethodView):
         gsscred = request.environ.get('REMOTE_USER')
         email = request.headers.get('X-Rucio-Email', default=None)
 
+        if not gsscred or not email:
+            return generate_http_error_flask(400, ValueError.__name__, 'REMOTE_USER and email must be set.')
+
+        issuer = request.environ.get('issuer')
+        vo = request.environ.get('vo')
+
+        if not issuer or not vo:
+            return generate_http_error_flask(400, ValueError.__name__, 'Issuer and VO must be set.')
+
         add_identity(gsscred, 'gss', email=email)
         add_account_identity(
             identity_key=gsscred,
             id_type='gss',
             account=account,
             email=email,
-            issuer=request.environ.get('issuer'),
-            vo=request.environ.get('vo'),
+            issuer=issuer,
+            vo=vo,
         )
 
         return 'Created', 201

rucio/web/rest/flaskapi/v1/redirect.py

@@ -26,6 +26,7 @@ from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_acc
 if TYPE_CHECKING:
     from typing import Optional
 
+    from rucio.common.types import IPDict, ReplicaDict
     from rucio.web.rest.flaskapi.v1.types import HeadersType
 
 
@@ -116,7 +117,7 @@ class MetaLinkRedirector(ErrorHandlingMethodView):
         # set the correct client IP
         client_ip = request.headers.get('X-Forwarded-For', default=request.remote_addr)
 
-        client_location = {
+        client_location: 'IPDict' = {
             'ip': request.args.get('ip', default=client_ip),
             'fqdn': request.args.get('fqdn', default=None),
             'site': request.args.get('site', default=None),
@@ -274,7 +275,7 @@ class HeaderRedirector(ErrorHandlingMethodView):
         try:
             client_ip = request.headers.get('X-Forwarded-For', default=request.remote_addr)
 
-            client_location = {
+            client_location: 'IPDict' = {
                 'ip': request.args.get('ip', default=client_ip),
                 'fqdn': request.args.get('fqdn', default=None),
                 'site': request.args.get('site', default=None),
@@ -295,7 +296,7 @@ class HeaderRedirector(ErrorHandlingMethodView):
             vo = extract_vo(request.headers)
 
             replicas = list(
-                list_replicas(
+                list_replicas(  # type: ignore (session parameter missing)
                     dids=[{'scope': scope, 'name': name, 'type': 'FILE'}],
                     schemes=schemes,
                     client_location=client_location,
@@ -306,7 +307,7 @@ class HeaderRedirector(ErrorHandlingMethodView):
             selected_url = None
             for r in replicas:
                 if r['rses']:
-                    dictreplica = {}
+                    dictreplica: dict[str, 'ReplicaDict'] = {}
 
                     if rse:
                         if rse in r['rses'] and r['rses'][rse]:

rucio/web/rest/flaskapi/v1/replicas.py

@@ -15,6 +15,7 @@
 from datetime import datetime
 from itertools import chain
 from json import dumps, loads
+from typing import TYPE_CHECKING
 from urllib.parse import parse_qs, unquote
 from xml.sax.saxutils import escape
 
@@ -63,6 +64,9 @@ from rucio.gateway.replica import (
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
 from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parameters, param_get, parse_scope_name, response_headers, try_stream
 
+if TYPE_CHECKING:
+    from rucio.common.types import IPDict
+
 
 def _sorted_with_priorities(replicas, sorted_pfns, limit=None):
     """
@@ -175,7 +179,7 @@ class Replicas(ErrorHandlingMethodView):
           description: The sorting algorithm.
           schema:
             type: string
-            enum: ["geoip", "closeness", "dynamic", "ranking", "random"]
+            enum: ["geoip", "random"]
         - name: limit
           in: query
           description: The maximum number of replicas returned.
@@ -232,7 +236,7 @@ class Replicas(ErrorHandlingMethodView):
         select, limit = None, None
 
         client_ip = request.headers.get('X-Forwarded-For', default=request.remote_addr)
-        client_location = {'ip': client_ip, 'fqdn': None, 'site': None}
+        client_location: 'IPDict' = {'ip': client_ip, 'fqdn': None, 'site': None}
 
         schemes = request.args.get('schemes', default=None)
         select = request.args.get('select', default=None)
@@ -519,12 +523,12 @@ class ListReplicas(ErrorHandlingMethodView):
             type: integer
         - name: select
           in: query
-          description: Requested sorting of the result, e.g., 'geoip', 'closeness', 'dynamic', 'ranking', 'random'.
+          description: Requested sorting of the result, e.g., 'geoip', 'random'.
           schema:
             type: string
         - name: sort
           in: query
-          description: Requested sorting of the result, e.g., 'geoip', 'closeness', 'dynamic', 'ranking', 'random'.
+          description: Requested sorting of the result, e.g., 'geoip', 'random'.
           schema:
             type: string
         requestBody:
@@ -554,7 +558,7 @@ class ListReplicas(ErrorHandlingMethodView):
                     items:
                       type: string
                   sort:
-                    description: Requested sorting of the result, e.g., 'geoip', 'closeness', 'dynamic', 'ranking', 'random'.
+                    description: Requested sorting of the result, e.g., 'geoip', 'random'.
                     type: string
                   unavailable:
                     description: If unavailable rse should be considered.
@@ -659,9 +663,9 @@ class ListReplicas(ErrorHandlingMethodView):
 
         parameters = json_parameters(parse_response)
 
-        client_location = {'ip': client_ip,
-                           'fqdn': None,
-                           'site': None}
+        client_location: 'IPDict' = {'ip': client_ip,
+                                     'fqdn': None,
+                                     'site': None}
         client_location.update(param_get(parameters, 'client_location', default={}))
 
         # making sure IP address is not overwritten

rucio/web/rest/flaskapi/v1/rses.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from json import dumps
+from typing import TYPE_CHECKING
 
 from flask import Flask, Response, jsonify, request
 
@@ -66,6 +67,9 @@ from rucio.rse import rsemanager
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
 from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parameters, param_get, response_headers, try_stream
 
+if TYPE_CHECKING:
+    from rucio.common.types import LFNDict
+
 
 class RSEs(ErrorHandlingMethodView):
     """ List all RSEs in the database. """
@@ -899,7 +903,7 @@ class LFNS2PFNS(ErrorHandlingMethodView):
         if any(filter(lambda info: len(info) != 2, lfns)):
             invalid_lfns = ', '.join(filter(lambda info: len(info) != 2, lfns))
             return generate_http_error_flask(400, InvalidPath.__name__, 'LFN(s) in invalid format: ' + invalid_lfns)
-        lfns = list(map(lambda info: {'scope': info[0], 'name': info[1]}, lfns))
+        lfns_list: list["LFNDict"] = list(map(lambda info: {'scope': info[0], 'name': info[1]}, lfns))
         scheme = request.args.get('scheme', default=None)
         domain = request.args.get('domain', default='wan')
         operation = request.args.get('operation', default='write')
@@ -909,7 +913,7 @@ class LFNS2PFNS(ErrorHandlingMethodView):
         except (RSENotFound, RSEProtocolNotSupported, RSEProtocolDomainNotSupported) as error:
             return generate_http_error_flask(404, error)
 
-        pfns = rsemanager.lfns2pfns(rse_settings, lfns, operation=operation, scheme=scheme, domain=domain)
+        pfns = rsemanager.lfns2pfns(rse_settings, lfns_list, operation=operation, scheme=scheme, domain=domain)
         if not pfns:
             return generate_http_error_flask(404, ReplicaNotFound.__name__, 'No replicas found')
 
@@ -1334,7 +1338,7 @@ class Protocol(ErrorHandlingMethodView):
                 vo=request.environ.get('vo'),
                 scheme=scheme,
                 hostname=hostname,
-                port=port,
+                port=int(port) if port else None,
                 data=parameters,
             )
         except InvalidObject as error:
@@ -1389,7 +1393,14 @@ class Protocol(ErrorHandlingMethodView):
             description: Rse not found or protocol not supported
         """
         try:
-            del_protocols(rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'), scheme=scheme, hostname=hostname, port=port)
+            del_protocols(
+                rse,
+                issuer=request.environ.get('issuer'),
+                vo=request.environ.get('vo'),
+                scheme=scheme,
+                hostname=hostname,
+                port=int(port) if port else None
+            )
         except (RSEProtocolNotSupported, RSENotFound) as error:
             return generate_http_error_flask(404, error)