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

rucio/web/rest/flaskapi/v1/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");
@@ -15,13 +14,11 @@
 
 from flask import Flask, request
 
-from rucio.api.dirac import add_files
-from rucio.common.exception import AccessDenied, DataIdentifierAlreadyExists, DatabaseException, \
-    Duplicate, InvalidPath, ResourceTemporaryUnavailable, RSENotFound, UnsupportedOperation
+from rucio.common.exception import AccessDenied, DatabaseException, DataIdentifierAlreadyExists, Duplicate, InvalidPath, ResourceTemporaryUnavailable, RSENotFound, UnsupportedOperation
 from rucio.common.utils import parse_response
+from rucio.gateway.dirac import add_files
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import response_headers, generate_http_error_flask, \
-    ErrorHandlingMethodView, json_parameters, param_get
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, generate_http_error_flask, json_parameters, param_get, response_headers
 
 
 class AddFiles(ErrorHandlingMethodView):
@@ -54,6 +51,9 @@ class AddFiles(ErrorHandlingMethodView):
                   ignore_availability:
                     description: If the availability should be ignored.
                     type: boolean
+                  parents_metadata:
+                    description: "Metadata for selected hierarchy DIDs."
+                    type: object
         responses:
           201:
             description: OK
@@ -78,10 +78,10 @@ class AddFiles(ErrorHandlingMethodView):
         parameters = json_parameters(parse_response)
         lfns = param_get(parameters, 'lfns')
         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,
-                      vo=request.environ.get('vo'))
+                      parents_metadata=parents_metadata, vo=request.environ.get('vo'))
         except InvalidPath as error:
             return generate_http_error_flask(400, error)
         except AccessDenied as error:

rucio/web/rest/flaskapi/v1/export.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,13 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from flask import Flask, request, Response
+from flask import Flask, Response, request
 
-from rucio.api.exporter import export_data
 from rucio.common.utils import render_json
+from rucio.gateway.exporter import export_data
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import response_headers, check_accept_header_wrapper_flask, \
-    ErrorHandlingMethodView
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, response_headers
 
 
 class Export(ErrorHandlingMethodView):

rucio/web/rest/flaskapi/v1/heartbeats.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,12 +16,11 @@ import json
 
 from flask import Flask, Response, request
 
-from rucio.api.heartbeat import list_heartbeats, create_heartbeat
-from rucio.common.exception import UnsupportedValueType, UnsupportedKeyType, KeyNotFound, AccessDenied
+from rucio.common.exception import AccessDenied, KeyNotFound, UnsupportedKeyType, UnsupportedValueType
 from rucio.common.utils import APIEncoder
+from rucio.gateway.heartbeat import create_heartbeat, list_heartbeats
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import response_headers, check_accept_header_wrapper_flask, \
-    ErrorHandlingMethodView, json_parameters, param_get, generate_http_error_flask
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parameters, param_get, response_headers
 
 
 class Heartbeat(ErrorHandlingMethodView):

rucio/web/rest/flaskapi/v1/identities.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,12 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from flask import Flask, request, jsonify
+from flask import Flask, jsonify, request
 
-from rucio.api.identity import add_identity, add_account_identity, list_accounts_for_identity
+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 response_headers, check_accept_header_wrapper_flask, \
-    ErrorHandlingMethodView
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, response_headers
 
 
 class UserPass(ErrorHandlingMethodView):

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,10 @@
 
 from flask import Flask, request
 
-from rucio.api.importer import import_data
 from rucio.common.utils import parse_response
+from rucio.gateway.importer import import_data
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import response_headers, ErrorHandlingMethodView, json_parameters
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, json_parameters, response_headers
 
 
 class Import(ErrorHandlingMethodView):
@@ -81,7 +80,7 @@ class Import(ErrorHandlingMethodView):
                           description: The email of an account.
                           type: string
                         identities:
-                          description: The identiies accociated with an account. Deletes old identites and adds the newly defined ones.
+                          description: The identities associated with an account. Deletes old identities and adds the newly defined ones.
                           type: array
                           items:
                             description: One identity associated with an account.

rucio/web/rest/flaskapi/v1/lifetime_exceptions.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,13 +16,11 @@ from json import dumps
 
 from flask import Flask, Response, request
 
-from rucio.api.lifetime_exception import list_exceptions, add_exception, update_exception
-from rucio.common.exception import LifetimeExceptionNotFound, UnsupportedOperation, InvalidObject, AccessDenied, \
-    LifetimeExceptionDuplicate
+from rucio.common.exception import AccessDenied, InvalidObject, LifetimeExceptionDuplicate, LifetimeExceptionNotFound, UnsupportedOperation
 from rucio.common.utils import APIEncoder
+from rucio.gateway.lifetime_exception import add_exception, list_exceptions, update_exception
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import response_headers, check_accept_header_wrapper_flask, \
-    try_stream, generate_http_error_flask, ErrorHandlingMethodView, json_parameters, param_get
+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
 
 
 class LifetimeException(ErrorHandlingMethodView):
@@ -63,10 +60,10 @@ class LifetimeException(ErrorHandlingMethodView):
                         type: string
                         enum: ['F', 'D', 'C', 'A', 'X', 'Y', 'Z']
                       account:
-                        description: The account accociated with the lifetime exception.
+                        description: The account associated with the lifetime exception.
                         type: string
                       pattern:
-                        description: The patter of the lifetime exception.
+                        description: The pattern of the lifetime exception.
                         type: string
                       comments:
                         description: The comments of the lifetime exception.
@@ -211,7 +208,7 @@ class LifetimeExceptionId(ErrorHandlingMethodView):
                         description: The account associated with the lifetime exception.
                         type: string
                       pattern:
-                        description: The patter of the lifetime exception.
+                        description: The pattern of the lifetime exception.
                         type: string
                       comments:
                         description: The comments of the lifetime exception.

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,11 @@
 
 from flask import Flask, request
 
-from rucio.api.lock import get_dataset_locks_by_rse, get_dataset_locks, get_dataset_locks_bulk
 from rucio.common.exception import RSENotFound
 from rucio.common.utils import render_json
+from rucio.gateway.lock import get_dataset_locks, get_dataset_locks_bulk, get_dataset_locks_by_rse
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import check_accept_header_wrapper_flask, parse_scope_name, try_stream, \
-    response_headers, generate_http_error_flask, ErrorHandlingMethodView, json_parse
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parse, parse_scope_name, response_headers, try_stream
 
 
 class LockByRSE(ErrorHandlingMethodView):

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +14,7 @@
 # limitations under the License.
 
 import importlib
+import logging
 
 from flask import Flask
 
@@ -37,7 +37,7 @@ DEFAULT_ENDPOINTS = [
     'import',
     'lifetime_exceptions',
     'locks',
-    'meta',
+    'meta_conventions',
     'ping',
     'redirect',
     'replicas',
@@ -51,6 +51,10 @@ DEFAULT_ENDPOINTS = [
 
 def apply_endpoints(app, modules):
     for blueprint_module in modules:
+        # Legacy patch - TODO Remove in 38.0.0
+        if blueprint_module == "meta":
+            logging.log(logging.WARNING, "Endpoint `meta` is depreciated and will be removed in future releases")
+            blueprint_module = "meta_conventions"
         try:
             # searches for module names locally
             blueprint_module = importlib.import_module('.' + blueprint_module,
@@ -60,6 +64,10 @@ def apply_endpoints(app, modules):
 
         if hasattr(blueprint_module, 'blueprint'):
             app.register_blueprint(blueprint_module.blueprint())
+
+            if hasattr(blueprint_module, "blueprint_legacy"):
+                app.register_blueprint(blueprint_module.blueprint_legacy())
+
         else:
             raise ConfigurationError(f'"{blueprint_module}" from the endpoints configuration value did not have a blueprint')
 

rucio/web/rest/flaskapi/v1/{meta.py → 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,17 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from flask import Flask, request, jsonify
+from flask import Flask, jsonify, request
 
-from rucio.api.meta import add_key, add_value, list_keys, list_values
-from rucio.common.exception import Duplicate, InvalidValueForKey, KeyNotFound, UnsupportedValueType, UnsupportedKeyType
+from rucio.common.exception import Duplicate, InvalidValueForKey, KeyNotFound, UnsupportedKeyType, UnsupportedValueType
+from rucio.gateway.meta_conventions import add_key, add_value, list_keys, list_values
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import check_accept_header_wrapper_flask, response_headers, \
-    generate_http_error_flask, ErrorHandlingMethodView, json_parameters, param_get
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parameters, param_get, response_headers
 
 
-class Meta(ErrorHandlingMethodView):
-    """ REST APIs for data identifier attribute keys. """
+class MetaConventions(ErrorHandlingMethodView):
+    """ REST APIs for managing data identifier attribute metadata key formats. """
 
     @check_accept_header_wrapper_flask(['application/json'])
     def get(self):
@@ -39,7 +37,7 @@ class Meta(ErrorHandlingMethodView):
               application/json:
                 schema:
                   type: array
-                  descripton: List of all DID keys.
+                  description: List of all DID keys.
                   items:
                     type: string
                     description: Data Itentifier key
@@ -71,7 +69,7 @@ class Meta(ErrorHandlingMethodView):
                 type: object
                 properties:
                   key_type:
-                    description: The key tpye.
+                    description: The key type.
                     type: string
                   value_type:
                     description: The value type.
@@ -207,9 +205,23 @@ class Values(ErrorHandlingMethodView):
 
 
 def blueprint():
+    bp = AuthenticatedBlueprint('meta_conventions', __name__, url_prefix='/meta_conventions')
+
+    meta_view = MetaConventions.as_view('meta_conventions')
+    bp.add_url_rule('/', view_func=meta_view, methods=['get', ])
+    bp.add_url_rule('/<key>', view_func=meta_view, methods=['post', ])
+    values_view = Values.as_view('values')
+    bp.add_url_rule('/<key>/', view_func=values_view, methods=['get', 'post'])
+
+    bp.after_request(response_headers)
+    return bp
+
+
+def blueprint_legacy():
+    # TODO: Remove in 38.0
     bp = AuthenticatedBlueprint('meta', __name__, url_prefix='/meta')
 
-    meta_view = Meta.as_view('meta')
+    meta_view = MetaConventions.as_view('meta')
     bp.add_url_rule('/', view_func=meta_view, methods=['get', ])
     bp.add_url_rule('/<key>', view_func=meta_view, methods=['post', ])
     values_view = Values.as_view('values')
@@ -222,5 +234,8 @@ def blueprint():
 def make_doc():
     """ Only used for sphinx documentation """
     doc_app = Flask(__name__)
+
     doc_app.register_blueprint(blueprint())
+    doc_app.register_blueprint(blueprint_legacy())
+
     return doc_app

rucio/web/rest/flaskapi/v1/metrics.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,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from flask import Flask, Blueprint
+from flask import Blueprint, Flask
 
 from rucio.core.monitor import generate_prometheus_metrics
 from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,15 +15,16 @@
 import time
 from typing import TYPE_CHECKING
 
-from flask import Flask, Blueprint, request
+from flask import Blueprint, Flask, request
 from werkzeug.datastructures import Headers
 
 from rucio.core.nongrid_trace import trace
-from rucio.web.rest.flaskapi.v1.common import response_headers, ErrorHandlingMethodView, json_parameters
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, json_parameters, response_headers
 
 if TYPE_CHECKING:
     from typing import Optional
-    from rucio.web.rest.flaskapi.v1.common import HeadersType
+
+    from rucio.web.rest.flaskapi.v1.types import HeadersType
 
 
 class XAODTrace(ErrorHandlingMethodView):

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,16 +14,16 @@
 
 from typing import TYPE_CHECKING
 
-from flask import Flask, Blueprint, jsonify, request
+from flask import Blueprint, Flask, jsonify, request
 from werkzeug.datastructures import Headers
 
 from rucio import version
-from rucio.web.rest.flaskapi.v1.common import response_headers, check_accept_header_wrapper_flask, \
-    ErrorHandlingMethodView
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, response_headers
 
 if TYPE_CHECKING:
     from typing import Optional
-    from rucio.web.rest.flaskapi.v1.common import HeadersType
+
+    from rucio.web.rest.flaskapi.v1.types import HeadersType
 
 
 class Ping(ErrorHandlingMethodView):
@@ -69,8 +68,8 @@ class Ping(ErrorHandlingMethodView):
         return response
 
 
-def blueprint(with_doc=False):
-    bp = Blueprint('ping', __name__, url_prefix='/ping')
+def blueprint(standalone=False, with_doc=False):
+    bp = Blueprint('ping', __name__, url_prefix='/' if standalone else '/ping')
 
     ping_view = Ping.as_view('ping')
     if not with_doc:

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,18 +15,18 @@
 import itertools
 from typing import TYPE_CHECKING
 
-from flask import Flask, Blueprint, request, redirect
+from flask import Blueprint, Flask, redirect, request
 from werkzeug.datastructures import Headers
 
-from rucio.api.replica import list_replicas
-from rucio.common.exception import DataIdentifierNotFound, ReplicaNotFound
+from rucio.common.exception import DataIdentifierNotFound, ReplicaNotFound, SortingAlgorithmNotSupported
 from rucio.core.replica_sorter import site_selector, sort_replicas
-from rucio.web.rest.flaskapi.v1.common import check_accept_header_wrapper_flask, parse_scope_name, try_stream, \
-    extract_vo, generate_http_error_flask, ErrorHandlingMethodView
+from rucio.gateway.replica import list_replicas
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, extract_vo, generate_http_error_flask, parse_scope_name, try_stream
 
 if TYPE_CHECKING:
     from typing import Optional
-    from rucio.web.rest.flaskapi.v1.common import HeadersType
+
+    from rucio.web.rest.flaskapi.v1.types import HeadersType
 
 
 class MetaLinkRedirector(ErrorHandlingMethodView):
@@ -179,7 +178,7 @@ class MetaLinkRedirector(ErrorHandlingMethodView):
                 yield '</metalink>\n'
 
             return try_stream(generate(), content_type='application/metalink4+xml')
-        except (DataIdentifierNotFound, ReplicaNotFound) as error:
+        except (DataIdentifierNotFound, ReplicaNotFound, SortingAlgorithmNotSupported) as error:
             return generate_http_error_flask(404, error, headers=headers)
 
 
@@ -342,7 +341,7 @@ class HeaderRedirector(ErrorHandlingMethodView):
                 return response
 
             return 'no redirection possible - file does not exist', 404, headers
-        except ReplicaNotFound as error:
+        except (ReplicaNotFound, SortingAlgorithmNotSupported) as error:
             return generate_http_error_flask(404, error, headers=headers)
 
 

rucio/web/rest/flaskapi/v1/replicas.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");
@@ -21,21 +20,48 @@ from xml.sax.saxutils import escape
 
 from flask import Flask, Response, request
 
-from rucio.api.quarantined_replica import quarantine_file_replicas
-from rucio.api.replica import add_replicas, list_replicas, list_dataset_replicas, list_dataset_replicas_bulk, \
-    delete_replicas, get_did_from_pfns, update_replicas_states, declare_bad_file_replicas, add_bad_dids, add_bad_pfns, \
-    get_suspicious_files, declare_suspicious_file_replicas, list_bad_replicas_status, get_bad_replicas_summary, \
-    list_datasets_per_rse, set_tombstone, list_dataset_replicas_vp
 from rucio.common.config import config_get, config_get_int
 from rucio.common.constants import SUPPORTED_PROTOCOLS
-from rucio.common.exception import AccessDenied, DataIdentifierAlreadyExists, InvalidType, DataIdentifierNotFound, \
-    Duplicate, InvalidPath, ResourceTemporaryUnavailable, RSENotFound, ReplicaNotFound, InvalidObject, ScopeNotFound, ReplicaIsLocked
-from rucio.common.utils import parse_response, APIEncoder, render_json_list
+from rucio.common.exception import (
+    AccessDenied,
+    DataIdentifierAlreadyExists,
+    DataIdentifierNotFound,
+    Duplicate,
+    InvalidObject,
+    InvalidPath,
+    InvalidType,
+    ReplicaIsLocked,
+    ReplicaNotFound,
+    ResourceTemporaryUnavailable,
+    RSENotFound,
+    ScopeNotFound,
+    SortingAlgorithmNotSupported,
+)
+from rucio.common.utils import APIEncoder, parse_response, render_json
 from rucio.core.replica_sorter import sort_replicas
 from rucio.db.sqla.constants import BadFilesStatus
+from rucio.gateway.quarantined_replica import quarantine_file_replicas
+from rucio.gateway.replica import (
+    add_bad_dids,
+    add_bad_pfns,
+    add_replicas,
+    declare_bad_file_replicas,
+    declare_suspicious_file_replicas,
+    delete_replicas,
+    get_bad_replicas_summary,
+    get_did_from_pfns,
+    get_suspicious_files,
+    list_bad_replicas_status,
+    list_dataset_replicas,
+    list_dataset_replicas_bulk,
+    list_dataset_replicas_vp,
+    list_datasets_per_rse,
+    list_replicas,
+    set_tombstone,
+    update_replicas_states,
+)
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import check_accept_header_wrapper_flask, try_stream, parse_scope_name, \
-    response_headers, generate_http_error_flask, ErrorHandlingMethodView, json_parameters, param_get
+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
 
 
 def _sorted_with_priorities(replicas, sorted_pfns, limit=None):
@@ -240,7 +266,7 @@ class Replicas(ErrorHandlingMethodView):
             else:
                 response_generator = _generate_json_response(rfiles)
             return try_stream(response_generator, content_type=content_type)
-        except DataIdentifierNotFound as error:
+        except (DataIdentifierNotFound, SortingAlgorithmNotSupported) as error:
             return generate_http_error_flask(404, error)
 
     def post(self):
@@ -381,7 +407,7 @@ class Replicas(ErrorHandlingMethodView):
                           description: The pfn of the replica.
                           type: string
                         error_message:
-                          description: The error message if an error occured.
+                          description: The error message if an error occurred.
                           type: string
                         broken_rule_id:
                           description: The id of the broken rule if one was found.
@@ -724,10 +750,8 @@ class ListReplicas(ErrorHandlingMethodView):
             else:
                 response_generator = _generate_json_response(rfiles)
             return try_stream(response_generator, content_type=content_type)
-        except InvalidObject as error:
+        except (InvalidObject, DataIdentifierNotFound, SortingAlgorithmNotSupported) as error:
             return generate_http_error_flask(400, error)
-        except DataIdentifierNotFound as error:
-            return generate_http_error_flask(404, error)
 
 
 class ReplicasDIDs(ErrorHandlingMethodView):
@@ -1054,7 +1078,7 @@ class SuspiciousReplicas(ErrorHandlingMethodView):
                 nattempts = int(params['nattempts'][0])
 
         result = get_suspicious_files(rse_expression=rse_expression, younger_than=younger_than, nattempts=nattempts, vo=request.environ.get('vo'))
-        return Response(render_json_list(result), 200, content_type='application/json')
+        return Response(render_json(result), 200, content_type='application/json')
 
 
 class BadReplicasStates(ErrorHandlingMethodView):
@@ -1114,7 +1138,7 @@ class BadReplicasStates(ErrorHandlingMethodView):
                       - type: object
                         properties:
                           scope:
-                            description: The scope fo the replica.
+                            description: The scope of the replica.
                             type: string
                           name:
                             description: The name of the replica.
@@ -1125,7 +1149,7 @@ class BadReplicasStates(ErrorHandlingMethodView):
                       - type: object
                         properties:
                           scope:
-                            description: The scope fo the replica.
+                            description: The scope of the replica.
                             type: string
                           name:
                             description: The name of the replica.