schema_json

Author: pcrespov

api/specs/director/schemas/scripts/create_node-meta-schema.py

@@ -8,14 +8,15 @@
 from pathlib import Path
 
 import jsonref
+from common_library.json_serialization import json_dumps
 from models_library.services import ServiceMetaDataPublished
 
 CURRENT_DIR = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent
 
 
 if __name__ == "__main__":
     with Path.open(CURRENT_DIR.parent / "node-meta-v0.0.1-pydantic.json", "w") as f:
-        schema = ServiceMetaDataPublished.schema_json()
+        schema = json_dumps(ServiceMetaDataPublished.model_json_schema())
         schema_without_ref = jsonref.loads(schema)
 
         json.dump(schema_without_ref, f, indent=2)

api/specs/director/schemas/scripts/create_project-schema.py

@@ -8,6 +8,7 @@
 from pathlib import Path
 
 import jsonref
+from common_library.json_serialization import json_dumps
 from models_library.projects import Project
 
 CURRENT_DIR = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent
@@ -17,7 +18,7 @@
     with Path.open(
         CURRENT_DIR.parent / "common/schemas/project-v0.0.1-pydantic.json", "w"
     ) as f:
-        schema = Project.schema_json()
+        schema = json_dumps(Project.model_json_schema())
         schema_without_ref = jsonref.loads(schema)
 
         json.dump(schema_without_ref, f, indent=2)

packages/models-library/Makefile

@@ -49,13 +49,6 @@ tests-ci: ## runs unit tests [ci-mode]
     -m "not heavy_load" \
 		$(CURDIR)/tests
 
-.PHONY: project-jsonschema.ignore.json
-project-jsonschema.ignore.json: ## creates project-v0.0.1.json for DEV purposes
-	python3 -c "from models_library.projects import Project; print(Project.schema_json(indent=2))" > $@
-
-.PHONY: service-jsonschema.ignore.json
-node-meta-jsonschema.ignore.json: ## creates node-meta-v0.0.1.json for DEV purposes
-	python3 -c "from models_library.services import ServiceDockerData as cls; print(cls.schema_json(indent=2))" > $@
 
 DOCKER_API_VERSION ?= 1.41
 .PHONY: docker_rest_api.py

packages/models-library/tests/test__models_fit_schemas.py

@@ -2,10 +2,10 @@
 # pylint:disable=unused-argument
 # pylint:disable=redefined-outer-name
 # pylint:disable=protected-access
-import json
 from collections.abc import Callable
 
 import pytest
+from common_library.json_serialization import json_loads
 from models_library.projects import Project
 from models_library.services import ServiceMetaDataPublished
 from pydantic.main import BaseModel
@@ -28,7 +28,7 @@ def test_generated_schema_same_as_original(
     # TODO: create instead a fixture that returns a Callable and do these checks
     # on separate test_* files that follow the same package submodule's hierarchy
     #
-    generated_schema = json.loads(pydantic_model.schema_json(indent=2))
+    generated_schema = json_loads(pydantic_model.model_json_schema(), indent=2)
     original_schema = json_schema_dict(original_json_schema)
 
     # NOTE: A change is considered an addition when the destination schema has become more permissive relative to the source schema. For example {"type": "string"} -> {"type": ["string", "number"]}.

packages/models-library/tests/test_service_settings_labels.py

@@ -8,6 +8,7 @@
 from pprint import pformat
 from typing import Any, Final, NamedTuple
 
+import pydantic_core
 import pytest
 from models_library.basic_types import PortInt
 from models_library.osparc_variable_identifier import (
@@ -32,7 +33,6 @@
 from models_library.services_resources import DEFAULT_SINGLE_SERVICE_NAME
 from models_library.utils.string_substitution import TextTemplate
 from pydantic import BaseModel, TypeAdapter, ValidationError
-from pydantic.json import pydantic_encoder
 
 
 class _Parametrization(NamedTuple):
@@ -560,7 +560,7 @@ def test_can_parse_labels_with_osparc_identifiers(
 
 def servicelib__json_serialization__json_dumps(obj: Any, **kwargs):
     # Analogous to 'models_library.utils.json_serialization.json_dumps'
-    return json.dumps(obj, default=pydantic_encoder, **kwargs)
+    return json.dumps(obj, default=pydantic_core.to_jsonable_python, **kwargs)
 
 
 def test_resolving_some_service_labels_at_load_time(

packages/models-library/tests/test_services_io.py

@@ -5,6 +5,7 @@
 from pathlib import Path
 
 import yaml
+from common_library.json_serialization import json_dumps
 from models_library.services import ServiceInput, ServiceMetaDataPublished
 from pint import Unit, UnitRegistry
 
@@ -13,7 +14,7 @@ def test_service_port_units(tests_data_dir: Path):
     ureg = UnitRegistry()
 
     data = yaml.safe_load((tests_data_dir / "metadata-sleeper-2.0.2.yaml").read_text())
-    print(ServiceMetaDataPublished.schema_json(indent=2))
+    print(json_dumps(ServiceMetaDataPublished.model_json_schema(), indent=2))
 
     service_meta = ServiceMetaDataPublished.model_validate(data)
     assert service_meta.inputs

packages/pytest-simcore/src/pytest_simcore/helpers/faker_catalog.py

@@ -32,7 +32,6 @@ def create_service_out2(**overrides):
     # https://github.com/ITISFoundation/osparc-simcore/blob/master/services/catalog/src/simcore_service_catalog/models/schemas/services.py
     #
     # docker exec -it $(docker ps --filter="ancestor=local/catalog:development" -q)
-    # python -c "from simcore_service_catalog.models.schemas.services import ServiceOut;print(ServiceOut.schema_json(indent=2))" > services/catalog/ignore-schema.json
     # put file in https://json-schema-faker.js.org/ and get fake output
     #