changed jsonschema directory name back

src/event_model/__init__.py

@@ -1825,18 +1825,18 @@ class MismatchedDataKeys(InvalidData):
 
 SCHEMA_PATH = "schemas"
 SCHEMA_NAMES = {
-    DocumentNames.start: "jsonschemas/run_start.json",
-    DocumentNames.stop: "jsonschemas/run_stop.json",
-    DocumentNames.event: "jsonschemas/event.json",
-    DocumentNames.event_page: "jsonschemas/event_page.json",
-    DocumentNames.descriptor: "jsonschemas/event_descriptor.json",
-    DocumentNames.datum: "jsonschemas/datum.json",
-    DocumentNames.datum_page: "jsonschemas/datum_page.json",
-    DocumentNames.resource: "jsonschemas/resource.json",
-    DocumentNames.stream_datum: "jsonschemas/stream_datum.json",
-    DocumentNames.stream_resource: "jsonschemas/stream_resource.json",
-    DocumentNames.bulk_datum: "jsonschemas/bulk_datum.json",
-    DocumentNames.bulk_events: "jsonschemas/bulk_events.json",
+    DocumentNames.start: "schemas/run_start.json",
+    DocumentNames.stop: "schemas/run_stop.json",
+    DocumentNames.event: "schemas/event.json",
+    DocumentNames.event_page: "schemas/event_page.json",
+    DocumentNames.descriptor: "schemas/event_descriptor.json",
+    DocumentNames.datum: "schemas/datum.json",
+    DocumentNames.datum_page: "schemas/datum_page.json",
+    DocumentNames.resource: "schemas/resource.json",
+    DocumentNames.stream_datum: "schemas/stream_datum.json",
+    DocumentNames.stream_resource: "schemas/stream_resource.json",
+    DocumentNames.bulk_datum: "schemas/bulk_datum.json",
+    DocumentNames.bulk_events: "schemas/bulk_events.json",
 }
 schemas = {}
 for name, filename in SCHEMA_NAMES.items():

src/event_model/documents/event_descriptor.py

@@ -78,7 +78,7 @@ class DataKey(TypedDict):
     """
     The names for dimensions of the data. Null or empty list if scalar data
     """
-    dtype: Literal['string', 'number', 'array', 'boolean', 'integer']
+    dtype: Literal["string", "number", "array", "boolean", "integer"]
     """
     The type of the data in the event, given as a broad JSON schema type.
     """

src/event_model/documents/resource.py

@@ -16,7 +16,7 @@ class Resource(TypedDict):
     externally-stored data
     """
 
-    path_semantics: NotRequired[Optional[Literal['posix', 'windows']]]
+    path_semantics: NotRequired[Optional[Literal["posix", "windows"]]]
     """
     Rules for joining paths
     """

src/event_model/documents/run_stop.py

@@ -22,7 +22,7 @@ class RunStop(TypedDict):
     """
     data_type
     """
-    exit_status: Literal['success', 'abort', 'fail']
+    exit_status: Literal["success", "abort", "fail"]
     """
     State of the run when it ended
     """

src/event_model/generate/create_documents.py

@@ -12,7 +12,7 @@
 
 from event_model.basemodels import ALL_BASEMODELS
 
-JSONSCHEMA = Path(__file__).parent.parent / "jsonschemas"
+JSONSCHEMA = Path(__file__).parent.parent / "schemas"
 DOCUMENTS = Path(__file__).parent.parent / "documents"
 
 
@@ -85,6 +85,7 @@ def dump_json(schema: Dict[str, Any], jsonschema_path: Path):
     sorted_schema = sort_schema(schema)
     with jsonschema_path.open(mode="w") as f:
         json.dump(sorted_schema, f, indent=4)
+        f.write("\n")
     return True
 
 
@@ -114,7 +115,6 @@ def jsonschema_differs_from_saved(
     """
 
     if not jsonschema_path.exists():
-        print("+++++++++++++++ PATH DOESN@T EXIST", jsonschema_path)
         return True
 
     with jsonschema_path.open("r") as file:
@@ -193,7 +193,7 @@ def generate_jsonschema(
         ignore_schema=schema_extra,
     ):
         print(f"Detected change in {basemodel}, updating schema.")
-        # Dump with the extra schema that we want to leave out of
+        # Dump without the extra schema that we want to leave out of
         # the TypedDict conversion
         dump_json(model_jsonschema, jsonschema_path=jsonschema_path)
         generate_typeddict(jsonschema_path, documents_path=documents_parent_path)

src/event_model/jsonschemas/datum.json → src/event_model/schemas/datum.json

@@ -25,4 +25,4 @@
         "resource"
     ],
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/datum_page.json → src/event_model/schemas/datum_page.json

@@ -37,4 +37,4 @@
         "resource"
     ],
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/event.json → src/event_model/schemas/event.json

@@ -66,4 +66,4 @@
         "uid"
     ],
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/event_descriptor.json → src/event_model/schemas/event_descriptor.json

@@ -454,4 +454,4 @@
         }
     },
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/event_page.json → src/event_model/schemas/event_page.json

@@ -89,4 +89,4 @@
         "uid"
     ],
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/partial_event.json → src/event_model/schemas/partial_event.json

@@ -47,4 +47,4 @@
         "timestamps"
     ],
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/partial_event_page.json → src/event_model/schemas/partial_event_page.json

@@ -64,4 +64,4 @@
         "timestamps"
     ],
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/partial_resource.json → src/event_model/schemas/partial_resource.json

@@ -36,4 +36,4 @@
         "uid"
     ],
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/resource.json → src/event_model/schemas/resource.json

@@ -67,4 +67,4 @@
         "uid"
     ],
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/run_start.json → src/event_model/schemas/run_start.json

@@ -444,4 +444,4 @@
         }
     },
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/run_stop.json → src/event_model/schemas/run_stop.json

@@ -87,4 +87,4 @@
         }
     },
     "additionalProperties": false
-}
+}

src/event_model/jsonschemas/stream_datum.json → src/event_model/schemas/stream_datum.json

@@ -57,4 +57,4 @@
         "stream_resource",
         "uid"
     ]
-}
+}

src/event_model/jsonschemas/stream_resource.json → src/event_model/schemas/stream_resource.json

@@ -42,4 +42,4 @@
         "uid",
         "uri"
     ]
-}
+}