rucio 37.2.0__py3-none-any.whl → 37.4.0__py3-none-any.whl

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

@@ -150,7 +150,7 @@ class Scope(ErrorHandlingMethodView):
                 generate(
                     name=request.args.get('name', default=None),
                     recursive=recursive,
-                    vo=request.environ.get('vo')
+                    vo=request.environ['vo']
                 )
             )
         except DataIdentifierNotFound as error:
@@ -268,15 +268,15 @@ class Search(ErrorHandlingMethodView):
                     filters[arg] = value
             filters = [filters]
 
-        did_type = request.args.get('type', default=None)
-        limit = request.args.get('limit', default=None)
+        did_type = request.args.get('type', default='collection')
+        limit = request.args.get('limit', type=int, default=None)
         long = request.args.get('long', type=['True', '1'].__contains__, default=False)
         recursive = request.args.get('recursive', type='True'.__eq__, default=False)
         try:
             def generate(vo):
                 for did in list_dids(scope=scope, filters=filters, did_type=did_type, limit=limit, long=long, recursive=recursive, vo=vo):
                     yield dumps(did) + '\n'
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except UnsupportedOperation as error:
             return generate_http_error_flask(409, error)
         except KeyNotFound as error:
@@ -339,7 +339,7 @@ class BulkDIDS(ErrorHandlingMethodView):
         """
         dids = json_list()
         try:
-            add_dids(dids=dids, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            add_dids(dids=dids, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
         except (DuplicateContent, DataIdentifierAlreadyExists, UnsupportedOperation) as error:
@@ -462,7 +462,7 @@ class Attachments(ErrorHandlingMethodView):
             return generate_http_error_flask(406, exc="Invalid attachment format.")
 
         try:
-            attach_dids_to_dids(attachments=attachments, ignore_duplicate=ignore_duplicate, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            attach_dids_to_dids(attachments=attachments, ignore_duplicate=ignore_duplicate, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
         except (DuplicateContent, DataIdentifierAlreadyExists, UnsupportedOperation, FileAlreadyExists) as error:
@@ -577,7 +577,7 @@ class DIDs(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
             dynamic_depth = None
             if 'dynamic_depth' in request.args:
                 orig = request.args['dynamic_depth'].upper()
@@ -589,7 +589,7 @@ class DIDs(ErrorHandlingMethodView):
                     dynamic_depth = None
             elif 'dynamic' in request.args:
                 dynamic_depth = DIDType.FILE
-            did = get_did(scope=scope, name=name, dynamic_depth=dynamic_depth, vo=request.environ.get('vo'))
+            did = get_did(scope=scope, name=name, dynamic_depth=dynamic_depth, vo=request.environ['vo'])
             return Response(render_json(**did), content_type='application/json')
         except ValueError as error:
             return generate_http_error_flask(400, error)
@@ -668,7 +668,7 @@ class DIDs(ErrorHandlingMethodView):
             description: Did already exists
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -686,8 +686,8 @@ class DIDs(ErrorHandlingMethodView):
                 lifetime=param_get(parameters, 'lifetime', default=None),
                 dids=param_get(parameters, 'dids', default=[]),
                 rse=param_get(parameters, 'rse', default=None),
-                issuer=request.environ.get('issuer'),
-                vo=request.environ.get('vo'),
+                issuer=request.environ['issuer'],
+                vo=request.environ['vo'],
             )
         except (InvalidObject, InvalidPath) as error:
             return generate_http_error_flask(400, error)
@@ -743,14 +743,14 @@ class DIDs(ErrorHandlingMethodView):
             description: Wrong status
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
         parameters = json_parameters()
 
         try:
-            set_status(scope=scope, name=name, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'), **parameters)
+            set_status(scope=scope, name=name, issuer=request.environ['issuer'], vo=request.environ['vo'], **parameters)
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
         except (UnsupportedStatus, UnsupportedOperation) as error:
@@ -822,13 +822,13 @@ class Attachment(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
 
             def generate(vo):
                 for did in list_content(scope=scope, name=name, vo=vo):
                     yield render_json(**did) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except ValueError as error:
             return generate_http_error_flask(400, error)
         except DataIdentifierNotFound as error:
@@ -893,14 +893,14 @@ class Attachment(ErrorHandlingMethodView):
             description: Already attached
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
         attachments = json_parameters()
 
         try:
-            attach_dids(scope=scope, name=name, attachment=attachments, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            attach_dids(scope=scope, name=name, attachment=attachments, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except InvalidPath as error:
             return generate_http_error_flask(400, error)
         except (DataIdentifierNotFound, RSENotFound) as error:
@@ -955,7 +955,7 @@ class Attachment(ErrorHandlingMethodView):
             description: Did not found
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -963,7 +963,7 @@ class Attachment(ErrorHandlingMethodView):
         dids = param_get(parameters, 'dids')
 
         try:
-            detach_dids(scope=scope, name=name, dids=dids, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            detach_dids(scope=scope, name=name, dids=dids, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except UnsupportedOperation as error:
             return generate_http_error_flask(409, error)
         except DataIdentifierNotFound as error:
@@ -1038,13 +1038,13 @@ class AttachmentHistory(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
 
             def generate(vo):
                 for did in list_content_history(scope=scope, name=name, vo=vo):
                     yield render_json(**did) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except ValueError as error:
             return generate_http_error_flask(400, error)
         except DataIdentifierNotFound as error:
@@ -1140,13 +1140,13 @@ class Files(ErrorHandlingMethodView):
         long = 'long' in request.args
 
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
 
             def generate(vo):
                 for file in list_files(scope=scope, name=name, long=long, vo=vo):
                     yield dumps(file) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except ValueError as error:
             return generate_http_error_flask(400, error)
         except DataIdentifierNotFound as error:
@@ -1227,7 +1227,7 @@ class BulkFiles(ErrorHandlingMethodView):
                 for did in bulk_list_files(dids=dids, vo=vo):
                     yield render_json(**did) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         return 'Created', 201
@@ -1279,13 +1279,13 @@ class Parents(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
 
             def generate(vo):
                 for dataset in list_parent_dids(scope=scope, name=name, vo=vo):
                     yield render_json(**dataset) + "\n"
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except ValueError as error:
             return generate_http_error_flask(400, error)
         except DataIdentifierNotFound as error:
@@ -1333,13 +1333,13 @@ class Meta(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
         try:
             plugin = request.args.get('plugin', default='DID_COLUMN')
-            meta = get_metadata(scope=scope, name=name, plugin=plugin, vo=request.environ.get('vo'))
+            meta = get_metadata(scope=scope, name=name, plugin=plugin, vo=request.environ['vo'])
             return Response(render_json(**meta), content_type='application/json')
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
@@ -1391,7 +1391,7 @@ class Meta(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -1403,9 +1403,9 @@ class Meta(ErrorHandlingMethodView):
                 scope=scope,
                 name=name,
                 meta=meta,
-                issuer=request.environ.get('issuer'),
+                issuer=request.environ['issuer'],
                 recursive=param_get(parameters, 'recursive', default=False),
-                vo=request.environ.get('vo'),
+                vo=request.environ['vo'],
             )
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
@@ -1450,7 +1450,7 @@ class Meta(ErrorHandlingMethodView):
             description: Feature is not in current database.
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -1460,7 +1460,7 @@ class Meta(ErrorHandlingMethodView):
             return generate_http_error_flask(404, KeyNotFound.__name__, 'No key provided to remove')
 
         try:
-            delete_metadata(scope=scope, name=name, key=key, vo=request.environ.get('vo'))
+            delete_metadata(scope=scope, name=name, key=key, vo=request.environ['vo'])
         except (KeyNotFound, DataIdentifierNotFound) as error:
             return generate_http_error_flask(404, error)
         except NotImplementedError as error:
@@ -1521,7 +1521,7 @@ class SingleMeta(ErrorHandlingMethodView):
             description: Invalid key or value
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -1534,9 +1534,9 @@ class SingleMeta(ErrorHandlingMethodView):
                 name=name,
                 key=key,
                 value=value,
-                issuer=request.environ.get('issuer'),
+                issuer=request.environ['issuer'],
                 recursive=param_get(parameters, 'recursive', default=False),
-                vo=request.environ.get('vo'),
+                vo=request.environ['vo'],
             )
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
@@ -1602,7 +1602,7 @@ class BulkDIDsMeta(ErrorHandlingMethodView):
         dids = param_get(parameters, 'dids')
 
         try:
-            set_dids_metadata_bulk(dids=dids, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            set_dids_metadata_bulk(dids=dids, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
         except UnsupportedOperation as error:
@@ -1649,14 +1649,14 @@ class Rules(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
 
             def generate(vo):
                 get_did(scope=scope, name=name, vo=vo)
                 for rule in list_replication_rules({'scope': scope, 'name': name}, vo=vo):
                     yield dumps(rule, cls=APIEncoder) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except ValueError as error:
             return generate_http_error_flask(400, error)
         except RuleNotFound as error:
@@ -1734,7 +1734,7 @@ class BulkMeta(ErrorHandlingMethodView):
                 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')))
+            return try_stream(generate(vo=request.environ['vo']))
         except ValueError as error:
             return generate_http_error_flask(400, error, 'Cannot decode json parameter list')
         except DataIdentifierNotFound as error:
@@ -1799,13 +1799,13 @@ class AssociatedRules(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
 
             def generate(vo):
                 for rule in list_associated_replication_rules_for_file(scope=scope, name=name, vo=vo):
                     yield dumps(rule, cls=APIEncoder) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except ValueError as error:
             return generate_http_error_flask(400, error)
         except DataIdentifierNotFound as error:
@@ -1859,7 +1859,7 @@ class GUIDLookup(ErrorHandlingMethodView):
                 for dataset in get_dataset_by_guid(guid, vo=vo):
                     yield dumps(dataset, cls=APIEncoder) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -1927,9 +1927,9 @@ class SampleLegacy(ErrorHandlingMethodView):
                 input_name=input_name,
                 output_scope=output_scope,
                 output_name=output_name,
-                issuer=request.environ.get('issuer'),
+                issuer=request.environ['issuer'],
                 nbfiles=nbfiles,
-                vo=request.environ.get('vo'),
+                vo=request.environ['vo'],
             )
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
@@ -2002,9 +2002,9 @@ class Sample(ErrorHandlingMethodView):
                 input_name=parameters['input_name'],
                 output_scope=parameters['output_scope'],
                 output_name=parameters['output_name'],
-                issuer=request.environ.get('issuer'),
+                issuer=request.environ['issuer'],
                 nbfiles=parameters['nbfiles'],
-                vo=request.environ.get('vo'),
+                vo=request.environ['vo'],
             )
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
@@ -2065,7 +2065,7 @@ class NewDIDs(ErrorHandlingMethodView):
 
         type_param = request.args.get('type', default=None)
 
-        return try_stream(generate(_type=type_param, vo=request.environ.get('vo')))
+        return try_stream(generate(_type=type_param, vo=request.environ['vo']))
 
 
 class Resurrect(ErrorHandlingMethodView):
@@ -2113,7 +2113,7 @@ class Resurrect(ErrorHandlingMethodView):
         dids = json_list()
 
         try:
-            resurrect(dids=dids, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            resurrect(dids=dids, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
         except (DuplicateContent, DataIdentifierAlreadyExists, UnsupportedOperation) as error:
@@ -2165,13 +2165,13 @@ class Follow(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
 
             def generate(vo):
                 for user in get_users_following_did(scope=scope, name=name, vo=vo):
                     yield render_json(**user) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')), content_type='application/json')
+            return try_stream(generate(vo=request.environ['vo']), content_type='application/json')
         except ValueError as error:
             return generate_http_error_flask(400, error)
         except DataIdentifierNotFound as error:
@@ -2215,7 +2215,7 @@ class Follow(ErrorHandlingMethodView):
             description: Internal error
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -2223,7 +2223,7 @@ class Follow(ErrorHandlingMethodView):
         account = param_get(parameters, 'account')
 
         try:
-            add_did_to_followed(scope=scope, name=name, account=account, vo=request.environ.get('vo'))
+            add_did_to_followed(scope=scope, name=name, account=account, vo=request.environ['vo'])
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
         except AccessDenied as error:
@@ -2265,7 +2265,7 @@ class Follow(ErrorHandlingMethodView):
             description: Internal error
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -2273,7 +2273,7 @@ class Follow(ErrorHandlingMethodView):
         account = param_get(parameters, 'account')
 
         try:
-            remove_did_from_followed(scope=scope, name=name, account=account, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            remove_did_from_followed(scope=scope, name=name, account=account, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
 

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

@@ -80,8 +80,8 @@ class AddFiles(ErrorHandlingMethodView):
         ignore_availability = param_get(parameters, 'ignore_availability', default=False)
         parents_metadata = param_get(parameters, 'parents_metadata', default=None)
         try:
-            add_files(lfns=lfns, issuer=request.environ.get('issuer'), ignore_availability=ignore_availability,
-                      parents_metadata=parents_metadata, vo=request.environ.get('vo'))
+            add_files(lfns=lfns, issuer=request.environ['issuer'], ignore_availability=ignore_availability,
+                      parents_metadata=parents_metadata, vo=request.environ['vo'])
         except InvalidPath as error:
             return generate_http_error_flask(400, error)
         except AccessDenied as error:

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

@@ -52,7 +52,7 @@ class Export(ErrorHandlingMethodView):
             description: Not acceptable
         """
         distance = request.args.get('distance', default='True') == 'True'
-        return Response(render_json(**export_data(issuer=request.environ.get('issuer'), distance=distance, vo=request.environ.get('vo'))), content_type='application/json')
+        return Response(render_json(**export_data(issuer=request.environ['issuer'], distance=distance, vo=request.environ['vo'])), content_type='application/json')
 
 
 def blueprint(with_doc=False):

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

@@ -108,7 +108,7 @@ class Import(ErrorHandlingMethodView):
             description: Invalid Auth Token
         """
         data = json_parameters(parse_response)
-        import_data(data=data, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+        import_data(data=data, issuer=request.environ['issuer'], vo=request.environ['vo'])
         return 'Created', 201
 
 

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

@@ -90,7 +90,7 @@ class LifetimeException(ErrorHandlingMethodView):
                 for exception in list_exceptions(vo=vo):
                     yield dumps(exception, cls=APIEncoder) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except LifetimeExceptionNotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -145,8 +145,8 @@ class LifetimeException(ErrorHandlingMethodView):
         try:
             exception_id = add_exception(
                 dids=param_get(parameters, 'dids', default=[]),
-                account=request.environ.get('issuer'),
-                vo=request.environ.get('vo'),
+                account=request.environ['issuer'],
+                vo=request.environ['vo'],
                 pattern=param_get(parameters, 'pattern', default=None),
                 comments=param_get(parameters, 'comments', default=None),
                 expires_at=param_get(parameters, 'expires_at', default=None),
@@ -235,7 +235,7 @@ class LifetimeExceptionId(ErrorHandlingMethodView):
                 for exception in list_exceptions(exception_id, vo=vo):
                     yield dumps(exception, cls=APIEncoder) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except LifetimeExceptionNotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -282,7 +282,7 @@ class LifetimeExceptionId(ErrorHandlingMethodView):
         state = param_get(parameters, 'state', default=None)
 
         try:
-            update_exception(exception_id=exception_id, state=state, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            update_exception(exception_id=exception_id, state=state, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except UnsupportedOperation as error:
             return generate_http_error_flask(400, error)
         except AccessDenied as error:

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

@@ -113,7 +113,7 @@ class LockByRSE(ErrorHandlingMethodView):
                 for lock in get_dataset_locks_by_rse(rse, vo=vo):
                     yield render_json(**lock) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except RSENotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -206,13 +206,13 @@ class LocksByScopeName(ErrorHandlingMethodView):
             return 'Wrong did_type specified', 500
 
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
 
             def generate(vo):
                 for lock in get_dataset_locks(scope, name, vo=vo):
                     yield render_json(**lock) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -321,7 +321,7 @@ class DatasetLocksForDids(ErrorHandlingMethodView):
             dids = data["dids"]
         except KeyError:
             return 'Can not find the list of DIDs in the data. Use "dids" keyword.', 400
-        vo = request.environ.get('vo')
+        vo = request.environ['vo']
         try:
             locks = get_dataset_locks_bulk(dids, vo)        # removes duplicates
 

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

@@ -15,15 +15,19 @@
 
 import importlib
 import logging
+from typing import TYPE_CHECKING
 
 from flask import Flask
 
-from rucio.common.config import config_get
+from rucio.common.config import config_get_list
 from rucio.common.exception import ConfigurationError
 from rucio.common.logging import setup_logging
 from rucio.web.rest.flaskapi.v1.common import CORSMiddleware
 
-DEFAULT_ENDPOINTS = [
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+DEFAULT_ENDPOINTS = {
     'accountlimits',
     'accounts',
     'auth',
@@ -46,10 +50,10 @@ DEFAULT_ENDPOINTS = [
     'rules',
     'scopes',
     'subscriptions',
-]
+}
 
 
-def apply_endpoints(app, modules):
+def apply_endpoints(app: Flask, modules: "Iterable[str]") -> None:
     for blueprint_module in modules:
         # Legacy patch - TODO Remove in 38.0.0
         if blueprint_module == "meta":
@@ -71,15 +75,18 @@ def apply_endpoints(app, modules):
         else:
             raise ConfigurationError(f'"{blueprint_module}" from the endpoints configuration value did not have a blueprint')
 
+endpoints = set(config_get_list('api', 'endpoints', raise_exception=False, default=[]))
+endpoints_add = set(config_get_list('api', 'endpoints_add', raise_exception=False, default=[]))
+endpoints_remove = set(config_get_list('api', 'endpoints_remove', raise_exception=False, default=[]))
+
+if endpoints and (endpoints_add or endpoints_remove):
+    raise ConfigurationError("Endpoints cannot be set in both 'endpoints' and 'endpoints_add'/'endpoints_remove'")
 
-try:
-    endpoints = config_get('api', 'endpoints', raise_exception=False, default='')
-    endpoints = list(filter(bool, map(str.strip, endpoints.split(sep=','))))
-except RuntimeError:
-    endpoints = None
+if endpoints_add.intersection(endpoints_remove):
+    raise ConfigurationError("Endpoints cannot be in both 'endpoints_add' and 'endpoints_remove'")
 
 if not endpoints:
-    endpoints = DEFAULT_ENDPOINTS
+    endpoints = DEFAULT_ENDPOINTS - endpoints_remove | endpoints_add
 
 application = Flask(__name__)
 application.wsgi_app = CORSMiddleware(application.wsgi_app)

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

@@ -296,7 +296,7 @@ class HeaderRedirector(ErrorHandlingMethodView):
             vo = extract_vo(request.headers)
 
             replicas = list(
-                list_replicas(  # type: ignore (session parameter missing)
+                list_replicas(
                     dids=[{'scope': scope, 'name': name, 'type': 'FILE'}],
                     schemes=schemes,
                     client_location=client_location,