rm openapi-core

Author: pcrespov

services/web/server/src/simcore_service_webserver/rest/_utils.py

@@ -1,12 +1,5 @@
-from functools import lru_cache
 from pathlib import Path
 
-import openapi_core  # type: ignore[import-untyped]
-import yaml
-from openapi_core.schema.specs.models import (  # type: ignore[import-untyped]
-    Spec as OpenApiSpecs,
-)
-
 from .._meta import api_version_prefix
 from .._resources import webserver_resources
 
@@ -17,15 +10,3 @@ def get_openapi_specs_path(api_version_dir: str | None = None) -> Path:
 
     oas_path: Path = webserver_resources.get_path(f"api/{api_version_dir}/openapi.yaml")
     return oas_path
-
-
-@lru_cache  # required to boost tests speed, gains 3.5s per test
-def load_openapi_specs(spec_path: Path | None = None) -> OpenApiSpecs:
-    if spec_path is None:
-        spec_path = get_openapi_specs_path()
-
-    with spec_path.open() as fh:
-        spec_dict = yaml.safe_load(fh)
-    specs: OpenApiSpecs = openapi_core.create_spec(spec_dict, spec_path.as_uri())
-
-    return specs

services/web/server/tests/unit/conftest.py

@@ -8,19 +8,17 @@
 import json
 import sys
 from collections.abc import Callable, Iterable
+from functools import lru_cache
 from pathlib import Path
 from typing import Any
 from unittest.mock import MagicMock
 
+import jsonref
 import pytest
 import yaml
-from openapi_core.schema.specs.models import Spec as OpenApiSpecs
 from pytest_simcore.helpers.dict_tools import ConfigDict
 from pytest_simcore.helpers.webserver_projects import empty_project_data
-from simcore_service_webserver.rest._utils import (
-    get_openapi_specs_path,
-    load_openapi_specs,
-)
+from simcore_service_webserver.rest._utils import get_openapi_specs_path
 
 CURRENT_DIR = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent
 
@@ -83,7 +81,23 @@ def disable_gc_manual_guest_users(mocker):
     )
 
 
+@lru_cache  # ANE: required to boost tests speed, gains 3.5s per test
+def _load_openapi_specs(spec_path: Path | None = None) -> dict:
+    if spec_path is None:
+        spec_path = get_openapi_specs_path()
+
+    with spec_path.open() as fh:
+        spec_dict = yaml.safe_load(fh)
+
+    # SEE https://jsonref.readthedocs.io/en/latest/#lazy-load-and-load-on-repr
+    openapi: dict = jsonref.replace_refs(
+        spec_dict, base_uri=spec_path.as_uri(), lazy_load=True, merge_props=False
+    )
+    return openapi
+
+
 @pytest.fixture
-def openapi_specs(api_version_prefix) -> OpenApiSpecs:
+def openapi_specs(api_version_prefix) -> dict:
+
     spec_path = get_openapi_specs_path(api_version_prefix)
-    return load_openapi_specs(spec_path)
+    return _load_openapi_specs(spec_path)

services/web/server/tests/unit/with_dbs/03/test__openapi_specs.py

@@ -8,7 +8,6 @@
 import pytest
 from aiohttp import web
 from faker import Faker
-from openapi_core.schema.specs.models import Spec as OpenApiSpecs
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_webserver.application import create_application
@@ -61,17 +60,17 @@ def app(app_environment: EnvVarsDict) -> web.Application:
 
 
 @pytest.fixture
-def expected_openapi_entrypoints(openapi_specs: OpenApiSpecs) -> set[Entrypoint]:
+def expected_openapi_entrypoints(openapi_specs: dict) -> set[Entrypoint]:
     entrypoints: set[Entrypoint] = set()
 
     # openapi-specifications, i.e. "contract"
-    for path, path_obj in openapi_specs.paths.items():
-        for operation, operation_obj in path_obj.operations.items():
+    for path, path_obj in openapi_specs["paths"].items():
+        for operation, operation_obj in path_obj.items():
             entrypoints.add(
                 Entrypoint(
                     method=operation.upper(),
                     path=path,
-                    name=operation_obj.operation_id,
+                    name=operation_obj["operationId"],
                 )
             )
     return entrypoints