@grnsft/if 0.4.0 → 0.5.0

package/manifests/{plugins → examples/builtins}/divide/success.yml

@@ -2,11 +2,17 @@ name: divide
 description: success path
 tags:
 initialize:
-#  outputs: ['yaml']
+  # outputs: ['yaml']
   plugins:
     cloud-metadata:
-      method: CloudMetadata
-      path: "@grnsft/if-plugins"
+      path: builtin
+      method: CSVLookup
+      global-config:
+        filepath: >-
+          https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-aws-instances.csv
+        query:
+          instance-class: cloud/instance-type
+        output: ['cpu-cores-utilized', 'vcpus-allocated']
     divide:
       method: Divide
       path: "builtin"
@@ -14,19 +20,12 @@ initialize:
         numerator: vcpus-allocated
         denominator: 2
         output: cpu/number-cores
-    boavizta-cpu:
-      method: BoaviztaCpuOutput
-      path: "@grnsft/if-unofficial-plugins"
-      global-config:
-        allocation: LINEAR
-        verbose: true
 tree:
   children:
     child:
       pipeline:
         - cloud-metadata
         - divide
-        - boavizta-cpu
       config:
         divide:
       defaults:

package/manifests/examples/builtins/exponent/success.yml

@@ -0,0 +1,25 @@
+name: exponent demo
+description:
+tags:
+initialize:
+  # outputs: [yaml]
+  plugins:
+    exponent:
+      method: Exponent
+      path: 'builtin'
+      global-config:
+        input-parameter: 'cpu/energy'
+        exponent: 2
+        output-parameter: 'energy'
+tree:
+  children:
+    child:
+      pipeline:
+        - exponent
+      config:
+        exponent:
+      inputs:
+        - timestamp: 2023-08-06T00:00
+          duration: 3600
+          cpu/energy: 0.001
+          network/energy: 0.001

package/manifests/{plugins → examples/builtins}/groupby/success.yml

@@ -1,7 +1,7 @@
 name: groupby
 description: successful path
 initialize:
-  outputs: ['yaml']
+  # outputs: ['yaml']
   plugins:
     group-by:
       path: "builtin"

package/manifests/examples/builtins/interpolation/success.yml

@@ -0,0 +1,23 @@
+name: interpolation-demo
+description: simple demo of interpolation plugin
+tags:
+initialize:
+  plugins:
+    interpolation:
+      method: Interpolation
+      path: "builtin"
+      global-config:
+        method: linear
+        x: [0, 10, 50, 100]
+        y: [0.12, 0.32, 0.75, 1.02]
+        input-parameter: "cpu/utilization"
+        output-parameter: "result"
+tree:
+  children:
+    child:
+      pipeline:
+        - interpolation
+      inputs:
+        - timestamp: 2023-07-06T00:00
+          duration: 3600
+          cpu/utilization: 45

package/manifests/{plugins → examples/builtins}/sci/failure-missing-input-param.yml

@@ -8,17 +8,13 @@ initialize:
       kind: plugin
       method: Sci
       path: "builtin"
-      # global-config:
-      #   functional-unit: requests
+      global-config:
+        functional-unit: requests
 tree:
   children:
     child:
       pipeline:
         - sci
-      config:
-        sci:
-          functional-unit-time: 1 sec
-          functional-unit: requests # factor to convert per time to per f.unit
       inputs:
         - timestamp: 2023-07-06T00:00
           duration: 3600

package/manifests/{plugins → examples/builtins}/sci/success.yml

@@ -16,9 +16,6 @@ tree:
       pipeline:
         - sci
       config:
-        sci:
-          functional-unit-time: 1 sec
-          functional-unit: requests # factor to convert per time to per f.unit
       inputs:
         - timestamp: 2023-07-06T00:00
           duration: 3600

package/manifests/examples/builtins/subtract/success.yml

@@ -0,0 +1,24 @@
+name: subtract demo
+description:
+tags:
+initialize:
+  # outputs: ['yaml']
+  plugins:
+    subtract:
+      method: Subtract
+      path: 'builtin'
+      global-config:
+        input-parameters: ['cpu/energy', 'network/energy']
+        output-parameter: 'energy/diff'
+tree:
+  children:
+    child:
+      pipeline:
+        - subtract
+      config:
+        subtract:
+      inputs:
+        - timestamp: 2023-08-06T00:00
+          duration: 3600
+          cpu/energy: 0.003
+          network/energy: 0.001

package/manifests/{plugins → examples/builtins}/sum/success.yml

@@ -2,7 +2,7 @@ name: sum
 description: successful path
 tags:
 initialize:
-  outputs: ['yaml']
+  # outputs: ['yaml']
   plugins:
     sum:
       method: Sum

package/manifests/examples/{generics.yml → pipelines/generics.yml}

@@ -2,25 +2,55 @@ name: generics
 description: a pipeline that does arbitrary calculations using our generic arithmetic builtins
 tags:
 initialize:
+  # outputs: [yaml]
   plugins:
-    teads-curve:
-      path: "@grnsft/if-unofficial-plugins"
-      method: TeadsCurve
+    "interpolate":
+      method: Interpolation
+      path: 'builtin'
       global-config:
-        interpolation: spline
-    "sum":
+        method: linear
+        x: [0, 10, 50, 100]
+        y: [0.12, 0.32, 0.75, 1.02]
+        input-parameter: 'cpu/utilization'
+        output-parameter: 'cpu-factor'
+    "cpu-factor-to-wattage":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-factor", "cpu/thermal-design-power"]
+        output-parameter: "cpu-wattage"
+    "wattage-times-duration":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-wattage", "duration"]
+        output-parameter: "cpu-wattage-times-duration"
+    "wattage-to-energy-kwh":
+      method: Divide
+      path: "builtin"
+      global-config:
+        numerator: cpu-wattage-times-duration
+        denominator: 3600000
+        output: cpu-energy-raw
+    "calculate-vcpu-ratio":
+      method: Divide
+      path: "builtin"
+      global-config:
+        numerator: vcpus-total
+        denominator: vcpus-allocated
+        output: vcpu-ratio
+    "correct-cpu-energy-for-vcpu-ratio":
+      method: Divide
       path: "builtin"
-      method: Sum
       global-config:
-        input-parameters:
-          - cpu/energy
-          - network/energy
-        output-parameter: energy-sum
+        numerator: cpu-energy-raw
+        denominator: vcpu-ratio
+        output: cpu-energy-kwh
     "coefficient":
       path: "builtin"
       method: Coefficient
       global-config:
-        input-parameter: energy
+        input-parameter: cpu-energy-kwh
         coefficient: 2
         output-parameter: energy-doubled
     "multiply":
@@ -33,13 +63,19 @@ tree:
   children:
     child-1:
       pipeline:
-        - teads-curve
-        - sum
+        - interpolate
+        - cpu-factor-to-wattage
+        - wattage-times-duration
+        - wattage-to-energy-kwh
+        - calculate-vcpu-ratio
+        - correct-cpu-energy-for-vcpu-ratio      
         - coefficient
         - multiply
       config:
       defaults:
         cpu/thermal-design-power: 100
+        vcpus-allocated: 1
+        vcpus-total: 8
       inputs:
         - timestamp: "2023-12-12T00:00:00.000Z"
           cloud/instance-type: A1

package/manifests/examples/{nesting.yml → pipelines/nesting.yml}

@@ -7,31 +7,62 @@ tags:
 aggregation:
   metrics:
     - "carbon"
-    - "energy"
   type: "both"
 params:
 initialize:
-  outputs: ['yaml']
+  # outputs: ['yaml']
   plugins:
-    teads-curve:
-      path: "@grnsft/if-unofficial-plugins"
-      method: TeadsCurve
+    "interpolate":
+      method: Interpolation
+      path: 'builtin'
       global-config:
-        interpolation: spline
-    sum:
+        method: linear
+        x: [0, 10, 50, 100]
+        y: [0.12, 0.32, 0.75, 1.02]
+        input-parameter: 'cpu/utilization'
+        output-parameter: 'cpu-factor'
+    "cpu-factor-to-wattage":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-factor", "cpu/thermal-design-power"]
+        output-parameter: "cpu-wattage"
+    "wattage-times-duration":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-wattage", "duration"]
+        output-parameter: "cpu-wattage-times-duration"
+    "wattage-to-energy-kwh":
+      method: Divide
       path: "builtin"
-      method: Sum
       global-config:
-        input-parameters:
-          - cpu/energy
-          - network/energy
-        output-parameter: energy
+        numerator: cpu-wattage-times-duration
+        denominator: 3600000
+        output: cpu-energy-raw
+    "calculate-vcpu-ratio":
+      method: Divide
+      path: "builtin"
+      global-config:
+        numerator: vcpus-total
+        denominator: vcpus-allocated
+        output: vcpu-ratio
+    "correct-cpu-energy-for-vcpu-ratio":
+      method: Divide
+      path: "builtin"
+      global-config:
+        numerator: cpu-energy-raw
+        denominator: vcpu-ratio
+        output: cpu-energy-kwh
     sci-embodied:
       path: "builtin"
       method: SciEmbodied
-    sci-o:
-      path: "@grnsft/if-plugins"
-      method: SciO
+    "operational-carbon":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-energy-kwh", "grid/carbon-intensity"]
+        output-parameter: "carbon-operational"
     sci:
       path: "builtin"
       method: Sci
@@ -62,13 +93,17 @@ tree:
         device/emissions-embodied: 1533.120 # gCO2eq
         time-reserved: 3600 # 1hr in seconds
         device/expected-lifespan: 94608000 # 3 years in seconds
-        resources-reserved: 1
-        resources-total: 8
+        vcpus-allocated: 1
+        vcpus-total: 8
       pipeline:
-        - teads-curve
-        - sum
+        - interpolate
+        - cpu-factor-to-wattage
+        - wattage-times-duration
+        - wattage-to-energy-kwh
+        - calculate-vcpu-ratio
+        - correct-cpu-energy-for-vcpu-ratio
         - sci-embodied
-        - sci-o
+        - operational-carbon
         - sum-carbon
         - time-sync
         - sci
@@ -108,13 +143,17 @@ tree:
         device/emissions-embodied: 1533.120 # gCO2eq
         time-reserved: 3600 # 1hr in seconds
         device/expected-lifespan: 94608000 # 3 years in seconds
-        resources-reserved: 1
-        resources-total: 8
+        vcpus-allocated: 1
+        vcpus-total: 8
       pipeline:
-        - teads-curve
-        - sum
+        - interpolate
+        - cpu-factor-to-wattage
+        - wattage-times-duration
+        - wattage-to-energy-kwh
+        - calculate-vcpu-ratio
+        - correct-cpu-energy-for-vcpu-ratio
         - sci-embodied
-        - sci-o
+        - operational-carbon
         - sum-carbon
         - time-sync
         - sci
@@ -156,13 +195,17 @@ tree:
             device/emissions-embodied: 1533.120 # gCO2eq
             time-reserved: 3600 # 1hr in seconds
             device/expected-lifespan: 94608000 # 3 years in seconds
-            resources-reserved: 1
-            resources-total: 8
+            vcpus-allocated: 1
+            vcpus-total: 8
           pipeline:
-            - teads-curve
-            - sum
+            - interpolate
+            - cpu-factor-to-wattage
+            - wattage-times-duration
+            - wattage-to-energy-kwh
+            - calculate-vcpu-ratio
+            - correct-cpu-energy-for-vcpu-ratio
             - sci-embodied
-            - sci-o
+            - operational-carbon
             - sum-carbon
             - time-sync
             - sci
@@ -202,13 +245,17 @@ tree:
             device/emissions-embodied: 1533.120 # gCO2eq
             time-reserved: 3600 # 1hr in seconds
             device/expected-lifespan: 94608000 # 3 years in seconds
-            resources-reserved: 1
-            resources-total: 8
+            vcpus-allocated: 1
+            vcpus-total: 8
           pipeline:
-            - teads-curve
-            - sum
+            - interpolate
+            - cpu-factor-to-wattage
+            - wattage-times-duration
+            - wattage-to-energy-kwh
+            - calculate-vcpu-ratio
+            - correct-cpu-energy-for-vcpu-ratio
             - sci-embodied
-            - sci-o
+            - operational-carbon
             - sum-carbon
             - time-sync
             - sci

package/manifests/examples/{pipeline-teads-sci.yml → pipelines/pipeline-teads-sci.yml}

@@ -3,25 +3,57 @@ description: a full pipeline seeded with some hardcoded input data and yielding
 tags:
 initialize:
   plugins:
-    "teads-curve":
-      path: "@grnsft/if-unofficial-plugins"
-      method: TeadsCurve
+    "interpolate":
+      method: Interpolation
+      path: 'builtin'
       global-config:
-        interpolation: spline
-    "sum":
+        method: linear
+        x: [0, 10, 50, 100]
+        y: [0.12, 0.32, 0.75, 1.02]
+        input-parameter: 'cpu/utilization'
+        output-parameter: 'cpu-factor'
+    "cpu-factor-to-wattage":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-factor", "cpu/thermal-design-power"]
+        output-parameter: "cpu-wattage"
+    "wattage-times-duration":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-wattage", "duration"]
+        output-parameter: "cpu-wattage-times-duration"
+    "wattage-to-energy-kwh":
+      method: Divide
       path: "builtin"
-      method: Sum
       global-config:
-        input-parameters:
-          - cpu/energy
-          - network/energy
-        output-parameter: energy
+        numerator: cpu-wattage-times-duration
+        denominator: 3600000
+        output: cpu-energy-raw
+    "calculate-vcpu-ratio":
+      method: Divide
+      path: "builtin"
+      global-config:
+        numerator: vcpus-total
+        denominator: vcpus-allocated
+        output: vcpu-ratio
+    "correct-cpu-energy-for-vcpu-ratio":
+      method: Divide
+      path: "builtin"
+      global-config:
+        numerator: cpu-energy-raw
+        denominator: vcpu-ratio
+        output: cpu-energy-kwh
     "sci-embodied":
       path: "builtin"
       method: SciEmbodied
-    "sci-o":
-      path: "@grnsft/if-plugins"
-      method: SciO
+    "operational-carbon":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-energy-kwh", "grid/carbon-intensity"]
+        output-parameter: "carbon-operational"
     "sci":
       path: "builtin"
       method: Sci
@@ -47,10 +79,14 @@ tree:
   children:
     child-1:
       pipeline:
-        - teads-curve
-        - sum
+        - interpolate
+        - cpu-factor-to-wattage
+        - wattage-times-duration
+        - wattage-to-energy-kwh
+        - calculate-vcpu-ratio
+        - correct-cpu-energy-for-vcpu-ratio
         - sci-embodied
-        - sci-o
+        - operational-carbon
         - sum-carbon
         - sci
       config:
@@ -60,8 +96,8 @@ tree:
         device/emissions-embodied: 1533.120 # gCO2eq
         time-reserved: 3600 # 1hr in seconds
         device/expected-lifespan: 94608000 # 3 years in seconds
-        resources-reserved: 1
-        resources-total: 8
+        vcpus-total: 8
+        vcpus-allocated: 1
         component: 1
       inputs:
         - timestamp: "2023-12-12T00:00:00.000Z"

package/manifests/examples/{pipeline-with-aggregate.yml → pipelines/pipeline-with-aggregate.yml}

@@ -7,25 +7,62 @@ aggregation:
   type: "both"
 initialize:
   plugins:
-    "teads-curve":
-      path: "@grnsft/if-unofficial-plugins"
-      method: TeadsCurve
+    "interpolate":
+      method: Interpolation
+      path: 'builtin'
       global-config:
-        interpolation: spline
-    "sci-e":
-      path: "@grnsft/if-plugins"
-      method: SciE
+        method: linear
+        x: [0, 10, 50, 100]
+        y: [0.12, 0.32, 0.75, 1.02]
+        input-parameter: 'cpu/utilization'
+        output-parameter: 'cpu-factor'
+    "cpu-factor-to-wattage":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-factor", "cpu/thermal-design-power"]
+        output-parameter: "cpu-wattage"
+    "wattage-times-duration":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-wattage", "duration"]
+        output-parameter: "cpu-wattage-times-duration"
+    "wattage-to-energy-kwh":
+      method: Divide
+      path: "builtin"
+      global-config:
+        numerator: cpu-wattage-times-duration
+        denominator: 3600000
+        output: cpu-energy-raw
+    "calculate-vcpu-ratio":
+      method: Divide
+      path: "builtin"
+      global-config:
+        numerator: vcpus-total
+        denominator: vcpus-allocated
+        output: vcpu-ratio
+    "correct-cpu-energy-for-vcpu-ratio":
+      method: Divide
+      path: "builtin"
+      global-config:
+        numerator: cpu-energy-raw
+        denominator: vcpu-ratio
+        output: cpu-energy-kwh
     "sci-embodied":
       path: "builtin"
       method: SciEmbodied
-    "sci-o":
-      path: "@grnsft/if-plugins"
-      method: SciO
+    "operational-carbon":
+      method: Multiply
+      path: builtin
+      global-config:
+        input-parameters: ["cpu-energy-kwh", "grid/carbon-intensity"]
+        output-parameter: "carbon-operational"
     "sci":
       path: "builtin"
       method: Sci
       global-config:
-        functional-unit: "requests"
+        functional-unit: requests # factor to convert per time to per f.unit
     "sum-carbon":
       path: "builtin"
       method: Sum
@@ -42,17 +79,18 @@ initialize:
         end-time: "2023-12-12T00:01:00.000Z"
         interval: 5
         allow-padding: true
-    "group-by":
-      path: builtin
-      method: GroupBy
 tree:
   children:
     child-1:
       pipeline:
-        - teads-curve
-        - sci-e
+        - interpolate
+        - cpu-factor-to-wattage
+        - wattage-times-duration
+        - wattage-to-energy-kwh
+        - calculate-vcpu-ratio
+        - correct-cpu-energy-for-vcpu-ratio
         - sci-embodied
-        - sci-o
+        - operational-carbon
         - sum-carbon
         - time-sync
         - sci
@@ -67,8 +105,8 @@ tree:
         device/emissions-embodied: 1533.120 # gCO2eq
         time-reserved: 3600 # 1hr in seconds
         device/expected-lifespan: 94608000 # 3 years in seconds
-        resources-reserved: 1
-        resources-total: 8
+        vcpus-total: 8
+        vcpus-allocated: 1
       inputs:
         - timestamp: "2023-12-12T00:00:00.000Z"
           cloud/instance-type: A1
@@ -96,10 +134,14 @@ tree:
           requests: 30
     child-2:
       pipeline:
-        - teads-curve
-        - sci-e
+        - interpolate
+        - cpu-factor-to-wattage
+        - wattage-times-duration
+        - wattage-to-energy-kwh
+        - calculate-vcpu-ratio
+        - correct-cpu-energy-for-vcpu-ratio
         - sci-embodied
-        - sci-o
+        - operational-carbon
         - sum-carbon
         - time-sync
         - sci
@@ -114,8 +156,8 @@ tree:
         device/emissions-embodied: 1533.120 # gCO2eq
         time-reserved: 3600 # 1hr in seconds
         device/expected-lifespan: 94608000 # 3 years in seconds
-        resources-reserved: 1
-        resources-total: 8
+        vcpus-total: 8
+        vcpus-allocated: 1
       inputs:
         - timestamp: "2023-12-12T00:00:00.000Z"
           duration: 1
@@ -140,4 +182,4 @@ tree:
           cpu/utilization: 33
           cloud/instance-type: A1
           cloud/region: uk-west
-          requests: 180
+          requests: 180