From 6ac85be80d231d5e0aef635329e0718e0c78d9b1 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 11:17:18 -0700 Subject: [PATCH 01/18] chore: add schema for path object --- schema/system/path.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 schema/system/path.json diff --git a/schema/system/path.json b/schema/system/path.json new file mode 100644 index 000000000..1b015c7f4 --- /dev/null +++ b/schema/system/path.json @@ -0,0 +1,11 @@ +{ + "$id": "system/path", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "path schema", + "type": "object", + "properties": { + "path": { + "$ref": "../core/reusable/category_path.json" + } + } +} From a8ad97a210c37b57fda616b1833c88cce66aa511 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 11:18:04 -0700 Subject: [PATCH 02/18] chore: add schema for path entity --- schema/system/path_entity.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 schema/system/path_entity.json diff --git a/schema/system/path_entity.json b/schema/system/path_entity.json new file mode 100644 index 000000000..051f5717f --- /dev/null +++ b/schema/system/path_entity.json @@ -0,0 +1,13 @@ +{ + "$id": "system/path-entity", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "path entity schema", + "allOf": [ + { + "$ref": "./name.json" + }, + { + "$ref": "./path.json" + } + ] +} From 3c2accaf86ef77d0cb51f8b3a6a7790e76c98e1d Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 11:19:16 -0700 Subject: [PATCH 03/18] refactor: use path entity schema --- schema/method/categorized_method.json | 5 +---- schema/method/unit_method.json | 6 +----- schema/model/model_without_method.json | 5 +---- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/schema/method/categorized_method.json b/schema/method/categorized_method.json index 177bf4710..72bafb6a6 100644 --- a/schema/method/categorized_method.json +++ b/schema/method/categorized_method.json @@ -4,16 +4,13 @@ "title": "categorized method schema", "allOf": [ { - "$ref": "../system/name.json" + "$ref": "../system/path_entity.json" }, { "$ref": "../system/tags.json" } ], "properties": { - "path": { - "$ref": "../core/reusable/category_path.json" - }, "units": { "type": "array", "items": { diff --git a/schema/method/unit_method.json b/schema/method/unit_method.json index 413078901..6a18be5a7 100644 --- a/schema/method/unit_method.json +++ b/schema/method/unit_method.json @@ -4,7 +4,7 @@ "title": "unit method schema (base)", "allOf": [ { - "$ref": "../system/name.json" + "$ref": "../system/path_entity.json" }, { "$ref": "../system/tags.json" @@ -15,10 +15,6 @@ "description": "Method categories", "$ref": "../core/reusable/categories.json" }, - "path": { - "description": "URL-like method path, e.g. physical/pw", - "$ref": "../core/reusable/category_path.json" - }, "parameters": { "description": "Instructive parameters defining the method", "type": "object" diff --git a/schema/model/model_without_method.json b/schema/model/model_without_method.json index b50bc4df0..4017442ee 100644 --- a/schema/model/model_without_method.json +++ b/schema/model/model_without_method.json @@ -4,16 +4,13 @@ "title": "model without method schema (base)", "allOf": [ { - "$ref": "../system/name.json" + "$ref": "../system/path_entity.json" }, { "$ref": "../system/tags.json" } ], "properties": { - "path": { - "$ref": "../core/reusable/category_path.json" - }, "categories": { "description": "Model categories", "$ref": "../core/reusable/categories.json" From f4bda596cda8cfca6d373dde232c2fbe4c58c4de Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 12:18:32 -0700 Subject: [PATCH 04/18] chore: add model parameters schema --- example/model/model_parameters.json | 7 ++++++ schema/model/model_parameters.json | 38 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 example/model/model_parameters.json create mode 100644 schema/model/model_parameters.json diff --git a/example/model/model_parameters.json b/example/model/model_parameters.json new file mode 100644 index 000000000..a80dcd124 --- /dev/null +++ b/example/model/model_parameters.json @@ -0,0 +1,7 @@ +{ + "functional": "pbe", + "dispersionCorrection": "dft-d3", + "hubbardType": "u", + "spinPolarization": "collinear", + "spinOrbitCoupling": true +} diff --git a/schema/model/model_parameters.json b/schema/model/model_parameters.json new file mode 100644 index 000000000..b33eab987 --- /dev/null +++ b/schema/model/model_parameters.json @@ -0,0 +1,38 @@ +{ + "$id": "model/model-parameters", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "ModelParameters", + "allOf": [ + { + "$ref": "./mixins/hubbard.json" + }, + { + "$ref": "./mixins/spin_polarization.json" + }, + { + "$ref": "./mixins/spin_orbit_coupling.json" + }, + { + "$ref": "./mixins/dispersion_correction.json" + }, + { + "oneOf": [ + { + "$ref": "./mixins/dft/lda_functional.json" + }, + { + "$ref": "./mixins/dft/gga_functional.json" + }, + { + "$ref": "./mixins/dft/mgga_functional.json" + }, + { + "$ref": "./mixins/dft/hybrid_functional.json" + }, + { + "$ref": "./mixins/dft/double_hybrid_functional.json" + } + ] + } + ] +} From a8c48ed6ea9e7fddb5eda3ee2b4d43b6a1bcb1f7 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 12:19:20 -0700 Subject: [PATCH 05/18] refactor: use definitions for ao basis parameters --- schema/methods_directory/physical/ao/dunning.json | 15 ++++++++++----- schema/methods_directory/physical/ao/other.json | 15 ++++++++++----- schema/methods_directory/physical/ao/pople.json | 15 ++++++++++----- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/schema/methods_directory/physical/ao/dunning.json b/schema/methods_directory/physical/ao/dunning.json index ffb783f28..629957a6d 100644 --- a/schema/methods_directory/physical/ao/dunning.json +++ b/schema/methods_directory/physical/ao/dunning.json @@ -14,13 +14,18 @@ "parameters": { "allOf": [ { - "properties": { - "basisSlug": { - "$ref": "./enum_options.json#/dunningAoBasis" - } - } + "$ref": "#/definitions/ao-basis-dunning" } ] } + }, + "definitions": { + "ao-basis-dunning": { + "properties": { + "basisSlug": { + "$ref": "./enum_options.json#/dunningAoBasis" + } + } + } } } diff --git a/schema/methods_directory/physical/ao/other.json b/schema/methods_directory/physical/ao/other.json index 4be5df773..9cdfc35c7 100644 --- a/schema/methods_directory/physical/ao/other.json +++ b/schema/methods_directory/physical/ao/other.json @@ -14,13 +14,18 @@ "parameters": { "allOf": [ { - "properties": { - "basisSlug": { - "$ref": "./enum_options.json#/otherAoBasis" - } - } + "$ref": "#/definitions/ao-basis-other" } ] } + }, + "definitions": { + "ao-basis-other": { + "properties": { + "basisSlug": { + "$ref": "./enum_options.json#/otherAoBasis" + } + } + } } } diff --git a/schema/methods_directory/physical/ao/pople.json b/schema/methods_directory/physical/ao/pople.json index 480109613..43aa0419d 100644 --- a/schema/methods_directory/physical/ao/pople.json +++ b/schema/methods_directory/physical/ao/pople.json @@ -14,13 +14,18 @@ "parameters": { "allOf": [ { - "properties": { - "basisSlug": { - "$ref": "./enum_options.json#/popleAoBasis" - } - } + "$ref": "#/definitions/ao-basis-pople" } ] } + }, + "definitions": { + "ao-basis-pople": { + "properties": { + "basisSlug": { + "$ref": "./enum_options.json#/popleAoBasis" + } + } + } } } From 2ae1cd0cc8fa1ba6f059715435cd56c244658a7e Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 12:19:46 -0700 Subject: [PATCH 06/18] chore: add method parameter schema --- example/method/method_parameters.json | 3 +++ schema/method/method_parameters.json | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 example/method/method_parameters.json create mode 100644 schema/method/method_parameters.json diff --git a/example/method/method_parameters.json b/example/method/method_parameters.json new file mode 100644 index 000000000..fbbd736b2 --- /dev/null +++ b/example/method/method_parameters.json @@ -0,0 +1,3 @@ +{ + "basisSlug": "6-311G" +} diff --git a/schema/method/method_parameters.json b/schema/method/method_parameters.json new file mode 100644 index 000000000..27fad6621 --- /dev/null +++ b/schema/method/method_parameters.json @@ -0,0 +1,20 @@ +{ + "$id": "method/method-parameters", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "MethodParameters", + "allOf": [ + { + "oneOf": [ + { + "$ref": "../methods_directory/physical/ao/dunning.json#/definitions/ao-basis-dunning" + }, + { + "$ref": "../methods_directory/physical/ao/pople.json#/definitions/ao-basis-pople" + }, + { + "$ref": "../methods_directory/physical/ao/other.json#/definitions/ao-basis-other" + } + ] + } + ] +} From 6ab718bd9cc5b9d490cc4007d18b9e6311a05465 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 14:53:41 -0700 Subject: [PATCH 07/18] chore: adjust titles for improved TS type names --- schema/core/reusable/categories.json | 2 +- schema/method.json | 2 +- schema/method/categorized_method.json | 2 +- schema/method/unit_method.json | 2 +- schema/model/categorized_model.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/schema/core/reusable/categories.json b/schema/core/reusable/categories.json index 2e4e70259..f747a8d52 100644 --- a/schema/core/reusable/categories.json +++ b/schema/core/reusable/categories.json @@ -1,7 +1,7 @@ { "$id": "core/reusable/categories", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "categories schema", + "title": "categories", "description": "Used to categorize entities such as models and methods", "type": "object", "properties": { diff --git a/schema/method.json b/schema/method.json index b71eead9f..881a92d07 100644 --- a/schema/method.json +++ b/schema/method.json @@ -1,7 +1,7 @@ { "$id": "method", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "method schema (base)", + "title": "base method", "properties": { "type": { "description": "general type of this method, eg. `pseudopotential`", diff --git a/schema/method/categorized_method.json b/schema/method/categorized_method.json index 72bafb6a6..cb70c4300 100644 --- a/schema/method/categorized_method.json +++ b/schema/method/categorized_method.json @@ -1,7 +1,7 @@ { "$id": "method/categorized-method", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "categorized method schema", + "title": "categorized method", "allOf": [ { "$ref": "../system/path_entity.json" diff --git a/schema/method/unit_method.json b/schema/method/unit_method.json index 6a18be5a7..c8d462025 100644 --- a/schema/method/unit_method.json +++ b/schema/method/unit_method.json @@ -1,7 +1,7 @@ { "$id": "method/unit-method", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "unit method schema (base)", + "title": "categorized method unit", "allOf": [ { "$ref": "../system/path_entity.json" diff --git a/schema/model/categorized_model.json b/schema/model/categorized_model.json index 6c9391d1e..171f521a9 100644 --- a/schema/model/categorized_model.json +++ b/schema/model/categorized_model.json @@ -1,7 +1,7 @@ { "$id": "model/categorized-model", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "categorized base model", + "title": "categorized model", "allOf": [ { "$ref": "./model_without_method.json" From 456eec1ef82df62dc3e05d18a8ff3c4ffbf8c754 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 17:41:57 -0700 Subject: [PATCH 08/18] chore: add specific legacy models with examples --- example/models_directory/legacy/dft.json | 8 ++ example/models_directory/legacy/ml.json | 7 ++ example/models_directory/legacy/unknown.json | 7 ++ schema/models_directory/legacy/dft.json | 81 ++++++++++++++++++++ schema/models_directory/legacy/ml.json | 22 ++++++ schema/models_directory/legacy/unknown.json | 22 ++++++ 6 files changed, 147 insertions(+) create mode 100644 example/models_directory/legacy/dft.json create mode 100644 example/models_directory/legacy/ml.json create mode 100644 example/models_directory/legacy/unknown.json create mode 100644 schema/models_directory/legacy/dft.json create mode 100644 schema/models_directory/legacy/ml.json create mode 100644 schema/models_directory/legacy/unknown.json diff --git a/example/models_directory/legacy/dft.json b/example/models_directory/legacy/dft.json new file mode 100644 index 000000000..6b1e8d11a --- /dev/null +++ b/example/models_directory/legacy/dft.json @@ -0,0 +1,8 @@ +{ + "type": "dft", + "subtype": "gga", + "functional": "pbe", + "method": { + "...": "include(../../method.json)" + } +} diff --git a/example/models_directory/legacy/ml.json b/example/models_directory/legacy/ml.json new file mode 100644 index 000000000..bec9990ad --- /dev/null +++ b/example/models_directory/legacy/ml.json @@ -0,0 +1,7 @@ +{ + "type": "ml", + "subtype": "re", + "method": { + "...": "include(../../method.json)" + } +} diff --git a/example/models_directory/legacy/unknown.json b/example/models_directory/legacy/unknown.json new file mode 100644 index 000000000..d42c77410 --- /dev/null +++ b/example/models_directory/legacy/unknown.json @@ -0,0 +1,7 @@ +{ + "type": "unknown", + "subtype": "unknown", + "method": { + "...": "include(../../method.json)" + } +} diff --git a/schema/models_directory/legacy/dft.json b/schema/models_directory/legacy/dft.json new file mode 100644 index 000000000..461e1b98f --- /dev/null +++ b/schema/models_directory/legacy/dft.json @@ -0,0 +1,81 @@ +{ + "$id": "models-directory/legacy/dft", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "dft model legacy", + "allOf": [ + { + "$ref": "../../model.json" + }, + { + "oneOf": [ + { + "$ref": "#/definitions/lda" + }, + { + "$ref": "#/definitions/gga" + }, + { + "$ref": "#/definitions/hybrid" + } + ] + } + ], + "properties": { + "type": { + "enum": [ + "dft" + ] + } + }, + "definitions": { + "lda": { + "properties": { + "subtype": { + "enum": [ + "lda" + ] + }, + "functional": { + "enum": [ + "pz", + "pw", + "vwn", + "other" + ] + } + } + }, + "gga": { + "properties": { + "subtype": { + "enum": [ + "gga" + ] + }, + "functional": { + "enum": [ + "pbe", + "pbesol", + "pw91", + "other" + ] + } + } + }, + "hybrid": { + "properties": { + "subtype": { + "enum": [ + "hybrid" + ] + }, + "functional": { + "enum": [ + "b3lyp", + "hse06" + ] + } + } + } + } +} diff --git a/schema/models_directory/legacy/ml.json b/schema/models_directory/legacy/ml.json new file mode 100644 index 000000000..b2afd5091 --- /dev/null +++ b/schema/models_directory/legacy/ml.json @@ -0,0 +1,22 @@ +{ + "$id": "models-directory/legacy/ml", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "ml model legacy", + "allOf": [ + { + "$ref": "../../model.json" + } + ], + "properties": { + "type": { + "enum": [ + "ml" + ] + }, + "subtype": { + "enum": [ + "re" + ] + } + } +} diff --git a/schema/models_directory/legacy/unknown.json b/schema/models_directory/legacy/unknown.json new file mode 100644 index 000000000..ab9ebabfd --- /dev/null +++ b/schema/models_directory/legacy/unknown.json @@ -0,0 +1,22 @@ +{ + "$id": "models-directory/legacy/unknown", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "unknown model legacy", + "allOf": [ + { + "$ref": "../../model.json" + } + ], + "properties": { + "type": { + "enum": [ + "unknown" + ] + }, + "subtype": { + "enum": [ + "unknown" + ] + } + } +} From 12e3a6a05a4c356a4bb5a4c0a5e94be50d93eef3 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 17:42:26 -0700 Subject: [PATCH 09/18] chore: add legacy methods with examples --- .../legacy/localorbital.json | 4 ++ .../legacy/pseudopotential.json | 4 ++ .../methods_directory/legacy/regression.json | 61 +++++++++++++++++++ example/methods_directory/legacy/unknown.json | 4 ++ .../legacy/localorbital.json | 22 +++++++ .../legacy/pseudopotential.json | 24 ++++++++ .../methods_directory/legacy/regression.json | 34 +++++++++++ schema/methods_directory/legacy/unknown.json | 22 +++++++ 8 files changed, 175 insertions(+) create mode 100644 example/methods_directory/legacy/localorbital.json create mode 100644 example/methods_directory/legacy/pseudopotential.json create mode 100644 example/methods_directory/legacy/regression.json create mode 100644 example/methods_directory/legacy/unknown.json create mode 100644 schema/methods_directory/legacy/localorbital.json create mode 100644 schema/methods_directory/legacy/pseudopotential.json create mode 100644 schema/methods_directory/legacy/regression.json create mode 100644 schema/methods_directory/legacy/unknown.json diff --git a/example/methods_directory/legacy/localorbital.json b/example/methods_directory/legacy/localorbital.json new file mode 100644 index 000000000..41e7d64de --- /dev/null +++ b/example/methods_directory/legacy/localorbital.json @@ -0,0 +1,4 @@ +{ + "type": "localorbital", + "subtype": "pople" +} diff --git a/example/methods_directory/legacy/pseudopotential.json b/example/methods_directory/legacy/pseudopotential.json new file mode 100644 index 000000000..fa9bf4d37 --- /dev/null +++ b/example/methods_directory/legacy/pseudopotential.json @@ -0,0 +1,4 @@ +{ + "type": "pseudopotential", + "subtype": "us" +} diff --git a/example/methods_directory/legacy/regression.json b/example/methods_directory/legacy/regression.json new file mode 100644 index 000000000..52f1eb600 --- /dev/null +++ b/example/methods_directory/legacy/regression.json @@ -0,0 +1,61 @@ +{ + "data": { + "dataSet": { + "exabyteIds": [ + "LCthJ6E2QabYCZqf4", + "LCthJ6E2QabYCZqf5", + "LCthJ6E2QabYCZqf6", + "LCthJ6E2QabYCZqf7", + "LCthJ6E2QabYCZqf8", + "LCthJ6E2QabYCZqf9", + "LCthJ6E2QabYCZq10", + "LCthJ6E2QabYCZq11" + ], + "extra": {} + }, + "perProperty": [ + { + "intercept": 0.363, + "name": "band_gaps:direct", + "perFeature": [ + { + "coefficient": 0.015, + "importance": 0.134, + "name": "atomic_radius:Ge" + }, + { + "coefficient": 0.016, + "importance": 0.135, + "name": "atomic_radius:Si" + } + ] + }, + { + "intercept": 0.364, + "name": "band_gaps:indirect", + "perFeature": [ + { + "coefficient": 0.016, + "importance": 0.135, + "name": "atomic_radius:Ge" + }, + { + "coefficient": 0.017, + "importance": 0.136, + "name": "atomic_radius:Si" + } + ] + } + ] + }, + "precision": { + "perProperty": [ + { + "score": 0.8, + "trainingError": 0.002 + } + ] + }, + "subtype": "least_squares", + "type": "linear" +} diff --git a/example/methods_directory/legacy/unknown.json b/example/methods_directory/legacy/unknown.json new file mode 100644 index 000000000..cca176ce9 --- /dev/null +++ b/example/methods_directory/legacy/unknown.json @@ -0,0 +1,4 @@ +{ + "type": "unknown", + "subtype": "unknown" +} diff --git a/schema/methods_directory/legacy/localorbital.json b/schema/methods_directory/legacy/localorbital.json new file mode 100644 index 000000000..c6a98e56d --- /dev/null +++ b/schema/methods_directory/legacy/localorbital.json @@ -0,0 +1,22 @@ +{ + "$id": "methods-directory/legacy/localorbital", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "localorbital legacy method", + "allOf": [ + { + "$ref": "../../method.json" + } + ], + "properties": { + "type": { + "enum": [ + "localorbital" + ] + }, + "subtype": { + "enum": [ + "pople" + ] + } + } +} diff --git a/schema/methods_directory/legacy/pseudopotential.json b/schema/methods_directory/legacy/pseudopotential.json new file mode 100644 index 000000000..1acba6b91 --- /dev/null +++ b/schema/methods_directory/legacy/pseudopotential.json @@ -0,0 +1,24 @@ +{ + "$id": "methods-directory/legacy/pseudopotential", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "pseudopotential legacy method", + "allOf": [ + { + "$ref": "../../method.json" + } + ], + "properties": { + "type": { + "enum": [ + "pseudopotential" + ] + }, + "subtype": { + "enum": [ + "paw", + "nc", + "us" + ] + } + } +} diff --git a/schema/methods_directory/legacy/regression.json b/schema/methods_directory/legacy/regression.json new file mode 100644 index 000000000..849de73f6 --- /dev/null +++ b/schema/methods_directory/legacy/regression.json @@ -0,0 +1,34 @@ +{ + "$id": "methods-directory/legacy/regression", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "regression legacy method", + "allOf": [ + { + "$ref": "../../method.json" + } + ], + "properties": { + "type": { + "enum": [ + "linear", + "kernel_ridge" + ] + }, + "subtype": { + "enum": [ + "least_squares", + "ridge" + ] + }, + "precision": { + "$ref": "../mathematical/regression/precision.json" + }, + "data": { + "$ref": "../mathematical/regression/data.json" + } + }, + "required": [ + "precision", + "data" + ] +} diff --git a/schema/methods_directory/legacy/unknown.json b/schema/methods_directory/legacy/unknown.json new file mode 100644 index 000000000..aa32edfc9 --- /dev/null +++ b/schema/methods_directory/legacy/unknown.json @@ -0,0 +1,22 @@ +{ + "$id": "methods-directory/legacy/unknown", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "unknown legacy method", + "allOf": [ + { + "$ref": "../../method.json" + } + ], + "properties": { + "type": { + "enum": [ + "unknown" + ] + }, + "subtype": { + "enum": [ + "unknown" + ] + } + } +} From 26673e07ea298a82f59e4a1ebd6080f7dc0a3ff8 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 18:53:13 -0700 Subject: [PATCH 10/18] chore: add required keys for TS types --- schema/models_directory/double_hybrid.json | 6 +++++- schema/models_directory/gga.json | 6 +++++- schema/models_directory/gw.json | 6 +++++- schema/models_directory/hybrid.json | 6 +++++- schema/models_directory/lda.json | 6 +++++- schema/models_directory/mgga.json | 6 +++++- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/schema/models_directory/double_hybrid.json b/schema/models_directory/double_hybrid.json index b102768d5..6f71a3d12 100644 --- a/schema/models_directory/double_hybrid.json +++ b/schema/models_directory/double_hybrid.json @@ -31,5 +31,9 @@ } ] } - } + }, + "required": [ + "categories", + "parameters" + ] } diff --git a/schema/models_directory/gga.json b/schema/models_directory/gga.json index c655e6390..3f973323d 100644 --- a/schema/models_directory/gga.json +++ b/schema/models_directory/gga.json @@ -34,5 +34,9 @@ } ] } - } + }, + "required": [ + "categories", + "parameters" + ] } diff --git a/schema/models_directory/gw.json b/schema/models_directory/gw.json index 80f76db8c..1148982fc 100644 --- a/schema/models_directory/gw.json +++ b/schema/models_directory/gw.json @@ -46,5 +46,9 @@ } ] } - } + }, + "required": [ + "categories", + "parameters" + ] } diff --git a/schema/models_directory/hybrid.json b/schema/models_directory/hybrid.json index 7a74be827..c8c3a4b08 100644 --- a/schema/models_directory/hybrid.json +++ b/schema/models_directory/hybrid.json @@ -34,5 +34,9 @@ } ] } - } + }, + "required": [ + "categories", + "parameters" + ] } diff --git a/schema/models_directory/lda.json b/schema/models_directory/lda.json index 86ea9bad2..d5691c0ec 100644 --- a/schema/models_directory/lda.json +++ b/schema/models_directory/lda.json @@ -34,5 +34,9 @@ } ] } - } + }, + "required": [ + "categories", + "parameters" + ] } diff --git a/schema/models_directory/mgga.json b/schema/models_directory/mgga.json index 7e6a80152..51db018d9 100644 --- a/schema/models_directory/mgga.json +++ b/schema/models_directory/mgga.json @@ -34,5 +34,9 @@ } ] } - } + }, + "required": [ + "categories", + "parameters" + ] } From 6545cdee3ded03f5c6751c161e88a77a77df85cf Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 5 Sep 2023 19:43:49 -0700 Subject: [PATCH 11/18] chore: add required keys to methods --- schema/methods_directory/mathematical/cg.json | 3 ++- schema/methods_directory/mathematical/davidson.json | 3 ++- schema/methods_directory/mathematical/regression.json | 1 + schema/methods_directory/physical/ao/dunning.json | 1 + schema/methods_directory/physical/ao/other.json | 1 + schema/methods_directory/physical/ao/pople.json | 1 + schema/methods_directory/physical/psp.json | 3 ++- schema/methods_directory/physical/pw.json | 3 ++- schema/methods_directory/physical/smearing.json | 3 ++- schema/methods_directory/physical/tetrahedron.json | 3 ++- 10 files changed, 16 insertions(+), 6 deletions(-) diff --git a/schema/methods_directory/mathematical/cg.json b/schema/methods_directory/mathematical/cg.json index 6e817b347..e7ba26a05 100644 --- a/schema/methods_directory/mathematical/cg.json +++ b/schema/methods_directory/mathematical/cg.json @@ -11,5 +11,6 @@ "categories": { "$ref": "../../methods_category/mathematical/opt/diff/ordern/cg.json" } - } + }, + "required": ["categories"] } diff --git a/schema/methods_directory/mathematical/davidson.json b/schema/methods_directory/mathematical/davidson.json index 9eef262bc..490563d34 100644 --- a/schema/methods_directory/mathematical/davidson.json +++ b/schema/methods_directory/mathematical/davidson.json @@ -11,5 +11,6 @@ "categories": { "$ref": "../../methods_category/mathematical/linalg/diag/davidson.json" } - } + }, + "required": ["categories"] } diff --git a/schema/methods_directory/mathematical/regression.json b/schema/methods_directory/mathematical/regression.json index 407491c57..e69595ade 100644 --- a/schema/methods_directory/mathematical/regression.json +++ b/schema/methods_directory/mathematical/regression.json @@ -19,6 +19,7 @@ } }, "required": [ + "categories", "precision", "data" ] diff --git a/schema/methods_directory/physical/ao/dunning.json b/schema/methods_directory/physical/ao/dunning.json index 629957a6d..e704a30e7 100644 --- a/schema/methods_directory/physical/ao/dunning.json +++ b/schema/methods_directory/physical/ao/dunning.json @@ -19,6 +19,7 @@ ] } }, + "required": ["categories"], "definitions": { "ao-basis-dunning": { "properties": { diff --git a/schema/methods_directory/physical/ao/other.json b/schema/methods_directory/physical/ao/other.json index 9cdfc35c7..15d4cf4c2 100644 --- a/schema/methods_directory/physical/ao/other.json +++ b/schema/methods_directory/physical/ao/other.json @@ -19,6 +19,7 @@ ] } }, + "required": ["categories"], "definitions": { "ao-basis-other": { "properties": { diff --git a/schema/methods_directory/physical/ao/pople.json b/schema/methods_directory/physical/ao/pople.json index 43aa0419d..5a6bd7b58 100644 --- a/schema/methods_directory/physical/ao/pople.json +++ b/schema/methods_directory/physical/ao/pople.json @@ -19,6 +19,7 @@ ] } }, + "required": ["categories"], "definitions": { "ao-basis-pople": { "properties": { diff --git a/schema/methods_directory/physical/psp.json b/schema/methods_directory/physical/psp.json index 54d3e517d..7d1d0db38 100644 --- a/schema/methods_directory/physical/psp.json +++ b/schema/methods_directory/physical/psp.json @@ -24,5 +24,6 @@ } } } - } + }, + "required": ["categories"] } diff --git a/schema/methods_directory/physical/pw.json b/schema/methods_directory/physical/pw.json index 99c33b9a1..e136cf6db 100644 --- a/schema/methods_directory/physical/pw.json +++ b/schema/methods_directory/physical/pw.json @@ -12,5 +12,6 @@ "categories": { "$ref": "../../methods_category/physical/qm/wf/pw.json" } - } + }, + "required": ["categories"] } diff --git a/schema/methods_directory/physical/smearing.json b/schema/methods_directory/physical/smearing.json index afdc6a5d7..099c2671a 100644 --- a/schema/methods_directory/physical/smearing.json +++ b/schema/methods_directory/physical/smearing.json @@ -12,5 +12,6 @@ "categories": { "$ref": "../../methods_category/physical/qm/wf/smearing.json" } - } + }, + "required": ["categories"] } diff --git a/schema/methods_directory/physical/tetrahedron.json b/schema/methods_directory/physical/tetrahedron.json index d116efb8f..0b9ee97d4 100644 --- a/schema/methods_directory/physical/tetrahedron.json +++ b/schema/methods_directory/physical/tetrahedron.json @@ -11,5 +11,6 @@ "categories": { "$ref": "../../methods_category/physical/qm/wf/tetrahedron.json" } - } + }, + "required": ["categories"] } From 756390745180bee4afe46613e212935e56b25846 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Wed, 6 Sep 2023 12:28:14 -0700 Subject: [PATCH 12/18] chore: use consistent method names --- schema/methods_directory/legacy/localorbital.json | 2 +- schema/methods_directory/legacy/pseudopotential.json | 2 +- schema/methods_directory/legacy/unknown.json | 2 +- schema/methods_directory/mathematical/cg.json | 1 + schema/methods_directory/mathematical/davidson.json | 1 + schema/methods_directory/mathematical/regression.json | 2 +- schema/methods_directory/physical/ao/dunning.json | 1 + schema/methods_directory/physical/ao/other.json | 1 + schema/methods_directory/physical/ao/pople.json | 1 + schema/methods_directory/physical/psp.json | 2 +- schema/methods_directory/physical/psp/file.json | 2 +- schema/methods_directory/physical/pw.json | 2 +- schema/methods_directory/physical/smearing.json | 2 +- schema/methods_directory/physical/tetrahedron.json | 2 +- 14 files changed, 14 insertions(+), 9 deletions(-) diff --git a/schema/methods_directory/legacy/localorbital.json b/schema/methods_directory/legacy/localorbital.json index c6a98e56d..5821047ca 100644 --- a/schema/methods_directory/legacy/localorbital.json +++ b/schema/methods_directory/legacy/localorbital.json @@ -1,7 +1,7 @@ { "$id": "methods-directory/legacy/localorbital", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "localorbital legacy method", + "title": "legacy method localorbital", "allOf": [ { "$ref": "../../method.json" diff --git a/schema/methods_directory/legacy/pseudopotential.json b/schema/methods_directory/legacy/pseudopotential.json index 1acba6b91..335a662c9 100644 --- a/schema/methods_directory/legacy/pseudopotential.json +++ b/schema/methods_directory/legacy/pseudopotential.json @@ -1,7 +1,7 @@ { "$id": "methods-directory/legacy/pseudopotential", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pseudopotential legacy method", + "title": "legacy method pseudopotential", "allOf": [ { "$ref": "../../method.json" diff --git a/schema/methods_directory/legacy/unknown.json b/schema/methods_directory/legacy/unknown.json index aa32edfc9..7ccf2823a 100644 --- a/schema/methods_directory/legacy/unknown.json +++ b/schema/methods_directory/legacy/unknown.json @@ -1,7 +1,7 @@ { "$id": "methods-directory/legacy/unknown", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "unknown legacy method", + "title": "legacy method unknown", "allOf": [ { "$ref": "../../method.json" diff --git a/schema/methods_directory/mathematical/cg.json b/schema/methods_directory/mathematical/cg.json index e7ba26a05..194e3b7f0 100644 --- a/schema/methods_directory/mathematical/cg.json +++ b/schema/methods_directory/mathematical/cg.json @@ -1,6 +1,7 @@ { "$id": "methods-directory/mathematical/cg", "$schema": "http://json-schema.org/draft-04/schema#", + "title": "unit method conjugate gradient", "description": "conjugate gradient method schema", "allOf": [ { diff --git a/schema/methods_directory/mathematical/davidson.json b/schema/methods_directory/mathematical/davidson.json index 490563d34..97cb7981d 100644 --- a/schema/methods_directory/mathematical/davidson.json +++ b/schema/methods_directory/mathematical/davidson.json @@ -1,6 +1,7 @@ { "$id": "methods-directory/mathematical/davidson", "$schema": "http://json-schema.org/draft-04/schema#", + "title": "unit method davidson", "description": "Davidson diagonalization method", "allOf": [ { diff --git a/schema/methods_directory/mathematical/regression.json b/schema/methods_directory/mathematical/regression.json index e69595ade..d44106de4 100644 --- a/schema/methods_directory/mathematical/regression.json +++ b/schema/methods_directory/mathematical/regression.json @@ -1,7 +1,7 @@ { "$id": "methods-directory/mathematical/regression", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "linear methods schema", + "title": "unit method regression", "allOf": [ { "$ref": "../../method/unit_method.json" diff --git a/schema/methods_directory/physical/ao/dunning.json b/schema/methods_directory/physical/ao/dunning.json index e704a30e7..e901df684 100644 --- a/schema/methods_directory/physical/ao/dunning.json +++ b/schema/methods_directory/physical/ao/dunning.json @@ -1,6 +1,7 @@ { "$id": "methods-directory/physical/ao/dunning", "$schema": "http://json-schema.org/draft-04/schema#", + "title": "unit method ao dunning", "description": "Dunning correlation-consistent basis set unit method", "allOf": [ { diff --git a/schema/methods_directory/physical/ao/other.json b/schema/methods_directory/physical/ao/other.json index 15d4cf4c2..6c64aa791 100644 --- a/schema/methods_directory/physical/ao/other.json +++ b/schema/methods_directory/physical/ao/other.json @@ -1,6 +1,7 @@ { "$id": "methods-directory/physical/ao/other", "$schema": "http://json-schema.org/draft-04/schema#", + "title": "unit method ao other", "description": "Other (neither Pople nor Dunning) basis set unit method", "allOf": [ { diff --git a/schema/methods_directory/physical/ao/pople.json b/schema/methods_directory/physical/ao/pople.json index 5a6bd7b58..a30dadb6b 100644 --- a/schema/methods_directory/physical/ao/pople.json +++ b/schema/methods_directory/physical/ao/pople.json @@ -1,6 +1,7 @@ { "$id": "methods-directory/physical/ao/pople", "$schema": "http://json-schema.org/draft-04/schema#", + "title": "unit method ao pople", "description": "Pople basis set unit method", "allOf": [ { diff --git a/schema/methods_directory/physical/psp.json b/schema/methods_directory/physical/psp.json index 7d1d0db38..927431f75 100644 --- a/schema/methods_directory/physical/psp.json +++ b/schema/methods_directory/physical/psp.json @@ -1,7 +1,7 @@ { "$id": "methods-directory/physical/psp", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Pseudopotential unit method schema", + "title": "unit method pseudopotential", "description": "Core-valence separation by means of pseudopotentials (effective potential)", "allOf": [ { diff --git a/schema/methods_directory/physical/psp/file.json b/schema/methods_directory/physical/psp/file.json index 768bba3ea..c33dce525 100644 --- a/schema/methods_directory/physical/psp/file.json +++ b/schema/methods_directory/physical/psp/file.json @@ -1,7 +1,7 @@ { "$id": "methods-directory/physical/psp/file", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pseudopotential file schema", + "title": "pseudopotential file", "properties": { "element": { "type": "string", diff --git a/schema/methods_directory/physical/pw.json b/schema/methods_directory/physical/pw.json index e136cf6db..70c79ff77 100644 --- a/schema/methods_directory/physical/pw.json +++ b/schema/methods_directory/physical/pw.json @@ -1,7 +1,7 @@ { "$id": "methods-directory/physical/pw", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Plane wave method unit schema", + "title": "unit method plane wave", "description": "Approximating the electronic wave function with a plane wave basis", "allOf": [ { diff --git a/schema/methods_directory/physical/smearing.json b/schema/methods_directory/physical/smearing.json index 099c2671a..f73d82a5d 100644 --- a/schema/methods_directory/physical/smearing.json +++ b/schema/methods_directory/physical/smearing.json @@ -1,7 +1,7 @@ { "$id": "methods-directory/physical/smearing", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Smearing methods schema for partial occupancies (Brillouin zone integration for metals)", + "title": "unit method smearing", "description": "Approximating Heaviside step function with smooth function", "allOf": [ { diff --git a/schema/methods_directory/physical/tetrahedron.json b/schema/methods_directory/physical/tetrahedron.json index 0b9ee97d4..16acfa57a 100644 --- a/schema/methods_directory/physical/tetrahedron.json +++ b/schema/methods_directory/physical/tetrahedron.json @@ -1,7 +1,7 @@ { "$id": "methods-directory/physical/tetrahedron", "$schema": "http://json-schema.org/draft-04/schema#", - "description": "Tetrahedron method (Brillouin zone integration) schema ", + "title": "unit method tetrahedron", "allOf": [ { "$ref": "../../method/unit_method.json" From 54aa2b7b8159dbf59fe4409146ec56ebd5fc7ceb Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Wed, 6 Sep 2023 12:51:30 -0700 Subject: [PATCH 13/18] chore: use consistent model names --- schema/models_directory/double_hybrid.json | 2 +- schema/models_directory/gga.json | 2 +- schema/models_directory/gw.json | 2 +- schema/models_directory/hybrid.json | 2 +- schema/models_directory/lda.json | 2 +- schema/models_directory/legacy/dft.json | 2 +- schema/models_directory/legacy/ml.json | 2 +- schema/models_directory/legacy/unknown.json | 2 +- schema/models_directory/mgga.json | 2 +- schema/models_directory/re.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/schema/models_directory/double_hybrid.json b/schema/models_directory/double_hybrid.json index 6f71a3d12..ebaf589f6 100644 --- a/schema/models_directory/double_hybrid.json +++ b/schema/models_directory/double_hybrid.json @@ -1,7 +1,7 @@ { "$id": "models-directory/double-hybrid", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Double hybrid functional model schema", + "title": "model double hybrid functional", "allOf": [ { "$ref": "../model/model_without_method.json" diff --git a/schema/models_directory/gga.json b/schema/models_directory/gga.json index 3f973323d..5003e9624 100644 --- a/schema/models_directory/gga.json +++ b/schema/models_directory/gga.json @@ -1,7 +1,7 @@ { "$id": "models-directory/gga", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Generalized Gradient Approximation model schema", + "title": "model generalized gradient approximation", "allOf": [ { "$ref": "../model/model_without_method.json" diff --git a/schema/models_directory/gw.json b/schema/models_directory/gw.json index 1148982fc..2e022673f 100644 --- a/schema/models_directory/gw.json +++ b/schema/models_directory/gw.json @@ -1,7 +1,7 @@ { "$id": "models-directory/gw", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "GW Approximation schema", + "title": "model gw approximation", "allOf": [ { "$ref": "../model/model_without_method.json" diff --git a/schema/models_directory/hybrid.json b/schema/models_directory/hybrid.json index c8c3a4b08..c8862e6ba 100644 --- a/schema/models_directory/hybrid.json +++ b/schema/models_directory/hybrid.json @@ -1,7 +1,7 @@ { "$id": "models-directory/hybrid", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Hybrid functional model schema", + "title": "model hybrid functional", "allOf": [ { "$ref": "../model/model_without_method.json" diff --git a/schema/models_directory/lda.json b/schema/models_directory/lda.json index d5691c0ec..b475e185f 100644 --- a/schema/models_directory/lda.json +++ b/schema/models_directory/lda.json @@ -1,7 +1,7 @@ { "$id": "models-directory/lda", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Local Density Approximation model schema", + "title": "model local density approximation", "allOf": [ { "$ref": "../model/model_without_method.json" diff --git a/schema/models_directory/legacy/dft.json b/schema/models_directory/legacy/dft.json index 461e1b98f..558604727 100644 --- a/schema/models_directory/legacy/dft.json +++ b/schema/models_directory/legacy/dft.json @@ -1,7 +1,7 @@ { "$id": "models-directory/legacy/dft", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "dft model legacy", + "title": "legacy model density functional theory", "allOf": [ { "$ref": "../../model.json" diff --git a/schema/models_directory/legacy/ml.json b/schema/models_directory/legacy/ml.json index b2afd5091..26600718b 100644 --- a/schema/models_directory/legacy/ml.json +++ b/schema/models_directory/legacy/ml.json @@ -1,7 +1,7 @@ { "$id": "models-directory/legacy/ml", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "ml model legacy", + "title": "legacy model regression", "allOf": [ { "$ref": "../../model.json" diff --git a/schema/models_directory/legacy/unknown.json b/schema/models_directory/legacy/unknown.json index ab9ebabfd..5235412fc 100644 --- a/schema/models_directory/legacy/unknown.json +++ b/schema/models_directory/legacy/unknown.json @@ -1,7 +1,7 @@ { "$id": "models-directory/legacy/unknown", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "unknown model legacy", + "title": "legacy model unknown", "allOf": [ { "$ref": "../../model.json" diff --git a/schema/models_directory/mgga.json b/schema/models_directory/mgga.json index 51db018d9..4e5a040ae 100644 --- a/schema/models_directory/mgga.json +++ b/schema/models_directory/mgga.json @@ -1,7 +1,7 @@ { "$id": "models-directory/mgga", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Meta Generalized Gradient Approximation model schema", + "title": "model meta generalized gradient approximation", "allOf": [ { "$ref": "../model/model_without_method.json" diff --git a/schema/models_directory/re.json b/schema/models_directory/re.json index 3d62b6860..ff735b146 100644 --- a/schema/models_directory/re.json +++ b/schema/models_directory/re.json @@ -1,7 +1,7 @@ { "$id": "models-directory/re", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "machine learning model schema", + "title": "model regression", "description": "machine learning model type/subtype schema", "allOf": [ { From 1bc495a1b4683f0ec6b3cfe546b5ec5e919d44f4 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Wed, 6 Sep 2023 13:17:30 -0700 Subject: [PATCH 14/18] chore: update required keys for regression --- schema/models_directory/re.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/schema/models_directory/re.json b/schema/models_directory/re.json index ff735b146..3d263f5aa 100644 --- a/schema/models_directory/re.json +++ b/schema/models_directory/re.json @@ -12,5 +12,9 @@ "categories": { "$ref": "../models_category/st/det/ml/re.json" } - } + }, + "required": [ + "categories", + "parameters" + ] } From ee09d910b4b1a2cabfee50ce2859882efd6799c5 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Wed, 6 Sep 2023 13:21:42 -0700 Subject: [PATCH 15/18] chore: adjust title regression legacy method --- schema/methods_directory/legacy/regression.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/methods_directory/legacy/regression.json b/schema/methods_directory/legacy/regression.json index 849de73f6..ec42bf3c2 100644 --- a/schema/methods_directory/legacy/regression.json +++ b/schema/methods_directory/legacy/regression.json @@ -1,7 +1,7 @@ { "$id": "methods-directory/legacy/regression", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "regression legacy method", + "title": "legacy method regression", "allOf": [ { "$ref": "../../method.json" From 1634b8faf308c3facee371d1cc6faf5083aada99 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Wed, 6 Sep 2023 15:16:28 -0700 Subject: [PATCH 16/18] chore: add parameters property for TS type --- schema/models_directory/re.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/schema/models_directory/re.json b/schema/models_directory/re.json index 3d263f5aa..ae37bed27 100644 --- a/schema/models_directory/re.json +++ b/schema/models_directory/re.json @@ -11,6 +11,9 @@ "properties": { "categories": { "$ref": "../models_category/st/det/ml/re.json" + }, + "parameters": { + "type": "object" } }, "required": [ From c7fb280f3fbe55347fb8f74b918d625852fe4e41 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 10 Oct 2023 14:15:42 -0700 Subject: [PATCH 17/18] chore: rename unit method type --- schema/method/unit_method.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/method/unit_method.json b/schema/method/unit_method.json index c8d462025..6765fc3d1 100644 --- a/schema/method/unit_method.json +++ b/schema/method/unit_method.json @@ -1,7 +1,7 @@ { "$id": "method/unit-method", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "categorized method unit", + "title": "categorized unit method", "allOf": [ { "$ref": "../system/path_entity.json" From 140169a73b23f880caa9eb8985472b5dd1028d13 Mon Sep 17 00:00:00 2001 From: Alexander Zech Date: Tue, 10 Oct 2023 14:16:22 -0700 Subject: [PATCH 18/18] chore: add any to pseduo enum --- schema/methods_directory/legacy/pseudopotential.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/schema/methods_directory/legacy/pseudopotential.json b/schema/methods_directory/legacy/pseudopotential.json index 335a662c9..597edd72a 100644 --- a/schema/methods_directory/legacy/pseudopotential.json +++ b/schema/methods_directory/legacy/pseudopotential.json @@ -17,7 +17,8 @@ "enum": [ "paw", "nc", - "us" + "us", + "any" ] } }