Merge pull request #14 from omnibenchmark/collector

Collector
omnibenchmark · Feb 4, 2025 · 6bd04e1 · 6bd04e1
2 parents b9bb182 + 921ce89
commit 6bd04e1
Show file tree

Hide file tree

Showing 11 changed files with 274 additions and 279 deletions.
diff --git a/project/excel/omni_schema.xlsx b/project/excel/omni_schema.xlsx
diff --git a/project/graphql/omni_schema.graphql b/project/graphql/omni_schema.graphql
@@ -10,7 +10,7 @@ type Benchmark
     storage: String!
     storageApi: StorageAPIEnum!
     storageBucketName: String!
-    softwareEnvironments: [SoftwareEnvironment]!
+    softwareEnvironments: [SoftwareEnvironment]
     benchmarkYamlSpec: String
     metricCollectors: [MetricCollector]
     stages: [Stage]!

diff --git a/project/jsonld/omni_schema.context.jsonld b/project/jsonld/omni_schema.context.jsonld
@@ -1,7 +1,7 @@
 {
    "comments": {
       "description": "Auto generated by LinkML jsonld context generator",
-      "generation_date": "2025-02-04T16:25:11",
+      "generation_date": "2025-02-04T16:59:43",
       "source": "omni_schema.yaml"
    },
    "@context": {

diff --git a/project/jsonld/omni_schema.jsonld b/project/jsonld/omni_schema.jsonld
@@ -617,6 +617,22 @@
       "inlined": true,
       "@type": "SlotDefinition"
     },
+    {
+      "name": "metric_collectors",
+      "definition_uri": "https://w3id.org/omnibenchmark/omni-schema/metric_collectors",
+      "description": "Metric collecting/gathering module(s)",
+      "from_schema": "https://w3id.org/omnibenchmark/omni-schema",
+      "slot_uri": "https://w3id.org/omnibenchmark/omni-schema/metric_collectors",
+      "owner": "Benchmark",
+      "domain_of": [
+        "Benchmark"
+      ],
+      "range": "MetricCollector",
+      "multivalued": true,
+      "inlined": true,
+      "inlined_as_list": true,
+      "@type": "SlotDefinition"
+    },
     {
       "name": "software_environments",
       "definition_uri": "https://w3id.org/omnibenchmark/omni-schema/software_environments",
@@ -628,7 +644,6 @@
         "Benchmark"
       ],
       "range": "SoftwareEnvironment",
-      "required": true,
       "multivalued": true,
       "inlined": true,
       "inlined_as_list": true,
@@ -780,20 +795,6 @@
       ],
       "range": "string",
       "@type": "SlotDefinition"
-    },
-    {
-      "name": "metric_collectors",
-      "definition_uri": "https://w3id.org/omnibenchmark/omni-schema/metric_collectors",
-      "description": "Metric collecting/gathering module(s)",
-      "from_schema": "https://w3id.org/omnibenchmark/omni-schema",
-      "slot_uri": "https://w3id.org/omnibenchmark/omni-schema/metric_collectors",
-      "owner": "Benchmark",
-      "domain_of": [
-        "Benchmark"
-      ],
-      "range": "MetricCollector",
-      "multivalued": true,
-      "@type": "SlotDefinition"
     }
   ],
   "classes": [
@@ -972,9 +973,9 @@
   ],
   "metamodel_version": "1.7.0",
   "source_file": "omni_schema.yaml",
-  "source_file_date": "2025-02-04T16:24:53",
-  "source_file_size": 5921,
-  "generation_date": "2025-02-04T16:25:11",
+  "source_file_date": "2025-02-04T16:59:36",
+  "source_file_size": 5964,
+  "generation_date": "2025-02-04T16:59:43",
   "@type": "SchemaDefinition",
   "@context": [
     "project/jsonld/omni_schema.context.jsonld",

diff --git a/project/jsonschema/omni_schema.schema.json b/project/jsonschema/omni_schema.schema.json
@@ -29,7 +29,7 @@
                 "metric_collectors": {
                     "description": "Metric collecting/gathering module(s)",
                     "items": {
-                        "type": "string"
+                        "$ref": "#/$defs/MetricCollector"
                     },
                     "type": [
                         "array",
@@ -52,7 +52,10 @@
                     "items": {
                         "$ref": "#/$defs/SoftwareEnvironment"
                     },
-                    "type": "array"
+                    "type": [
+                        "array",
+                        "null"
+                    ]
                 },
                 "stages": {
                     "items": {
@@ -84,7 +87,6 @@
                 "storage",
                 "storage_api",
                 "storage_bucket_name",
-                "software_environments",
                 "stages",
                 "id"
             ],
@@ -459,7 +461,7 @@
         "metric_collectors": {
             "description": "Metric collecting/gathering module(s)",
             "items": {
-                "type": "string"
+                "$ref": "#/$defs/MetricCollector"
             },
             "type": [
                 "array",
@@ -482,7 +484,10 @@
             "items": {
                 "$ref": "#/$defs/SoftwareEnvironment"
             },
-            "type": "array"
+            "type": [
+                "array",
+                "null"
+            ]
         },
         "stages": {
             "items": {
@@ -514,7 +519,6 @@
         "storage",
         "storage_api",
         "storage_bucket_name",
-        "software_environments",
         "stages",
         "id"
     ],