Fix config formatting

Author: kzscisoft

simvue/config/simvue_config_schema.json

@@ -13,18 +13,6 @@
     },
     "DefaultRunSpecifications": {
       "properties": {
-        "name": {
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "title": "Name"
-        },
         "description": {
           "anyOf": [
             {
@@ -37,21 +25,6 @@
           "default": null,
           "title": "Description"
         },
-        "tags": {
-          "anyOf": [
-            {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "title": "Tags"
-        },
         "folder": {
           "default": "/",
           "pattern": "^/.*",
@@ -95,6 +68,33 @@
           ],
           "title": "Mode",
           "type": "string"
+        },
+        "name": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "title": "Name"
+        },
+        "tags": {
+          "anyOf": [
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "title": "Tags"
         }
       },
       "title": "DefaultRunSpecifications",
@@ -103,6 +103,18 @@
     "EcoConfig": {
       "description": "Configurations for CO2 emission metrics gathering.\n\nParameters\n----------\nco2_signal_api_token: str | None, optional\n    the CO2 signal API token (Recommended), default is None\ncpu_thermal_design_power: int | None, optional\n    the TDP for the CPU\ngpu_thermal_design_power: int | None, optional\n    the TDP for each GPU",
       "properties": {
+        "co2_intensity": {
+          "anyOf": [
+            {
+              "type": "number"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "title": "Co2 Intensity"
+        },
         "co2_signal_api_token": {
           "anyOf": [
             {
@@ -117,7 +129,7 @@
           "default": null,
           "title": "Co2 Signal Api Token"
         },
-        "cpu_thermal_design_power": {
+        "cpu_n_cores": {
           "anyOf": [
             {
               "exclusiveMinimum": 0,
@@ -128,9 +140,9 @@
             }
           ],
           "default": null,
-          "title": "Cpu Thermal Design Power"
+          "title": "Cpu N Cores"
         },
-        "cpu_n_cores": {
+        "cpu_thermal_design_power": {
           "anyOf": [
             {
               "exclusiveMinimum": 0,
@@ -141,7 +153,7 @@
             }
           ],
           "default": null,
-          "title": "Cpu N Cores"
+          "title": "Cpu Thermal Design Power"
         },
         "gpu_thermal_design_power": {
           "anyOf": [
@@ -176,25 +188,18 @@
           ],
           "default": "1 hour",
           "title": "Intensity Refresh Interval"
-        },
-        "co2_intensity": {
-          "anyOf": [
-            {
-              "type": "number"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "title": "Co2 Intensity"
         }
       },
       "title": "EcoConfig",
       "type": "object"
     },
     "MetricsSpecifications": {
       "properties": {
+        "enable_emission_metrics": {
+          "default": false,
+          "title": "Enable Emission Metrics",
+          "type": "boolean"
+        },
         "system_metrics_interval": {
           "anyOf": [
             {
@@ -207,11 +212,6 @@
           ],
           "default": -1,
           "title": "System Metrics Interval"
-        },
-        "enable_emission_metrics": {
-          "default": false,
-          "title": "Enable Emission Metrics",
-          "type": "boolean"
         }
       },
       "title": "MetricsSpecifications",
@@ -238,31 +238,31 @@
     },
     "ServerSpecifications": {
       "properties": {
-        "url": {
+        "token": {
           "anyOf": [
             {
-              "format": "uri",
-              "minLength": 1,
-              "type": "string"
+              "format": "password",
+              "type": "string",
+              "writeOnly": true
             },
             {
               "type": "null"
             }
           ],
-          "title": "Url"
+          "title": "Token"
         },
-        "token": {
+        "url": {
           "anyOf": [
             {
-              "format": "password",
-              "type": "string",
-              "writeOnly": true
+              "format": "uri",
+              "minLength": 1,
+              "type": "string"
             },
             {
               "type": "null"
             }
           ],
-          "title": "Token"
+          "title": "Url"
         }
       },
       "required": [
@@ -280,19 +280,22 @@
         "debug": false
       }
     },
-    "server": {
-      "$ref": "#/$defs/ServerSpecifications",
-      "description": "Specifications for Simvue server"
+    "eco": {
+      "$ref": "#/$defs/EcoConfig",
+      "default": {
+        "co2_intensity": null,
+        "co2_signal_api_token": null,
+        "cpu_n_cores": null,
+        "cpu_thermal_design_power": null,
+        "gpu_thermal_design_power": null,
+        "intensity_refresh_interval": "1 hour"
+      }
     },
-    "run": {
-      "$ref": "#/$defs/DefaultRunSpecifications",
+    "metrics": {
+      "$ref": "#/$defs/MetricsSpecifications",
       "default": {
-        "name": null,
-        "description": null,
-        "tags": null,
-        "folder": "/",
-        "metadata": null,
-        "mode": "online"
+        "enable_emission_metrics": false,
+        "system_metrics_interval": -1
       }
     },
     "offline": {
@@ -301,28 +304,25 @@
         "cache": null
       }
     },
-    "metrics": {
-      "$ref": "#/$defs/MetricsSpecifications",
+    "run": {
+      "$ref": "#/$defs/DefaultRunSpecifications",
       "default": {
-        "system_metrics_interval": -1,
-        "enable_emission_metrics": false
+        "description": null,
+        "folder": "/",
+        "metadata": null,
+        "mode": "online",
+        "name": null,
+        "tags": null
       }
     },
-    "eco": {
-      "$ref": "#/$defs/EcoConfig",
-      "default": {
-        "co2_signal_api_token": null,
-        "cpu_thermal_design_power": null,
-        "cpu_n_cores": null,
-        "gpu_thermal_design_power": null,
-        "intensity_refresh_interval": "1 hour",
-        "co2_intensity": null
-      }
+    "server": {
+      "$ref": "#/$defs/ServerSpecifications",
+      "description": "Specifications for Simvue server"
     }
   },
   "required": [
     "server"
   ],
   "title": "SimvueConfiguration",
   "type": "object"
-}
+}