@grnsft/if 0.1.2 → 0.1.3

package/coverage/lcov.info

@@ -2,7 +2,7 @@ TN:
 SF:src/config/config.ts
 FNF:0
 FNH:0
-DA:5,3
+DA:5,4
 LF:1
 LH:1
 BRF:0
@@ -14,10 +14,10 @@ FN:1,(anonymous_0)
 FN:2,(anonymous_1)
 FNF:2
 FNH:2
-FNDA:3,(anonymous_0)
+FNDA:6,(anonymous_0)
 FNDA:8,(anonymous_1)
-DA:1,6
-DA:2,11
+DA:1,10
+DA:2,12
 LF:2
 LH:2
 BRF:0
@@ -35,7 +35,7 @@ FNDA:3,(anonymous_0)
 FNDA:5,(anonymous_1)
 FNDA:3,(anonymous_2)
 FNDA:3,(anonymous_3)
-DA:3,4
+DA:3,5
 DA:11,3
 DA:13,5
 DA:31,3
@@ -125,108 +125,187 @@ FN:20,(anonymous_1)
 FN:31,(anonymous_2)
 FNF:3
 FNH:3
-FNDA:12,(anonymous_0)
-FNDA:19,(anonymous_1)
-FNDA:13,(anonymous_2)
+FNDA:20,(anonymous_0)
+FNDA:37,(anonymous_1)
+FNDA:17,(anonymous_2)
 DA:6,2
-DA:8,12
-DA:14,12
-DA:21,19
-DA:23,19
-DA:25,19
-DA:32,13
+DA:8,20
+DA:14,20
+DA:21,37
+DA:23,37
+DA:25,37
+DA:32,17
 LF:7
 LH:7
-BRDA:21,0,0,10
-BRDA:21,0,1,9
+BRDA:21,0,0,20
+BRDA:21,0,1,17
 BRF:2
 BRH:2
 end_of_record
 TN:
+SF:src/lib/planet-aggregator.ts
+FN:18,(anonymous_0)
+FN:34,(anonymous_1)
+FNF:2
+FNH:2
+FNDA:18,(anonymous_0)
+FNDA:22,(anonymous_1)
+DA:1,2
+DA:3,2
+DA:11,2
+DA:13,2
+DA:18,2
+DA:22,18
+DA:26,2
+DA:31,16
+DA:32,16
+DA:34,16
+DA:35,22
+DA:36,28
+DA:37,2
+DA:42,26
+DA:43,26
+DA:44,26
+DA:45,26
+DA:47,26
+DA:48,16
+DA:49,13
+DA:54,20
+LF:21
+LH:21
+BRDA:22,0,0,2
+BRDA:23,1,0,18
+BRDA:23,1,1,17
+BRDA:36,2,0,2
+BRDA:44,3,0,26
+BRDA:44,3,1,16
+BRDA:47,4,0,16
+BRDA:48,5,0,13
+BRF:8
+BRH:8
+end_of_record
+TN:
 SF:src/lib/supercomputer.ts
-FN:23,(anonymous_0)
-FN:31,(anonymous_1)
-FN:37,(anonymous_2)
-FN:52,(anonymous_3)
-FN:60,(anonymous_4)
-FN:73,(anonymous_5)
-FN:139,(anonymous_6)
-FNF:7
-FNH:7
-FNDA:6,(anonymous_0)
-FNDA:16,(anonymous_1)
-FNDA:16,(anonymous_2)
-FNDA:8,(anonymous_3)
-FNDA:11,(anonymous_4)
-FNDA:10,(anonymous_5)
-FNDA:6,(anonymous_6)
+FN:28,(anonymous_0)
+FN:36,(anonymous_1)
+FN:43,(anonymous_2)
+FN:46,(anonymous_3)
+FN:64,(anonymous_4)
+FN:70,(anonymous_5)
+FN:85,(anonymous_6)
+FN:93,(anonymous_7)
+FN:106,(anonymous_8)
+FN:192,(anonymous_9)
+FNF:10
+FNH:10
+FNDA:11,(anonymous_0)
+FNDA:4,(anonymous_1)
+FNDA:7,(anonymous_2)
+FNDA:7,(anonymous_3)
+FNDA:32,(anonymous_4)
+FNDA:34,(anonymous_5)
+FNDA:16,(anonymous_6)
+FNDA:22,(anonymous_7)
+FNDA:19,(anonymous_8)
+FNDA:11,(anonymous_9)
 DA:2,1
 DA:4,1
 DA:6,1
-DA:11,1
+DA:10,1
 DA:13,1
-DA:18,1
-DA:19,6
-DA:24,6
-DA:25,6
-DA:32,16
-DA:33,1
-DA:36,15
-DA:37,15
-DA:38,16
-DA:43,16
-DA:46,15
-DA:57,8
-DA:58,8
-DA:60,11
-DA:77,10
-DA:79,10
-DA:80,6
-DA:86,10
-DA:88,10
-DA:89,1
-DA:92,9
-DA:93,1
-DA:96,8
-DA:100,8
-DA:102,8
-DA:108,8
-DA:110,8
-DA:111,18
-DA:112,18
-DA:117,17
-DA:120,7
-DA:122,7
-DA:125,4
-DA:129,4
-DA:132,3
-DA:133,3
-DA:140,6
-DA:141,6
-DA:142,6
-DA:145,6
-DA:147,6
-DA:148,10
-DA:154,4
-LF:48
-LH:48
-BRDA:32,0,0,1
-BRDA:79,1,0,6
-BRDA:88,2,0,1
-BRDA:92,3,0,1
-BRDA:96,4,0,4
-BRDA:96,4,1,4
-BRDA:100,5,0,8
-BRDA:100,5,1,5
-BRDA:111,6,0,18
-BRDA:111,6,1,17
-BRDA:122,7,0,4
-BRDA:140,8,0,6
-BRDA:140,8,1,5
-BRDA:142,9,0,1
-BRDA:142,9,1,5
-BRF:15
-BRH:15
+DA:15,1
+DA:16,1
+DA:21,1
+DA:22,11
+DA:25,11
+DA:26,11
+DA:29,11
+DA:30,11
+DA:37,4
+DA:38,1
+DA:41,3
+DA:43,3
+DA:44,7
+DA:46,7
+DA:47,7
+DA:48,7
+DA:50,7
+DA:51,3
+DA:52,2
+DA:57,7
+DA:65,32
+DA:66,1
+DA:69,31
+DA:70,31
+DA:71,34
+DA:76,34
+DA:79,31
+DA:90,16
+DA:91,16
+DA:93,22
+DA:110,19
+DA:112,19
+DA:113,11
+DA:119,19
+DA:121,19
+DA:122,2
+DA:125,17
+DA:126,1
+DA:129,16
+DA:131,16
+DA:135,16
+DA:137,16
+DA:143,16
+DA:145,16
+DA:146,36
+DA:147,36
+DA:152,35
+DA:155,15
+DA:160,15
+DA:161,13
+DA:166,12
+DA:168,12
+DA:169,8
+DA:173,4
+DA:178,14
+DA:179,8
+DA:183,6
+DA:186,14
+DA:193,11
+DA:194,11
+DA:195,11
+DA:198,11
+DA:200,11
+DA:201,19
+DA:207,8
+LF:70
+LH:70
+BRDA:37,0,0,1
+BRDA:47,1,0,7
+BRDA:47,1,1,3
+BRDA:50,2,0,3
+BRDA:51,3,0,2
+BRDA:65,4,0,1
+BRDA:112,5,0,11
+BRDA:121,6,0,2
+BRDA:125,7,0,1
+BRDA:131,8,0,8
+BRDA:131,8,1,8
+BRDA:135,9,0,16
+BRDA:135,9,1,9
+BRDA:146,10,0,36
+BRDA:146,10,1,35
+BRDA:160,11,0,13
+BRDA:168,12,0,8
+BRDA:168,12,1,4
+BRDA:178,13,0,8
+BRDA:178,13,1,6
+BRDA:193,14,0,11
+BRDA:193,14,1,9
+BRDA:195,15,0,2
+BRDA:195,15,1,9
+BRF:24
+BRH:24
 end_of_record
 TN:
 SF:src/util/args.ts
@@ -273,18 +352,18 @@ BRH:5
 end_of_record
 TN:
 SF:src/util/errors.ts
-FN:12,(anonymous_0)
-FN:16,(anonymous_1)
+FN:13,(anonymous_0)
+FN:17,(anonymous_1)
 FNF:2
 FNH:2
-FNDA:12,(anonymous_0)
-FNDA:9,(anonymous_1)
-DA:1,3
-DA:12,3
-DA:13,12
-DA:17,9
-DA:18,9
-DA:23,12
+FNDA:20,(anonymous_0)
+FNDA:14,(anonymous_1)
+DA:1,4
+DA:13,4
+DA:14,20
+DA:18,14
+DA:19,14
+DA:24,20
 LF:6
 LH:6
 BRF:0

package/examples/impls/case-studies/aggregation.yml

@@ -0,0 +1,97 @@
+name: nesting-demo
+description:
+aggregation:
+  aggregation-metrics: ['carbon', 'energy']
+  aggregation-method: 'sum' # should default to sum if no value given
+tags:
+  kind: web
+  complexity: moderate
+  category: on-premise
+initialize:
+  models:
+    - name: teads-curve
+      model: TeadsCurveModel
+      path: "@grnsft/if-unofficial-models"
+    - name: sci-e
+      model: SciEModel
+      path: "@grnsft/if-models"
+    - name: sci-m
+      path: "@grnsft/if-models"
+      model: SciMModel
+    - name: sci-o
+      model: SciOModel
+      path: "@grnsft/if-models"
+    - name: sci
+      model: SciModel
+      path: "@grnsft/if-models"
+graph:
+  children:
+    child: # an advanced grouping node
+      pipeline:
+        - teads-curve
+        - sci-e
+        - sci-m
+        - sci-o
+        - sci
+      config:
+        teads-curve:
+          thermal-design-power: 65
+        sci-m:
+          total-embodied-emissions: 251000 # gCO2eq
+          time-reserved: 3600 # 1 hour in s
+          expected-lifespan: 126144000 # 4 years in seconds    
+          resources-reserved: 1 
+          total-resources: 1 
+        sci-o:
+          grid-carbon-intensity: 457 # gCO2/kwh
+        sci:
+          functional-unit-duration: 1 
+          functional-duration-time: ''
+          functional-unit: requests # factor to convert per time to per f.unit
+      children:
+        child-1:
+          inputs:
+            - timestamp: 2023-07-06T00:00
+              duration: 10
+              cpu-util: 50
+              e-net: 0.000811 #kwh     
+              requests: 380
+              carbon: 10
+              energy: 20
+            - timestamp: 2023-07-06T00:00
+              duration: 10
+              cpu-util: 50
+              e-net: 0.000811 #kwh     
+              requests: 380
+              carbon: 10
+              energy: 20
+            - timestamp: 2023-07-06T00:00
+              duration: 10
+              cpu-util: 50
+              e-net: 0.000811 #kwh     
+              requests: 380
+              carbon: 10
+              energy: 20
+        child-2:
+          inputs: 
+            - timestamp: 2023-07-06T00:00
+              duration: 10
+              cpu-util: 50
+              e-net: 0.000811 #kwh     
+              requests: 380
+              carbon: 10
+              energy: 20
+            - timestamp: 2023-07-06T00:00
+              duration: 10
+              cpu-util: 50
+              e-net: 0.000811 #kwh     
+              requests: 380
+              carbon: 10
+              energy: 20
+            - timestamp: 2023-07-06T00:00
+              duration: 10
+              cpu-util: 50
+              e-net: 0.000811 #kwh     
+              requests: 380
+              carbon: 10
+              energy: 20

package/examples/impls/case-studies/ntt-data-on-premise.yaml

@@ -4,9 +4,6 @@ tags:
   kind: web
   complexity: moderate
   category: on-premise
-aggregation:
-  fields:
-  methods:
 initialize:
   models:
     - name: sci-e
@@ -60,7 +57,6 @@ graph:
         - sci-m
         - sci-o
         - sci
-        - aggregate
       config:
         sci-m:
           total-embodied-emissions: 251000 # gCO2eq
@@ -74,9 +70,6 @@ graph:
           functional-unit-duration: 1 
           functional-duration-time: ''
           functional-unit: requests # factor to convert per time to per f.unit
-        aggregate:
-          fields: ['energy', 'carbon']
-          method: sum # sum, average
       children:
         switch-1:
           inputs:
@@ -85,41 +78,6 @@ graph:
               energy-network: 0.000811 #kwh     
               grid-carbon-intensity: 457 # gCO2e/kWh
               requests: 38032740
-            - timestamp: 2023-07-06T00:00
-              duration: 1
-              energy-network: 0.000811 #kwh     
-              grid-carbon-intensity: 457 # gCO2e/kWh
-              requests: 38032740
-            - timestamp: 2023-07-06T00:00
-              duration: 1
-              energy-network: 0.000811 #kwh     
-              grid-carbon-intensity: 457 # gCO2e/kWh
-              requests: 38032740
-          outputs:
-            - timestamp: 2023-07-06T00:00
-              duration: 1
-              energy-network: 0.000811 #kwh     
-              grid-carbon-intensity: 457 # gCO2e/kWh
-              requests: 38032740
-              energy: 10
-              carbon: 10
-              aggregated-energy: 38
-            - timestamp: 2023-07-06T00:00
-              duration: 1
-              energy-network: 0.000811 #kwh     
-              grid-carbon-intensity: 457 # gCO2e/kWh
-              requests: 38032740
-              energy: 12
-              carbon: 12
-              aggregated-energy: 38
-            - timestamp: 2023-07-06T00:00
-              duration: 1
-              energy-network: 0.000811 #kwh     
-              grid-carbon-intensity: 457 # gCO2e/kWh
-              requests: 38032740
-              energy: 16
-              carbon: 16
-              aggregated-energy: 38
         switch-2:
           inputs: 
             - timestamp: 2023-07-06T00:00

package/examples/impls/test/aggregation-test.yml

@@ -0,0 +1,109 @@
+name: nesting-demo
+description:
+aggregation:
+  aggregation-metrics: ['carbon', 'energy']
+  aggregation-method: 'sum'
+tags:
+  kind: web
+  complexity: moderate
+  category: on-premise
+initialize:
+  models:
+    - name: teads-curve
+      model: TeadsCurveModel
+      path: "@grnsft/if-unofficial-models"
+    - name: sci-e
+      model: SciEModel
+      path: "@grnsft/if-models"
+    - name: sci-m
+      path: "@grnsft/if-models"
+      model: SciMModel
+    - name: sci-o
+      model: SciOModel
+      path: "@grnsft/if-models"
+    - name: sci
+      model: SciModel
+      path: "@grnsft/if-models"
+graph:
+  children:
+    child: # an advanced grouping node
+      pipeline:
+        - teads-curve
+        - sci-e
+        - sci-m
+        - sci-o
+        - sci
+      config:
+        teads-curve:
+          thermal-design-power: 65
+        sci-m:
+          total-embodied-emissions: 251000 # gCO2eq
+          time-reserved: 3600 # 1 hour in s
+          expected-lifespan: 126144000 # 4 years in seconds    
+          resources-reserved: 1 
+          total-resources: 1 
+        sci-o:
+          grid-carbon-intensity: 457 # gCO2/kwh
+        sci:
+          functional-unit-duration: 1 
+          functional-duration-time: ''
+          functional-unit: requests # factor to convert per time to per f.unit
+      children:
+        child-1:
+          inputs:
+            - timestamp: 2023-07-06T00:00
+              duration: 10
+              cpu-util: 10
+              e-net: 0.000811 #kwh     
+              requests: 380
+            - timestamp: 2023-07-06T00:10
+              duration: 10
+              cpu-util: 10
+              e-net: 0.000811 #kwh     
+              requests: 380
+            - timestamp: 2023-07-06T00:20
+              duration: 10
+              cpu-util: 10
+              e-net: 0.000811 #kwh     
+              requests: 380
+            - timestamp: 2023-07-06T00:30
+              duration: 10
+              cpu-util: 10
+              e-net: 0.000811 #kwh     
+              requests: 380
+        child-2:
+          inputs:
+            - timestamp: 2023-07-06T00:00
+              duration: 10
+              cpu-util: 20
+              e-net: 0.000811 #kwh     
+              requests: 380
+            - timestamp: 2023-07-06T00:10
+              duration: 10
+              cpu-util: 30
+              e-net: 0.000811 #kwh     
+              requests: 380
+            - timestamp: 2023-07-06T00:20
+              duration: 10
+              cpu-util: 40
+              e-net: 0.000811 #kwh     
+              requests: 380
+            - timestamp: 2023-07-06T00:30
+              duration: 10
+              cpu-util: 50
+              e-net: 0.000811 #kwh     
+              requests: 380
+        child-3:
+          inputs: 
+            - timestamp: 2023-07-06T00:00
+              duration: 10
+              cpu-util: 10
+              e-net: 0.000811 #kwh     
+              requests: 380
+        child-4:
+          inputs: 
+            - timestamp: 2023-07-06T00:00
+              duration: 10
+              cpu-util: 10
+              e-net: 0.000811 #kwh     
+              requests: 380