fix post process not initiated wo prefixes

src/json/export.rs

@@ -44,6 +44,7 @@ const SCHEMA: &str = "https://json-schema.org/draft/2020-12/schema";
 ///
 /// * `model` - A reference to the `DataModel` to be converted.
 /// * `root` - The root object name in the model.
+/// * `openai` - A boolean flag indicating whether to use the OpenAI schema.
 ///
 /// # Returns
 ///
@@ -225,22 +226,21 @@ fn post_process_schema(
     openai: bool,
 ) {
     schema_object.id = Some(config.repo.clone());
-    if let Some(prefixes) = &config.prefixes {
-        resolve_prefixes(schema_object, prefixes);
+    post_process_object(schema_object, config, openai);
 
-        if openai {
-            remove_options(schema_object);
+    for (_, definition) in schema_object.definitions.iter_mut() {
+        if let schema::SchemaType::Object(definition) = definition {
+            post_process_object(definition, config, openai);
         }
+    }
+}
 
-        for (_, definition) in schema_object.definitions.iter_mut() {
-            if let schema::SchemaType::Object(schema_object) = definition {
-                resolve_prefixes(schema_object, prefixes);
-
-                if openai {
-                    remove_options(schema_object);
-                }
-            }
-        }
+fn post_process_object(object: &mut schema::SchemaObject, config: &FrontMatter, openai: bool) {
+    if let Some(prefixes) = &config.prefixes {
+        resolve_prefixes(object, prefixes);
+    }
+    if openai {
+        remove_options(object);
     }
 }
 

tests/data/expected_json_schema.json

@@ -46,7 +46,8 @@
     "number": {
       "title": "number",
       "type": "number",
-      "$term": "http://schema.org/one"
+      "$term": "http://schema.org/one",
+      "minimum": 0.0
     },
     "ontology": {
       "title": "ontology",

tests/data/expected_json_schema_openai.json

@@ -7,7 +7,6 @@
     "array_valued": {
       "title": "array_valued",
       "type": "array",
-      "$term": "http://schema.org/something",
       "items": {
         "$ref": "#/$defs/Test2"
       }
@@ -40,13 +39,11 @@
     "name": {
       "title": "name",
       "type": "string",
-      "description": "A test description",
-      "$term": "http://schema.org/hello"
+      "description": "A test description"
     },
     "number": {
       "title": "number",
-      "type": "number",
-      "$term": "http://schema.org/one"
+      "type": "number"
     },
     "ontology": {
       "title": "ontology",
@@ -75,15 +72,13 @@
         "names": {
           "title": "names",
           "type": "array",
-          "$term": "http://schema.org/hello",
           "items": {
             "type": "string"
           }
         },
         "number": {
           "title": "number",
-          "type": "number",
-          "$term": "http://schema.org/one"
+          "type": "number"
         }
       },
       "required": [],

tests/data/model_json_schema.md

@@ -17,6 +17,7 @@ nsmap:
 - number
   - Type: float
   - Term: schema:one
+  - Minimum: 0
 - array_valued
   - Type: [Test2](#test2)[]
   - Term: schema:something

tests/data/model_json_schema_openai.md

@@ -0,0 +1,46 @@
+---
+repo: "https://www.github.com/my/repo/"
+prefix: "tst"
+---
+
+### Test
+
+- **name**
+  - Type: Identifier
+  - Description: A test description
+- number
+  - Type: float
+  - Minimum: 0
+- array_valued
+  - Type: [Test2](#test2)[]
+- single_valued
+  - Type: [Test2](#test2)
+- ontology
+  - Type: Ontology
+- multiple_types
+  - Type: float, Test2
+- multiple_types_array
+  - Type: float, Test2
+  - Multiple: true
+
+### Test2
+
+- names
+  - Type: string[]
+  - XML: name
+- number
+  - Type: float
+  - XML: @number
+  - Minimum: 0
+
+## Enumerations
+
+### Ontology
+
+Ontology endpoints for different types of sequences.
+
+```
+GO = "https://amigo.geneontology.org/amigo/term/"
+SIO = "http://semanticscience.org/resource/"
+ECO = "https://www.evidenceontology.org/term/"
+```

tests/integration_tests.rs

@@ -163,7 +163,7 @@ mod tests {
     #[test]
     fn test_json_schema_openai() {
         // Arrange
-        let path = Path::new("tests/data/model_json_schema.md");
+        let path = Path::new("tests/data/model_json_schema_openai.md");
         let model = DataModel::from_markdown(path).expect("Could not parse markdown");
 
         // Act