@grnsft/if 0.1.6 → 0.1.8

package/grafana/if_grafana_config.json

@@ -0,0 +1,370 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 5,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "marcusolsson-csv-datasource",
+        "uid": "<SOURCE_ID>"
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 18,
+        "x": 0,
+        "y": 0
+      },
+      "id": 3,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "<h1 style=\"font-size: 80px;\">\n        <span style=\"color: #0071C5;\">Dashboard Title</span> <b>goes here</b>",
+        "mode": "html"
+      },
+      "pluginVersion": "10.1.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "marcusolsson-csv-datasource",
+            "uid": "<SOURCE_ID>"
+          },
+          "decimalSeparator": ".",
+          "delimiter": ",",
+          "header": true,
+          "ignoreUnknown": false,
+          "refId": "A",
+          "schema": [
+            {
+              "name": "",
+              "type": "string"
+            }
+          ],
+          "skipRows": 0
+        }
+      ],
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "marcusolsson-csv-datasource",
+        "uid": "<SOURCE_ID>"
+      },
+      "description": "",
+      "gridPos": {
+        "h": 3,
+        "w": 5,
+        "x": 19,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "<p style=\"font-size: 8px; color: gray;\">\n      <u>Some detailed text</u>:<br> goes here</p>",
+        "mode": "html"
+      },
+      "pluginVersion": "10.1.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "marcusolsson-csv-datasource",
+            "uid": "<SOURCE_ID>"
+          },
+          "decimalSeparator": ".",
+          "delimiter": ",",
+          "header": true,
+          "ignoreUnknown": false,
+          "refId": "A",
+          "schema": [
+            {
+              "name": "",
+              "type": "string"
+            }
+          ],
+          "skipRows": 0
+        }
+      ],
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "marcusolsson-csv-datasource",
+        "uid": "<SOURCE_ID>"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "marcusolsson-csv-datasource",
+            "uid": "<SOURCE_ID>"
+          },
+          "decimalSeparator": ".",
+          "delimiter": ",",
+          "header": true,
+          "ignoreUnknown": false,
+          "refId": "A",
+          "schema": [
+            {
+              "name": "",
+              "type": "string"
+            }
+          ],
+          "skipRows": 0
+        }
+      ],
+      "title": "Energy [kWh]",
+      "transformations": [
+        {
+          "id": "convertFieldType",
+          "options": {
+            "conversions": [
+              {
+                "destinationType": "time",
+                "targetField": "timestamp"
+              },
+              {
+                "destinationType": "number",
+                "targetField": "energy"
+              }
+            ],
+            "fields": {}
+          }
+        }
+      ],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "marcusolsson-csv-datasource",
+        "uid": "<SOURCE_ID>"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 12
+      },
+      "id": 5,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "marcusolsson-csv-datasource",
+            "uid": "<SOURCE_ID>"
+          },
+          "decimalSeparator": ".",
+          "delimiter": ",",
+          "header": true,
+          "ignoreUnknown": false,
+          "refId": "A",
+          "schema": [
+            {
+              "name": "",
+              "type": "string"
+            }
+          ],
+          "skipRows": 0
+        }
+      ],
+      "title": "Carbon [gCO2]",
+      "transformations": [
+        {
+          "id": "convertFieldType",
+          "options": {
+            "conversions": [
+              {
+                "destinationType": "time",
+                "targetField": "timestamp"
+              },
+              {
+                "destinationType": "number",
+                "targetField": "carbon"
+              }
+            ],
+            "fields": {}
+          }
+        }
+      ],
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "2023-11-02T08:35:31.000Z",
+    "to": "2023-11-02T08:35:42.000Z"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "IF_dashboard",
+  "uid": "",
+  "version": 40,
+  "weekStart": ""
+}

package/jest.config.js

@@ -10,5 +10,5 @@ module.exports = {
       },
     ],
   },
-  modulePathIgnorePatterns: ['./build'],
+  modulePathIgnorePatterns: ['./build', './src/__tests__/unit/lib/impls'],
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@grnsft/if",
   "description": "Impact Framework",
-  "version": "v0.1.6",
+  "version": "v0.1.8",
   "author": {
     "name": "Green Software Foundation",
     "email": "info@gsf.com"
@@ -35,7 +35,6 @@
   },
   "engines": {
     "node": ">=18",
-    "yarn": ">=1.22",
     "npm": ">=8"
   },
   "homepage": "https://greensoftware.foundation",
@@ -62,7 +61,7 @@
     "fix:package": "fixpack",
     "impact-engine": "npx ts-node src/index.ts",
     "lint": "gts lint",
-    "prepublish": "yarn build",
+    "prepublish": "npm run build",
     "test": "jest --verbose"
   },
   "stability": "stable",

package/src/config/units.yaml

@@ -105,7 +105,7 @@ timestamp:
 time-reserved:
   description: time reserved for a component
   unit: seconds
-  aggregation: none
+  aggregation: avg
 total-resources:
   description: total resources available
   unit: count

package/examples/ompls/test/time-sync.yml

@@ -1,255 +0,0 @@
-name: nesting-demo
-description: impl with 2 levels of nesting with non-uniform timing of observations
-tags: null
-initialize:
-  models:
-    - name: teads-curve
-      path: '@grnsft/if-unofficial-models'
-      model: TeadsCurveModel
-    - name: sci-e
-      path: '@grnsft/if-models'
-      model: SciEModel
-    - name: sci-m
-      path: '@grnsft/if-models'
-      model: SciMModel
-    - name: sci-o
-      path: '@grnsft/if-models'
-      model: SciOModel
-    - name: time-synchronization
-      path: builtin
-      model: TimeSyncModel
-      config:
-        start-time: 2023-12-12T00:00:00.000Z
-        end-time: 2023-12-12T00:01:00.000Z
-        interval: 5
-graph:
-  children:
-    child:
-      pipeline:
-        - teads-curve
-        - sci-e
-        - sci-m
-        - sci-o
-        - time-synchronization
-      config:
-        teads-curve:
-          thermal-design-power: 65
-        sci-m:
-          total-embodied-emissions: 251000
-          time-reserved: 3600
-          expected-lifespan: 126144000
-          resources-reserved: 1
-          total-resources: 1
-        sci-o:
-          grid-carbon-intensity: 457
-      children:
-        child-1:
-          inputs:
-            - timestamp: 2023-12-12T00:00:00.000Z
-              duration: 10
-              cpu-util: 10
-              carbon: 100
-              energy: 100
-              requests: 300
-            - timestamp: 2023-12-12T00:00:10.000Z
-              duration: 10
-              cpu-util: 20
-              requests: 380
-          outputs:
-            - timestamp: '2023-12-12T00:00:00.000Z'
-              duration: 5
-              cpu-util: 8
-              carbon: 50
-              energy: 0.00002888888888888889
-              requests: 150
-              thermal-design-power: 52
-              total-embodied-emissions: 125500
-              time-reserved: 2880
-              expected-lifespan: 63072000
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 365.6
-              energy-cpu: 0.00002888888888888889
-              embodied-carbon: 3.58162100456621
-              operational-carbon: 0.013202222222222223
-            - timestamp: '2023-12-12T00:00:05.000Z'
-              duration: 5
-              cpu-util: 8
-              carbon: 50
-              energy: 0.00002888888888888889
-              requests: 150
-              thermal-design-power: 52
-              total-embodied-emissions: 125500
-              time-reserved: 2880
-              expected-lifespan: 63072000
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 365.6
-              energy-cpu: 0.00002888888888888889
-              embodied-carbon: 3.58162100456621
-              operational-carbon: 0.013202222222222223
-            - timestamp: '2023-12-12T00:00:10.000Z'
-              duration: 5
-              cpu-util: 16
-              requests: 190
-              thermal-design-power: 52
-              total-embodied-emissions: 125500
-              time-reserved: 2880
-              expected-lifespan: 63072000
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 365.6
-              energy-cpu: 0.000043127731199186996
-              energy: 0.000043127731199186996
-              embodied-carbon: 3.58162100456621
-              operational-carbon: 0.019709373158028454
-            - timestamp: '2023-12-12T00:00:15.000Z'
-              duration: 5
-              cpu-util: 16
-              requests: 190
-              thermal-design-power: 52
-              total-embodied-emissions: 125500
-              time-reserved: 2880
-              expected-lifespan: 63072000
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 365.6
-              energy-cpu: 0.000043127731199186996
-              energy: 0.000043127731199186996
-              embodied-carbon: 3.58162100456621
-              operational-carbon: 0.019709373158028454
-            - timestamp: '2023-12-12T00:00:20.000Z'
-              duration: 5
-              cpu-util: 0
-              requests: 0
-              thermal-design-power: 0
-              total-embodied-emissions: 0
-              time-reserved: 0.8
-              expected-lifespan: 0
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 0
-              energy-cpu: 0
-              energy: 0
-              embodied-carbon: 0
-              operational-carbon: 0
-            - timestamp: '2023-12-12T00:00:25.000Z'
-              duration: 5
-              cpu-util: 0
-              requests: 0
-              thermal-design-power: 0
-              total-embodied-emissions: 0
-              time-reserved: 0.8
-              expected-lifespan: 0
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 0
-              energy-cpu: 0
-              energy: 0
-              embodied-carbon: 0
-              operational-carbon: 0
-            - timestamp: '2023-12-12T00:00:30.000Z'
-              duration: 5
-              cpu-util: 0
-              requests: 0
-              thermal-design-power: 0
-              total-embodied-emissions: 0
-              time-reserved: 0.8
-              expected-lifespan: 0
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 0
-              energy-cpu: 0
-              energy: 0
-              embodied-carbon: 0
-              operational-carbon: 0
-            - timestamp: '2023-12-12T00:00:35.000Z'
-              duration: 5
-              cpu-util: 0
-              requests: 0
-              thermal-design-power: 0
-              total-embodied-emissions: 0
-              time-reserved: 0.8
-              expected-lifespan: 0
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 0
-              energy-cpu: 0
-              energy: 0
-              embodied-carbon: 0
-              operational-carbon: 0
-            - timestamp: '2023-12-12T00:00:40.000Z'
-              duration: 5
-              cpu-util: 0
-              requests: 0
-              thermal-design-power: 0
-              total-embodied-emissions: 0
-              time-reserved: 0.8
-              expected-lifespan: 0
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 0
-              energy-cpu: 0
-              energy: 0
-              embodied-carbon: 0
-              operational-carbon: 0
-            - timestamp: '2023-12-12T00:00:45.000Z'
-              duration: 5
-              cpu-util: 0
-              requests: 0
-              thermal-design-power: 0
-              total-embodied-emissions: 0
-              time-reserved: 0.8
-              expected-lifespan: 0
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 0
-              energy-cpu: 0
-              energy: 0
-              embodied-carbon: 0
-              operational-carbon: 0
-            - timestamp: '2023-12-12T00:00:50.000Z'
-              duration: 5
-              cpu-util: 0
-              requests: 0
-              thermal-design-power: 0
-              total-embodied-emissions: 0
-              time-reserved: 0.8
-              expected-lifespan: 0
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 0
-              energy-cpu: 0
-              energy: 0
-              embodied-carbon: 0
-              operational-carbon: 0
-            - timestamp: '2023-12-12T00:00:55.000Z'
-              duration: 5
-              cpu-util: 0
-              requests: 0
-              thermal-design-power: 0
-              total-embodied-emissions: 0
-              time-reserved: 0.8
-              expected-lifespan: 0
-              resources-reserved: 0.8
-              total-resources: 0.8
-              grid-carbon-intensity: 0
-              energy-cpu: 0
-              energy: 0
-              embodied-carbon: 0
-              operational-carbon: 0
-            - timestamp: '2023-12-12T00:01:00.000Z'
-              duration: 1
-              cpu-util: 0
-              requests: 0
-              thermal-design-power: 0
-              total-embodied-emissions: 0
-              time-reserved: 0
-              expected-lifespan: 0
-              resources-reserved: 0
-              total-resources: 0
-              grid-carbon-intensity: 0
-              energy-cpu: 0
-              energy: 0
-              embodied-carbon: 0
-              operational-carbon: 0