Def updates

reactivated/__init__.py

@@ -82,7 +82,7 @@ def run_generations(skip_cache: bool = False) -> None:
         generate_callback()
 
     from .apps import generate_schema
-    # generate_schema()
+    generate_schema()
 
 
 def get_free_port() -> int:
@@ -458,7 +458,7 @@ def create_schema(Type: Any, definitions: Dict[Any, Any], ref: bool = True) -> A
                 return definition
             definitions[definition_name] = definition
 
-        return {"$ref": f"#/definitions/{definition_name}"}
+        return {"$ref": f"#/$defs/{definition_name}"}
     elif issubclass(Type, django_forms.formsets.BaseFormSet):
         form_set_schema = create_schema(FormSetType, definitions, ref=False)
         form_schema = create_schema(Type.form, definitions)
@@ -505,7 +505,7 @@ class ManagementForm(django_forms.formsets.ManagementForm):
         definitions[definition_name] = {
             "title": Type.__name__,
             "allOf": [
-                {"$ref": "#/definitions/Form"},
+                {"$ref": "#/$defs/Form"},
                 {
                     "type": "object",
                     "properties": {
@@ -532,7 +532,7 @@ class ManagementForm(django_forms.formsets.ManagementForm):
             ],
         }
 
-        return {"$ref": f"#/definitions/{definition_name}"}
+        return {"$ref": f"#/$defs/{definition_name}"}
 
     elif issubclass(Type, BasePickHolder):
         return Type.get_json_schema()

reactivated/apps.py

@@ -103,7 +103,7 @@ def get_types_schema() -> Any:
     definitions_registry.update(definitions)
 
     return {
-        "definitions": definitions,
+        "$defs": definitions,
         **{
             **definitions["reactivated.apps.ParentTuple"],
             "properties": {

reactivated/pick.py

@@ -292,7 +292,7 @@ def get_json_schema(cls: Type[BasePickHolder], definitions: Definitions) -> Thin
         explicit_name = cls.get_name()
 
         definition_name = explicit_name or cls.get_auto_name()
-        ref = {"$ref": f"#/definitions/{definition_name}"}
+        ref = {"$ref": f"#/$defs/{definition_name}"}
 
         if definition_name in definitions:
             return Thing(schema=ref, definitions=definitions)

reactivated/serialization/__init__.py

@@ -276,7 +276,7 @@ def get_json_schema(
 
         if definition_name in definitions:
             return Thing(
-                schema={"$ref": f"#/definitions/{definition_name}"},
+                schema={"$ref": f"#/$defs/{definition_name}"},
                 definitions=definitions,
             )
         error_definition = create_schema(FormError, definitions).schema
@@ -333,7 +333,7 @@ def get_json_schema(
         }
 
         return Thing(
-            schema={"$ref": f"#/definitions/{definition_name}"}, definitions=definitions
+            schema={"$ref": f"#/$defs/{definition_name}"}, definitions=definitions
         )
 
     @classmethod
@@ -418,7 +418,7 @@ def get_json_schema(
 
         if definition_name in definitions:
             return Thing(
-                schema={"$ref": f"#/definitions/{definition_name}"},
+                schema={"$ref": f"#/$defs/{definition_name}"},
                 definitions=definitions,
             )
 
@@ -488,7 +488,7 @@ class ManagementForm(django_forms.formsets.ManagementForm):
         }
 
         return Thing(
-            schema={"$ref": f"#/definitions/{definition_name}"}, definitions=definitions
+            schema={"$ref": f"#/$defs/{definition_name}"}, definitions=definitions
         )
 
     @classmethod
@@ -862,7 +862,7 @@ def enum_type_schema(Type: Type[enum.Enum], definitions: Definitions) -> Thing:
 
     if definition_name in definitions:
         return Thing(
-            schema={"$ref": f"#/definitions/{definition_name}"}, definitions=definitions
+            schema={"$ref": f"#/$defs/{definition_name}"}, definitions=definitions
         )
 
     required = []
@@ -880,7 +880,7 @@ def enum_type_schema(Type: Type[enum.Enum], definitions: Definitions) -> Thing:
         }
 
     return Thing(
-        schema={"$ref": f"#/definitions/{definition_name}"},
+        schema={"$ref": f"#/$defs/{definition_name}"},
         definitions={
             **definitions,
             definition_name: {
@@ -909,7 +909,7 @@ def enum_schema(Type: Type[enum.Enum], definitions: Definitions) -> Thing:
     definition_name = f"{Type.__module__}.{Type.__qualname__}"
 
     return Thing(
-        schema={"$ref": f"#/definitions/{definition_name}"},
+        schema={"$ref": f"#/$defs/{definition_name}"},
         definitions={
             **definitions,
             definition_name: {
@@ -940,7 +940,7 @@ def named_tuple_schema(
 
     if definition_name in definitions:
         return Thing(
-            schema={"$ref": f"#/definitions/{definition_name}"}, definitions=definitions
+            schema={"$ref": f"#/$defs/{definition_name}"}, definitions=definitions
         )
 
     required = []
@@ -975,7 +975,7 @@ def named_tuple_schema(
             properties[field_name] = field_schema.schema
 
     return Thing(
-        schema={"$ref": f"#/definitions/{definition_name}"},
+        schema={"$ref": f"#/$defs/{definition_name}"},
         definitions={
             **definitions,
             definition_name: {
@@ -1156,7 +1156,7 @@ def serialize(
         )
     elif "$ref" in schema.schema:
         dereferenced_schema = schema.definitions[
-            schema.schema["$ref"].replace("#/definitions/", "")
+            schema.schema["$ref"].replace("#/$defs/", "")
         ]
 
         return serialize(

reactivated/serialization/registry.py

@@ -68,7 +68,7 @@ def dereference(self) -> Schema:
         if not ref:
             return self.schema
 
-        return self.definitions[ref.replace("#/definitions/", "")]
+        return self.definitions[ref.replace("#/$defs/", "")]
 
     def add_property(
         self, name: str, property_schema: PropertySchema, *, optional: bool = False
@@ -78,7 +78,7 @@ def add_property(
         if ref is None:
             assert False, "Can only add properties to ref schemas"
 
-        definition_name = ref.replace("#/definitions/", "")
+        definition_name = ref.replace("#/$defs/", "")
         dereferenced = self.definitions[definition_name]
 
         # In case we are replacing a property.

reactivated/serialization/widgets.py

@@ -79,7 +79,7 @@ def get_json_schema(
 
         if definition_name in definitions:
             return Thing(
-                schema={"$ref": f"#/definitions/{definition_name}"},
+                schema={"$ref": f"#/$defs/{definition_name}"},
                 definitions=definitions,
             )