Move OpenAPI schemas into Python package (#1095)

Co-authored-by: adriangonz <[email protected]>
SeldonIO · Apr 14, 2023 · 0576b7d · 0576b7d
1 parent 9297862
commit 0576b7d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,9 +3,11 @@ SHELL ["/bin/bash", "-l", "-c"]
 
 COPY ./hack/build-wheels.sh ./hack/build-wheels.sh
 COPY ./mlserver ./mlserver
+COPY ./openapi ./openapi
 COPY ./runtimes ./runtimes
 COPY \
     setup.py \
+    MANIFEST.in \
     README.md \
     .
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include openapi/*.json
+include mlserver/rest/openapi/*.json
diff --git a/mlserver/rest/openapi/__init__.py b/mlserver/rest/openapi/__init__.py
@@ -0,0 +1,3 @@
+from .schema import get_openapi_schema, get_model_schema, get_model_schema_uri
+
+__all__ = ["get_openapi_schema", "get_model_schema", "get_model_schema_uri"]
diff --git a/mlserver/rest/openapi/dataplane.json b/mlserver/rest/openapi/dataplane.json
@@ -0,0 +1 @@
+../../../openapi/dataplane.json
diff --git a/mlserver/rest/openapi/model_repository.json b/mlserver/rest/openapi/model_repository.json
@@ -0,0 +1 @@
+../../../openapi/model_repository.json
diff --git a/mlserver/rest/openapi.py → mlserver/rest/openapi/schema.py b/mlserver/rest/openapi.py → mlserver/rest/openapi/schema.py
@@ -4,15 +4,13 @@
 from typing import Optional, Tuple
 from importlib_resources import files
 
-OPENAPI_SCHEMA_RELATIVE_PATH = "../openapi/dataplane.json"
 MODEL_NAME_PARAMETER = "model_name"
 MODEL_VERSION_PARAMETER = "model_version"
 
 
 @lru_cache
 def get_openapi_schema() -> dict:
-    mlserver_package = __package__.split(".")[0]
-    openapi_schema_path = files(mlserver_package).joinpath(OPENAPI_SCHEMA_RELATIVE_PATH)
+    openapi_schema_path = files(__package__).joinpath("dataplane.json")
     return orjson.loads(openapi_schema_path.read_bytes())
 
 

diff --git a/tests/rest/openapi/__init__.py b/tests/rest/openapi/__init__.py
diff --git a/tests/rest/test_openapi.py → tests/rest/openapi/test_schema.py b/tests/rest/test_openapi.py → tests/rest/openapi/test_schema.py
@@ -2,7 +2,7 @@
 
 from typing import Optional
 
-from mlserver.rest.openapi import (
+from mlserver.rest.openapi.schema import (
     get_openapi_schema,
     get_model_schema,
     MODEL_VERSION_PARAMETER,