Clean up openapi compat and warnings (#368)

Author: blink1073

jupyterlab_server/spec.py

@@ -14,10 +14,10 @@
 
 def get_openapi_spec() -> "Spec":
     """Get the OpenAPI spec object."""
-    from openapi_core.spec.shortcuts import create_spec
+    from openapi_core.spec.paths import Spec
 
     openapi_spec_dict = get_openapi_spec_dict()
-    return create_spec(openapi_spec_dict)
+    return Spec.from_dict(openapi_spec_dict)
 
 
 def get_openapi_spec_dict():

jupyterlab_server/test_utils.py

@@ -12,10 +12,15 @@
 
 import tornado.httpclient
 import tornado.web
+
+try:
+    from openapi_core import V30RequestValidator, V30ResponseValidator  # type:ignore[attr-defined]
+except ImportError:
+    V30RequestValidator = None
+    V30ResponseValidator = None
+    from openapi_core import openapi_request_validator, openapi_response_validator
 from openapi_core.spec.paths import Spec
-from openapi_core.validation.request import openapi_request_validator
 from openapi_core.validation.request.datatypes import RequestParameters
-from openapi_core.validation.response import openapi_response_validator
 from tornado.httpclient import HTTPRequest, HTTPResponse
 from werkzeug.datastructures import Headers, ImmutableMultiDict
 
@@ -95,6 +100,8 @@ def method(self) -> str:
 
     @property
     def body(self) -> Optional[str]:
+        if self.request.body is None:
+            return None
         if not isinstance(self.request.body, bytes):
             raise AssertionError('Request body is invalid')
         return self.request.body.decode("utf-8")
@@ -142,11 +149,17 @@ def validate_request(response):
     openapi_spec = get_openapi_spec()
 
     request = TornadoOpenAPIRequest(response.request, openapi_spec)
-    result = openapi_request_validator.validate(openapi_spec, request)
+    if V30RequestValidator:
+        result = V30RequestValidator(openapi_spec).validate(request)
+    else:
+        result = openapi_request_validator.validate(openapi_spec, request)
     result.raise_for_errors()
 
     response = TornadoOpenAPIResponse(response)
-    result2 = openapi_response_validator.validate(openapi_spec, request, response)
+    if V30ResponseValidator:
+        result2 = V30ResponseValidator(openapi_spec).validate(request, response)
+    else:
+        result2 = openapi_response_validator.validate(openapi_spec, request, response)
     result2.raise_for_errors()
 
 

pyproject.toml

@@ -143,12 +143,10 @@ timeout = 300
 # timeout_method = "thread"
 filterwarnings = [
   "error",
-  "module:make_current is deprecated:DeprecationWarning",
-  "module:clear_current is deprecated:DeprecationWarning",
-  "module:There is no current event loop:DeprecationWarning",
   "ignore:ServerApp.preferred_dir config is deprecated:FutureWarning",
-  "ignore:Passing a schema to Validator.iter_errors:DeprecationWarning",
-  "module:Subclassing validator classes is not intended to be part of their public API:DeprecationWarning"
+  # From openapi_schema_validator
+  "module:write property is deprecated:DeprecationWarning",
+  "module:read property is deprecated:DeprecationWarning",
 ]
 
 [tool.coverage.report]

tests/test_process.py

@@ -33,7 +33,7 @@ async def test_watch_helper():
     helper.wait()
 
 
-async def test_process_app():
+def test_process_app():
     class TestApp(ProcessApp):
         name = "tests"