set additionalProperties: false on model_metadata_schema.yml

fix typo in mace.yml + gnome.yml remove non-parametric option for model_params
janosh · Feb 6, 2024 · 86ae825 · 86ae825
1 parent 80a494c
commit 86ae825
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 31 deletions.
diff --git a/models/gnome/gnome.yml b/models/gnome/gnome.yml
@@ -40,7 +40,7 @@ requirements:
   numpy: 1.26.2
   pymatgen: 2023.11.12
 trained_for_benchmark: false
-open: OSCD
+openness: OSCD
 train_task: S2EFS
 test_task: IS2RE-SR
 targets: EFS

diff --git a/models/mace/mace.yml b/models/mace/mace.yml
@@ -37,7 +37,6 @@ requirements:
   ase: 3.22.1
   pymatgen: 2023.7.14
   numpy: 1.25.0
-  834905: 0.0.1
 trained_for_benchmark: true
 train_task: S2EFS
 test_task: IS2RE-SR

diff --git a/models/voronoi_rf/voronoi_rf.yml b/models/voronoi_rf/voronoi_rf.yml
@@ -27,7 +27,7 @@ train_task: RS2RE
 test_task: IS2E
 targets: E
 model_type: Fingerprint
-model_params: non-parametric
+model_params: 0
 
 training_set:
   title: MP Computed Structure Entries

diff --git a/site/src/lib/model-metadata.d.ts b/site/src/lib/model-metadata.d.ts
@@ -28,6 +28,7 @@ export interface ModelMetadata {
   repo: string
   doi: string
   paper: string
+  url?: string
   requirements: {
     /**
      * This interface was referenced by `undefined`'s JSON-Schema definition
@@ -60,7 +61,7 @@ export interface ModelMetadata {
     training?: string
     [k: string]: unknown
   }
-  model_params: 'non-parametric' | number
+  model_params: number
   train_task:
     | 'IS2RE'
     | 'RS2RE'
@@ -83,8 +84,7 @@ export interface ModelMetadata {
     | 'IP2RE'
     | 'IS2E'
     | 'IS2RE-SR'
-  model_type?: 'GNN' | 'UIP' | 'BO_GNN' | 'Fingerprint' | 'Transformer' | 'RF'
+  model_type: 'GNN' | 'UIP' | 'BO-GNN' | 'Fingerprint' | 'Transformer' | 'RF'
   targets: 'E' | 'EFS' | 'EFSM'
   openness?: 'OSOD' | 'OSCD' | 'CSOD' | 'CSCD'
-  [k: string]: unknown
 }
diff --git a/tests/model-metadata-schema.yml b/tests/model-metadata-schema.yml
@@ -7,12 +7,10 @@ properties:
     type: string
   matbench_discovery_version:
     type: number
-  date_added:
-    type: string
-    format: date
-  date_published:
+  date_added: &date
     type: string
     format: date
+  date_published: *date
   authors:
     type: array
     items:
@@ -25,7 +23,7 @@ properties:
         email:
           type: string
           format: email
-        orcid:
+        orcid: &url
           type: string
           format: uri
       required: [name]
@@ -38,22 +36,13 @@ properties:
           type: string
         affiliation:
           type: string
-        orcid:
-          type: string
-          format: uri
-        github:
-          type: string
-          format: uri
+        orcid: *url
+        github: *url
       required: [name]
-  repo:
-    type: string
-    format: uri
-  doi:
-    type: string
-    format: uri
-  paper:
-    type: string
-    format: uri
+  repo: *url
+  doi: *url
+  paper: *url
+  url: *url
   requirements:
     type: object
     patternProperties:
@@ -103,11 +92,8 @@ properties:
       training:
         type: string
   model_params:
-    oneOf:
-      - type: string
-        enum: [non-parametric]
-      - type: number
-        minimum: 0
+    type: number
+    minimum: 0
   train_task:
     type: string
     enum: &task_enum
@@ -151,3 +137,5 @@ required:
   - train_task
   - trained_for_benchmark
   - training_set
+# disallow properties not in the schema
+additionalProperties: false