json-schema-utils 0.8.2__tar.gz → 0.8.4__tar.gz

{json_schema_utils-0.8.2 → json_schema_utils-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json_schema_utils
-Version: 0.8.2
+Version: 0.8.4
 Summary: JSON Schema Utils
 Author: Fabien Coelho, Claire Yannou-Medrala
 License-Expression: CC0-1.0

{json_schema_utils-0.8.2 → json_schema_utils-0.8.4}/json_schema_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json_schema_utils
-Version: 0.8.2
+Version: 0.8.4
 Summary: JSON Schema Utils
 Author: Fabien Coelho, Claire Yannou-Medrala
 License-Expression: CC0-1.0

{json_schema_utils-0.8.2 → json_schema_utils-0.8.4}/jsutils/convert.py

@@ -10,6 +10,18 @@ type JsonPath = list[str|int]
 log = logging.getLogger("convert")
 # log.setLevel(logging.DEBUG)
 
+def tname(v) -> str:
+    return (
+        "null" if v is None else
+        "bool" if isinstance(v, bool) else
+        "int"  if isinstance(v, int) else
+        "number" if isinstance(v, float) else
+        "string" if isinstance(v, str) else
+        "array" if isinstance(v, list) else
+        "object" if isinstance(v, dict) else
+        "UNKNOWN"
+    )
+
 #
 # BEST EFFORT SCHEMA TO MODEL CONVERSION
 #
@@ -820,15 +832,15 @@ def schema2model(schema, path: JsonPath = [],
             if "minProperties" in schema and "maxProperties" in schema and \
                     schema["minProperties"] == schema["maxProperties"]:
                 ival = schema["maxProperties"]
-                assert isinstance(ival, int), f"int # props at [{spath}]"
+                assert isinstance(ival, int), f"int # props at [{spath}] ({tname(ival)})"
             else:
                 if "minProperties" in schema:
                     mini = schema["minProperties"]
-                    assert type(mini) is int, f"int min props at [{spath}]"
+                    assert type(mini) is int, f"int min props at [{spath}] ({tname(mini)})"
                     constraints[">="] = mini
                 if "maxProperties" in schema:
                     maxi = schema["maxProperties"]
-                    assert type(maxi) is int, f"int max props at [{spath}]"
+                    assert type(maxi) is int, f"int max props at [{spath}] ({tname(maxi)})"
                     constraints["<="] = maxi
 
             if "patternProperties" in schema:

{json_schema_utils-0.8.2 → json_schema_utils-0.8.4}/jsutils/scripts.py

@@ -10,8 +10,8 @@ from importlib.metadata import version as pkg_version
 logging.basicConfig()
 
 from .schemas import Schemas
-from .utils import log, JSUError
-from .recurse import hasDirectRef
+from .utils import log, JSUError, JsonSchema
+from .recurse import hasDirectRef, recurseSchema
 from .inline import inlineRefs
 from .simplify import simplifySchema, scopeDefs
 from .stats import json_schema_stats, json_metrics, normalize_ods
@@ -169,7 +169,7 @@ def jsu_check():
     try:
         if args.engine == "jschon":
             import jschon
-            jschon.create_catalog(args.version)
+            jschon.create_catalog(args.draft)
             schema = jschon.JSONSchema(jschema)
 
             def check(data):
@@ -342,9 +342,38 @@ ID2MODEL: dict[str, tuple[str, str]] = {
     "https://spec.openapis.org/oas/3.1/schema/2022-10-07": (
         f"{JM}/openapi-311.model.json",
         f"{JM}/openapi-311.model.json",  # TODO fuzzy
+    ),
+    "sha3:58df1e36909f3f8033f4da3e9a6179f3d3e53c51501d7f14a557e34ecef988e1": (
+        f"{JM}/cypress.model.json",
+        f"{JM}/cypress.model.json",
     )
 }
 
+# generate an id
+def schema2id(schema: JsonSchema) -> str:
+
+    # copy
+    schema = copy.deepcopy(schema)
+
+    # cleanup non essential stuff
+    def nocomment(schema: JsonSchema, _: list[str]) -> bool:
+        if isinstance(schema, dict):
+            for p in ("$comment", "title", "description", "default",
+                      "examples", "readOnly", "writeOnly", "deprecated"):
+                if p in schema:
+                    del schema[p]
+            return True
+        return False
+
+    recurseSchema(schema, "", flt=nocomment)
+
+    # hash serialized json
+    serial = json.dumps(schema, sort_keys=True)
+    shid = "sha3:" + hashlib.sha3_256(serial.encode("UTF-8")).hexdigest()
+
+    log.info(f"schema id: {shid}")
+    return shid
+
 # add ~# versions
 for k in list(ID2MODEL.keys()):
     if k.endswith("/schema"):
@@ -385,7 +414,7 @@ def jsu_model():
             if args.id and isinstance(schema, dict):
                 sid = (schema["$id"] if "$id" in schema else
                        schema["id"] if "id" in schema else
-                       None)
+                       schema2id(schema))
                 if sid in ID2MODEL:
                     log.info(f"using predefined model for {sid}")
                     model = f"${ID2MODEL[sid][0 if args.strict else 1]}"

{json_schema_utils-0.8.2 → json_schema_utils-0.8.4}/pyproject.toml

@@ -8,7 +8,7 @@ exclude = ["tests*"]
 
 [project]
 name = "json_schema_utils"
-version = "0.8.2"
+version = "0.8.4"
 authors = [ { name = "Fabien Coelho" }, { name = "Claire Yannou-Medrala" } ]
 description = "JSON Schema Utils"
 readme = "README.md"