Merge pull request #995 from Green-Software-Foundation/sci-redesign

Sci-embodied redesign

manifests/examples/builtins/sci-embodied/scenario-1.yml

@@ -0,0 +1,27 @@
+name: embodied-carbon demo
+description:
+tags:
+aggregation:
+  metrics:
+    - embodied-carbon
+  type: "both"
+initialize:
+  plugins:
+    embodied-carbon:
+      method: SciEmbodied
+      path: builtin
+      config:
+        output-parameter: "embodied-carbon"
+tree:
+  children:
+    child:
+      pipeline:
+        compute:
+          - embodied-carbon
+      inputs:
+        - timestamp: 2023-08-06T00:00
+          duration: 3600
+          hdd: 2
+        - timestamp: 2023-08-06T10:00
+          duration: 3600
+          hdd: 2

manifests/examples/builtins/sci-embodied/scenario-2.yml

@@ -0,0 +1,37 @@
+name: embodied-carbon demo
+description:
+tags:
+initialize:
+  plugins:
+    embodied-carbon:
+      method: SciEmbodied
+      path: builtin
+      config:
+        baseline-vcpus: 1
+        baseline-memory: 16
+        lifespan: 157680000 
+        baseline-emissions: 2000000
+        vcpu-emissions-constant: 100000
+        memory-emissions-constant: 1172
+        ssd-emissions-constant: 50000
+        hdd-emissions-constant: 100000 
+        gpu-emissions-constant: 150000
+        output-parameter: "embodied-carbon"
+tree:
+  children:
+    child:
+      pipeline:
+        compute:
+          - embodied-carbon
+      defaults:
+        vCPUs: 4
+        memory: 32
+        ssd: 1
+        hdd: 1
+        gpu: 1
+        total-vcpus: 16
+      inputs:
+        - timestamp: 2023-08-06T00:00
+          duration: 3600
+        - timestamp: 2023-08-06T10:00
+          duration: 3600

manifests/examples/builtins/sci-embodied/success.yml

@@ -3,14 +3,24 @@ description: successful path
 tags:
 initialize:
   plugins:
-    "sci-embodied": # a model that calculates m from te, tir, el, rr and rtor
+    "csv-lookup":
+      path: builtin
+      method: CSVLookup
+      config:
+        filepath: >-
+          https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-azure-instances.csv
+        query:
+          instance-class: cloud/instance-type
+        output: ["cpu-cores-utilized", "vcpus-allocated"]
+    "sci-embodied-new": # a model that calculates m from te, tir, el, rr and rtor
       method: SciEmbodied
       path: "builtin"
 tree:
   children:
     child:
       pipeline:
         compute:
+          - csv-lookup
           - sci-embodied # duration & config -> embodied
       defaults:
         device/emissions-embodied: 1533.120 # gCO2eq

package.json

@@ -20,7 +20,7 @@
   "dependencies": {
     "@commitlint/cli": "^18.6.0",
     "@commitlint/config-conventional": "^18.6.0",
-    "@grnsft/if-core": "^0.0.18",
+    "@grnsft/if-core": "^0.0.20",
     "axios": "^1.7.2",
     "csv-parse": "^5.5.6",
     "csv-stringify": "^6.4.6",
@@ -86,7 +86,6 @@
     "lint": "gts lint",
     "pre-commit": "lint-staged",
     "prepare": "husky install",
-    "prepublish": "npm run build",
     "release": "release-it",
     "test": "jest --verbose --testPathPattern=src/__tests__/"
   },