diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8f4f4893f..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "third-party/ccf-coefficients"] - path = third-party/ccf-coefficients - url = https://github.com/cloud-carbon-footprint/ccf-coefficients diff --git a/manifests/examples/builtins/time-sync/failure-missing-global-config.yml b/manifests/examples/builtins/time-sync/failure-missing-config.yml similarity index 51% rename from manifests/examples/builtins/time-sync/failure-missing-global-config.yml rename to manifests/examples/builtins/time-sync/failure-missing-config.yml index 2938d3bb1..d0ab31a05 100644 --- a/manifests/examples/builtins/time-sync/failure-missing-global-config.yml +++ b/manifests/examples/builtins/time-sync/failure-missing-config.yml @@ -5,14 +5,9 @@ initialize: output: - yaml plugins: - "time-sync": + 'time-sync': method: TimeSync - path: "builtin" - config: - # start-time: '2023-12-12T00:00:00.000Z' - # end-time: '2023-12-12T00:01:00.000Z' - # interval: 5 - # allow-padding: true + path: 'builtin' tree: children: child: @@ -20,15 +15,15 @@ tree: compute: - time-sync inputs: - - timestamp: "2023-12-12T00:00:00.000Z" + - timestamp: '2023-12-12T00:00:00.000Z' duration: 3 energy-cpu: 0.001 - - timestamp: "2023-12-12T00:00:01.000Z" + - timestamp: '2023-12-12T00:00:01.000Z' duration: 5 energy-cpu: 0.001 - - timestamp: "2023-12-12T00:00:06.000Z" + - timestamp: '2023-12-12T00:00:06.000Z' duration: 7 energy-cpu: 0.001 - - timestamp: "2023-12-12T00:00:13.000Z" + - timestamp: '2023-12-12T00:00:13.000Z' duration: 30 energy-cpu: 0.001 diff --git a/manifests/examples/builtins/time-sync/success.yml b/manifests/examples/builtins/time-sync/success.yml index 95a94e5d3..0fd0cbcf3 100644 --- a/manifests/examples/builtins/time-sync/success.yml +++ b/manifests/examples/builtins/time-sync/success.yml @@ -5,12 +5,12 @@ initialize: output: - yaml plugins: - "time-sync": + 'time-sync': method: TimeSync - path: "builtin" + path: 'builtin' config: - start-time: "2023-12-12T00:00:00.000Z" - end-time: "2023-12-12T00:01:00.000Z" + start-time: '2023-12-12T00:00:00.000Z' + end-time: '2023-12-12T00:01:00.000Z' interval: 5 allow-padding: true tree: @@ -20,15 +20,15 @@ tree: compute: - time-sync inputs: - - timestamp: "2023-12-12T00:00:00.000Z" + - timestamp: '2023-12-12T00:00:00.000Z' duration: 1 energy-cpu: 0.001 - - timestamp: "2023-12-12T00:00:01.000Z" + - timestamp: '2023-12-12T00:00:01.000Z' duration: 5 energy-cpu: 0.001 - - timestamp: "2023-12-12T00:00:06.000Z" + - timestamp: '2023-12-12T00:00:06.000Z' duration: 7 energy-cpu: 0.001 - - timestamp: "2023-12-12T00:00:13.000Z" + - timestamp: '2023-12-12T00:00:13.000Z' duration: 30 energy-cpu: 0.001 diff --git a/manifests/outputs/bugs/aggregation-error-wrong-metric.yaml b/manifests/outputs/bugs/aggregation-error-wrong-metric.yaml index c6e8284ca..d45f433e0 100644 --- a/manifests/outputs/bugs/aggregation-error-wrong-metric.yaml +++ b/manifests/outputs/bugs/aggregation-error-wrong-metric.yaml @@ -19,7 +19,7 @@ initialize: - 10 - 50 - 100 - "y": + 'y': - 0.12 - 0.32 - 0.75 @@ -83,34 +83,33 @@ initialize: method: TimeSync path: builtin config: - start-time: "2023-12-12T00:00:00.000Z" - end-time: "2023-12-12T00:01:00.000Z" + start-time: '2023-12-12T00:00:00.000Z' + end-time: '2023-12-12T00:01:00.000Z' interval: 5 allow-padding: true execution: status: fail command: >- - /Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node - /Users/mariamkhalatova/Projects/UK/if/src/index.ts -m - manifests/outputs/bugs/aggregation-error-wrong-metric.yml -o - manifests/outputs/bugs/aggregation-error-wrong-metric + /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node + /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m + manifests/outputs/bugs/aggregation-error-wrong-metric.yaml environment: - if-version: 0.4.0 + if-version: 0.6.0 os: macOS - os-version: "13.2" - node-version: 18.14.2 - date-time: 2024-07-01T19:25:34.759Z (UTC) + os-version: 14.6.1 + node-version: 18.20.4 + date-time: 2024-10-04T08:38:25.343Z (UTC) dependencies: - - "@babel/core@7.22.10" - - "@babel/preset-typescript@7.23.3" - - "@commitlint/cli@18.6.0" - - "@commitlint/config-conventional@18.6.0" - - "@grnsft/if-core@0.0.10" - - "@jest/globals@29.7.0" - - "@types/jest@29.5.8" - - "@types/js-yaml@4.0.9" - - "@types/luxon@3.4.2" - - "@types/node@20.9.0" + - '@babel/core@7.22.10' + - '@babel/preset-typescript@7.23.3' + - '@commitlint/cli@18.6.0' + - '@commitlint/config-conventional@18.6.0' + - '@grnsft/if-core@0.0.25' + - '@jest/globals@29.7.0' + - '@types/jest@29.5.8' + - '@types/js-yaml@4.0.9' + - '@types/luxon@3.4.2' + - '@types/node@20.9.0' - axios-mock-adapter@1.22.0 - axios@1.7.2 - cross-env@7.0.3 @@ -130,9 +129,10 @@ execution: - typescript-cubic-spline@1.0.1 - typescript@5.2.2 - winston@3.11.0 - - zod@3.22.4 + - zod@3.23.8 error: >- - MissingInputDataError: `functional-unit` value is missing from input data or it is not a positive integer + MissingAggregationParamError: Aggregation metric dummy-param is not found in + inputs[0]. tree: children: child-1: @@ -160,25 +160,25 @@ tree: vcpus-allocated: 1 vcpus-total: 8 inputs: - - timestamp: "2023-12-12T00:00:00.000Z" + - timestamp: '2023-12-12T00:00:00.000Z' cloud/instance-type: A1 cloud/region: uk-west duration: 1 cpu/utilization: 10 requests: 100 - - timestamp: "2023-12-12T00:00:01.000Z" + - timestamp: '2023-12-12T00:00:01.000Z' duration: 5 cpu/utilization: 20 cloud/instance-type: A1 cloud/region: uk-west requests: 100 - - timestamp: "2023-12-12T00:00:06.000Z" + - timestamp: '2023-12-12T00:00:06.000Z' duration: 7 cpu/utilization: 15 cloud/instance-type: A1 cloud/region: uk-west requests: 100 - - timestamp: "2023-12-12T00:00:13.000Z" + - timestamp: '2023-12-12T00:00:13.000Z' duration: 30 cloud/instance-type: A1 cloud/region: uk-west @@ -209,25 +209,25 @@ tree: vcpus-allocated: 1 vcpus-total: 8 inputs: - - timestamp: "2023-12-12T00:00:00.000Z" + - timestamp: '2023-12-12T00:00:00.000Z' duration: 1 cpu/utilization: 30 cloud/instance-type: A1 cloud/region: uk-west requests: 100 - - timestamp: "2023-12-12T00:00:01.000Z" + - timestamp: '2023-12-12T00:00:01.000Z' duration: 5 cpu/utilization: 28 cloud/instance-type: A1 cloud/region: uk-west requests: 100 - - timestamp: "2023-12-12T00:00:06.000Z" + - timestamp: '2023-12-12T00:00:06.000Z' duration: 7 cpu/utilization: 40 cloud/instance-type: A1 cloud/region: uk-west requests: 100 - - timestamp: "2023-12-12T00:00:13.000Z" + - timestamp: '2023-12-12T00:00:13.000Z' duration: 30 cpu/utilization: 33 cloud/instance-type: A1 diff --git a/manifests/outputs/bugs/sci-embodied-missing-resources-total.yaml b/manifests/outputs/bugs/sci-embodied-missing-resources-total.yaml deleted file mode 100644 index 486947ebd..000000000 --- a/manifests/outputs/bugs/sci-embodied-missing-resources-total.yaml +++ /dev/null @@ -1,72 +0,0 @@ -name: sci-embodied -description: >- - receiving incorrect error message when running sci-embodied without - `resources-total` issue -tags: null -initialize: - plugins: - sci-embodied: - method: SciEmbodied - path: builtin -execution: - status: fail - command: >- - /Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node - /Users/mariamkhalatova/Projects/UK/if/src/index.ts -m - manifests/outputs/bugs/sci-embodied-missing-resources-total.yml -o - manifests/outputs/bugs/sci-embodied-missing-resources-total - environment: - if-version: 0.4.0 - os: macOS - os-version: "13.2" - node-version: 18.14.2 - date-time: 2024-07-01T20:17:30.390Z (UTC) - dependencies: - - "@babel/core@7.22.10" - - "@babel/preset-typescript@7.23.3" - - "@commitlint/cli@18.6.0" - - "@commitlint/config-conventional@18.6.0" - - "@grnsft/if-core@0.0.10" - - - "@jest/globals@29.7.0" - - "@types/jest@29.5.8" - - "@types/js-yaml@4.0.9" - - "@types/luxon@3.4.2" - - "@types/node@20.9.0" - - axios-mock-adapter@1.22.0 - - axios@1.7.2 - - cross-env@7.0.3 - - csv-parse@5.5.6 - - csv-stringify@6.4.6 - - fixpack@4.0.0 - - gts@5.2.0 - - husky@8.0.3 - - jest@29.7.0 - - js-yaml@4.1.0 - - lint-staged@15.2.2 - - luxon@3.4.4 - - release-it@16.3.0 - - rimraf@5.0.5 - - ts-command-line-args@2.5.1 - - ts-jest@29.1.1 - - typescript-cubic-spline@1.0.1 - - typescript@5.2.2 - - winston@3.11.0 - - zod@3.22.4 - error: >- - InputValidationError: "vcpus-allocated" parameter is required. Error code: - invalid_union. -tree: - children: - child: - pipeline: - compute: - - sci-embodied - defaults: - device/emissions-embodied: 1533.12 - time-reserved: 3600 - device/expected-lifespan: 94608000 - resources-reserved: 1 - inputs: - - timestamp: 2023-07-06T00:00 - duration: 3600 diff --git a/manifests/outputs/builtins/sci-embodied/failure-invalid-default-emission-value.yaml b/manifests/outputs/builtins/sci-embodied/failure-invalid-default-emission-value.yaml index f6af79041..4a11178b3 100644 --- a/manifests/outputs/builtins/sci-embodied/failure-invalid-default-emission-value.yaml +++ b/manifests/outputs/builtins/sci-embodied/failure-invalid-default-emission-value.yaml @@ -1,7 +1,6 @@ name: sci-embodied description: >- - failure with `defaults.device/emissions-embodied` being string instead of - number + failure with `vCPUs` being string instead of number tags: null initialize: plugins: @@ -11,28 +10,26 @@ initialize: execution: status: fail command: >- - /Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node - /Users/mariamkhalatova/Projects/UK/if/src/index.ts -m - manifests/outputs/plugins/sci-embodied/failure-invalid-default-emission-value.yml - -o - manifests/outputs/plugins/sci-embodied/failure-invalid-default-emission-value + /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node + /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m + manifests/outputs/builtins/sci-embodied/failure-invalid-default-emission-value.yaml environment: - if-version: 0.4.0 + if-version: 0.6.0 os: macOS - os-version: "13.2" - node-version: 18.14.2 - date-time: 2024-07-02T20:49:08.280Z (UTC) + os-version: 14.6.1 + node-version: 18.20.4 + date-time: 2024-10-04T08:59:52.608Z (UTC) dependencies: - - "@babel/core@7.22.10" - - "@babel/preset-typescript@7.23.3" - - "@commitlint/cli@18.6.0" - - "@commitlint/config-conventional@18.6.0" - - "@grnsft/if-core@0.0.10" - - "@jest/globals@29.7.0" - - "@types/jest@29.5.8" - - "@types/js-yaml@4.0.9" - - "@types/luxon@3.4.2" - - "@types/node@20.9.0" + - '@babel/core@7.22.10' + - '@babel/preset-typescript@7.23.3' + - '@commitlint/cli@18.6.0' + - '@commitlint/config-conventional@18.6.0' + - '@grnsft/if-core@0.0.25' + - '@jest/globals@29.7.0' + - '@types/jest@29.5.8' + - '@types/js-yaml@4.0.9' + - '@types/luxon@3.4.2' + - '@types/node@20.9.0' - axios-mock-adapter@1.22.0 - axios@1.7.2 - cross-env@7.0.3 @@ -52,10 +49,10 @@ execution: - typescript-cubic-spline@1.0.1 - typescript@5.2.2 - winston@3.11.0 - - zod@3.22.4 + - zod@3.23.8 error: >- - InputValidationError: "device/emissions-embodied" parameter is invalid - number. please provide it as `gco2e` to input. Error code: invalid_union. + InputValidationError: "vCPUs" parameter is expected number, received string + at index 0. Error code: invalid_type. tree: children: child: @@ -63,9 +60,8 @@ tree: compute: - sci-embodied defaults: - device/emissions-embodied: fail + vCPUs: fail time-reserved: 3600 - device/expected-lifespan: 94608000 resources-reserved: 1 resources-total: 8 inputs: diff --git a/manifests/outputs/builtins/sci-embodied/failure-missing-expected-lifespan.yaml b/manifests/outputs/builtins/sci-embodied/failure-missing-expected-lifespan.yaml deleted file mode 100644 index 43f22163e..000000000 --- a/manifests/outputs/builtins/sci-embodied/failure-missing-expected-lifespan.yaml +++ /dev/null @@ -1,69 +0,0 @@ -name: sci-embodied -description: missing device/expected-lifespan -tags: null -initialize: - plugins: - sci-embodied: - method: SciEmbodied - path: builtin -execution: - status: fail - command: >- - /Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node - /Users/mariamkhalatova/Projects/UK/if/src/index.ts -m - manifests/outputs/plugins/sci-embodied/failure-missing-expected-lifespan.yml - -o manifests/outputs/plugins/sci-embodied/failure-missing-expected-lifespan - environment: - if-version: 0.4.0 - os: macOS - os-version: "13.2" - node-version: 18.14.2 - date-time: 2024-07-02T20:42:51.951Z (UTC) - dependencies: - - "@babel/core@7.22.10" - - "@babel/preset-typescript@7.23.3" - - "@commitlint/cli@18.6.0" - - "@commitlint/config-conventional@18.6.0" - - "@grnsft/if-core@0.0.10" - - "@jest/globals@29.7.0" - - "@types/jest@29.5.8" - - "@types/js-yaml@4.0.9" - - "@types/luxon@3.4.2" - - "@types/node@20.9.0" - - axios-mock-adapter@1.22.0 - - axios@1.7.2 - - cross-env@7.0.3 - - csv-parse@5.5.6 - - csv-stringify@6.4.6 - - fixpack@4.0.0 - - gts@5.2.0 - - husky@8.0.3 - - jest@29.7.0 - - js-yaml@4.1.0 - - lint-staged@15.2.2 - - luxon@3.4.4 - - release-it@16.3.0 - - rimraf@5.0.5 - - ts-command-line-args@2.5.1 - - ts-jest@29.1.1 - - typescript-cubic-spline@1.0.1 - - typescript@5.2.2 - - winston@3.11.0 - - zod@3.22.4 - error: >- - InputValidationError: "device/expected-lifespan" parameter is required. - Error code: invalid_union. -tree: - children: - child: - pipeline: - compute: - - sci-embodied - defaults: - device/emissions-embodied: 1533.12 - time-reserved: 3600 - resources-reserved: 1 - resources-total: 8 - inputs: - - timestamp: 2023-07-06T00:00 - duration: 3600 diff --git a/manifests/outputs/builtins/sci-embodied/scenario-1.yaml b/manifests/outputs/builtins/sci-embodied/scenario-1.yaml index ec07d4df1..878c88fe3 100644 --- a/manifests/outputs/builtins/sci-embodied/scenario-1.yaml +++ b/manifests/outputs/builtins/sci-embodied/scenario-1.yaml @@ -16,20 +16,19 @@ execution: command: >- /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m - manifests/examples/builtins/sci-embodied/scenario-1.yml -o - manifests/outputs/builtins/sci-embodied/scenario-1.yml + manifests/outputs/builtins/sci-embodied/scenario-1.yaml environment: if-version: 0.6.0 os: macOS os-version: 14.6.1 node-version: 18.20.4 - date-time: 2024-09-12T06:14:16.990Z (UTC) + date-time: 2024-10-04T09:06:05.353Z (UTC) dependencies: - '@babel/core@7.22.10' - '@babel/preset-typescript@7.23.3' - '@commitlint/cli@18.6.0' - '@commitlint/config-conventional@18.6.0' - - '@grnsft/if-core@0.0.22' + - '@grnsft/if-core@0.0.25' - '@jest/globals@29.7.0' - '@types/jest@29.5.8' - '@types/js-yaml@4.0.9' @@ -73,10 +72,20 @@ tree: - timestamp: 2023-08-06T00:00 duration: 3600 hdd: 2 + vCPUs: 1 + memory: 16 + ssd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 34.24657534246575 - timestamp: 2023-08-06T10:00 duration: 3600 hdd: 2 + vCPUs: 1 + memory: 16 + ssd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 34.24657534246575 aggregated: embodied-carbon: 68.4931506849315 diff --git a/manifests/outputs/builtins/sci-embodied/scenario-2.yaml b/manifests/outputs/builtins/sci-embodied/scenario-2.yaml index 2ecf249cf..a6d3f7eeb 100644 --- a/manifests/outputs/builtins/sci-embodied/scenario-2.yaml +++ b/manifests/outputs/builtins/sci-embodied/scenario-2.yaml @@ -21,20 +21,19 @@ execution: command: >- /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m - manifests/examples/builtins/sci-embodied/scenario-2.yml -o - manifests/outputs/builtins/sci-embodied/scenario-2.yml + manifests/outputs/builtins/sci-embodied/scenario-2.yaml environment: if-version: 0.6.0 os: macOS os-version: 14.6.1 node-version: 18.20.4 - date-time: 2024-09-12T06:14:14.168Z (UTC) + date-time: 2024-10-04T09:08:03.615Z (UTC) dependencies: - '@babel/core@7.22.10' - '@babel/preset-typescript@7.23.3' - '@commitlint/cli@18.6.0' - '@commitlint/config-conventional@18.6.0' - - '@grnsft/if-core@0.0.22' + - '@grnsft/if-core@0.0.25' - '@jest/globals@29.7.0' - '@types/jest@29.5.8' - '@types/js-yaml@4.0.9' @@ -88,6 +87,7 @@ tree: hdd: 1 gpu: 1 total-vcpus: 16 + usage-ratio: 1 embodied-carbon: 487.48858447488584 - timestamp: 2023-08-06T10:00 duration: 3600 @@ -97,4 +97,5 @@ tree: hdd: 1 gpu: 1 total-vcpus: 16 + usage-ratio: 1 embodied-carbon: 487.48858447488584 diff --git a/manifests/outputs/builtins/sci-embodied/success.yaml b/manifests/outputs/builtins/sci-embodied/success.yaml index da0a86549..023cf59ea 100644 --- a/manifests/outputs/builtins/sci-embodied/success.yaml +++ b/manifests/outputs/builtins/sci-embodied/success.yaml @@ -21,20 +21,19 @@ execution: command: >- /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m - manifests/examples/builtins/sci-embodied/success.yml -o - manifests/outputs/builtins/sci-embodied/success.yml + manifests/outputs/builtins/sci-embodied/success.yaml environment: if-version: 0.6.0 os: macOS os-version: 14.6.1 node-version: 18.20.4 - date-time: 2024-09-12T06:14:11.145Z (UTC) + date-time: 2024-10-04T09:08:28.940Z (UTC) dependencies: - '@babel/core@7.22.10' - '@babel/preset-typescript@7.23.3' - '@commitlint/cli@18.6.0' - '@commitlint/config-conventional@18.6.0' - - '@grnsft/if-core@0.0.22' + - '@grnsft/if-core@0.0.25' - '@jest/globals@29.7.0' - '@types/jest@29.5.8' - '@types/js-yaml@4.0.9' @@ -92,4 +91,10 @@ tree: resources-reserved: 1 resources-total: 8 vcpus-allocated: 1 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 28.538812785388128 diff --git a/manifests/outputs/builtins/time-sync/failure-missing-global-config.yaml b/manifests/outputs/builtins/time-sync/failure-missing-config.yaml similarity index 81% rename from manifests/outputs/builtins/time-sync/failure-missing-global-config.yaml rename to manifests/outputs/builtins/time-sync/failure-missing-config.yaml index 664da36d1..58339a417 100644 --- a/manifests/outputs/builtins/time-sync/failure-missing-global-config.yaml +++ b/manifests/outputs/builtins/time-sync/failure-missing-config.yaml @@ -8,26 +8,25 @@ initialize: time-sync: method: TimeSync path: builtin - config: null execution: status: fail command: >- /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m - manifests/examples/builtins/time-sync/failure-missing-global-config.yml -o - manifests/outputs/builtins/time-sync/failure-missing-global-config.yml + manifests/examples/builtins/time-sync/failure-missing-config.yml -o + manifests/outputs/builtins/time-sync/failure-missing-config.yaml environment: if-version: 0.6.0 os: macOS os-version: 14.6.1 node-version: 18.20.4 - date-time: 2024-09-12T06:16:16.464Z (UTC) + date-time: 2024-10-04T13:07:11.870Z (UTC) dependencies: - '@babel/core@7.22.10' - '@babel/preset-typescript@7.23.3' - '@commitlint/cli@18.6.0' - '@commitlint/config-conventional@18.6.0' - - '@grnsft/if-core@0.0.22' + - '@grnsft/if-core@0.0.25' - '@jest/globals@29.7.0' - '@types/jest@29.5.8' - '@types/js-yaml@4.0.9' @@ -53,9 +52,7 @@ execution: - typescript@5.2.2 - winston@3.11.0 - zod@3.23.8 - error: >- - ManifestValidationError: "initialize.plugins.time-sync.config" parameter is - expected object, received null. Error code: invalid_type. + error: 'ConfigError: Config is not provided.' tree: children: child: diff --git a/manifests/outputs/pipelines/nesting.yaml b/manifests/outputs/pipelines/nesting.yaml index 0a834b082..85f69f515 100644 --- a/manifests/outputs/pipelines/nesting.yaml +++ b/manifests/outputs/pipelines/nesting.yaml @@ -247,20 +247,19 @@ execution: command: >- /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m - manifests/examples/pipelines/nesting.yml -o manifests/outputs/pipelines/nesting.yaml environment: if-version: 0.6.0 os: macOS os-version: 14.6.1 node-version: 18.20.4 - date-time: 2024-09-12T11:46:37.516Z (UTC) + date-time: 2024-10-04T11:05:09.727Z (UTC) dependencies: - '@babel/core@7.22.10' - '@babel/preset-typescript@7.23.3' - '@commitlint/cli@18.6.0' - '@commitlint/config-conventional@18.6.0' - - '@grnsft/if-core@0.0.22' + - '@grnsft/if-core@0.0.25' - '@jest/globals@29.7.0' - '@types/jest@29.5.8' - '@types/js-yaml@4.0.9' @@ -361,6 +360,12 @@ tree: cpu-energy-raw: 0.00006833333333333335 vcpu-ratio: 8 cpu-energy-kwh: 0.000008541666666666668 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.006833333333333334 carbon: 0.04647057331303907 @@ -385,6 +390,12 @@ tree: cpu-energy-raw: 0.00005340277777777778 vcpu-ratio: 8 cpu-energy-kwh: 0.000006675347222222222 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970574 carbon-operational: 0.005340277777777777 carbon: 0.044977517757483515 @@ -409,6 +420,12 @@ tree: cpu-energy-raw: 0.00005190972222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.0000064887152777777775 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970574 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -433,6 +450,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -457,6 +480,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -481,6 +510,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -505,6 +540,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -529,6 +570,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -553,6 +600,12 @@ tree: cpu-energy-raw: 0.000031145833333333336 vcpu-ratio: 8 cpu-energy-kwh: 0.000003893229166666667 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.02378234398782344 carbon-operational: 0.0031145833333333334 carbon: 0.02689692732115677 @@ -577,6 +630,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -601,6 +660,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -625,6 +690,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -703,6 +774,12 @@ tree: cpu-energy-raw: 0.00006833333333333335 vcpu-ratio: 8 cpu-energy-kwh: 0.000008541666666666668 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.006833333333333334 carbon: 0.04647057331303907 @@ -727,6 +804,12 @@ tree: cpu-energy-raw: 0.00005340277777777778 vcpu-ratio: 8 cpu-energy-kwh: 0.000006675347222222222 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970574 carbon-operational: 0.005340277777777777 carbon: 0.044977517757483515 @@ -751,6 +834,12 @@ tree: cpu-energy-raw: 0.00005190972222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.0000064887152777777775 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970574 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -775,6 +864,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -799,6 +894,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -823,6 +924,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -847,6 +954,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -871,6 +984,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -895,6 +1014,12 @@ tree: cpu-energy-raw: 0.000031145833333333336 vcpu-ratio: 8 cpu-energy-kwh: 0.000003893229166666667 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.02378234398782344 carbon-operational: 0.0031145833333333334 carbon: 0.02689692732115677 @@ -919,6 +1044,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -943,6 +1074,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -967,6 +1104,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -1047,6 +1190,12 @@ tree: cpu-energy-raw: 0.00006833333333333335 vcpu-ratio: 8 cpu-energy-kwh: 0.000008541666666666668 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.006833333333333334 carbon: 0.04647057331303907 @@ -1071,6 +1220,12 @@ tree: cpu-energy-raw: 0.00005340277777777778 vcpu-ratio: 8 cpu-energy-kwh: 0.000006675347222222222 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970574 carbon-operational: 0.005340277777777777 carbon: 0.044977517757483515 @@ -1095,6 +1250,12 @@ tree: cpu-energy-raw: 0.00005190972222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.0000064887152777777775 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970574 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1119,6 +1280,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1143,6 +1310,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1167,6 +1340,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1191,6 +1370,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1215,6 +1400,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1239,6 +1430,12 @@ tree: cpu-energy-raw: 0.000031145833333333336 vcpu-ratio: 8 cpu-energy-kwh: 0.000003893229166666667 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.02378234398782344 carbon-operational: 0.0031145833333333334 carbon: 0.02689692732115677 @@ -1263,6 +1460,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -1287,6 +1490,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -1311,6 +1520,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -1389,6 +1604,12 @@ tree: cpu-energy-raw: 0.00006833333333333335 vcpu-ratio: 8 cpu-energy-kwh: 0.000008541666666666668 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.006833333333333334 carbon: 0.04647057331303907 @@ -1413,6 +1634,12 @@ tree: cpu-energy-raw: 0.00005340277777777778 vcpu-ratio: 8 cpu-energy-kwh: 0.000006675347222222222 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970574 carbon-operational: 0.005340277777777777 carbon: 0.044977517757483515 @@ -1437,6 +1664,12 @@ tree: cpu-energy-raw: 0.00005190972222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.0000064887152777777775 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970574 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1461,6 +1694,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1485,6 +1724,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1509,6 +1754,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1533,6 +1784,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1557,6 +1814,12 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970573 carbon-operational: 0.005190972222222222 carbon: 0.04482821220192795 @@ -1581,6 +1844,12 @@ tree: cpu-energy-raw: 0.000031145833333333336 vcpu-ratio: 8 cpu-energy-kwh: 0.000003893229166666667 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.02378234398782344 carbon-operational: 0.0031145833333333334 carbon: 0.02689692732115677 @@ -1605,6 +1874,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -1629,6 +1904,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 @@ -1653,6 +1934,12 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0 carbon-operational: 0 carbon: 0 diff --git a/manifests/outputs/pipelines/pipeline-teads-sci.yaml b/manifests/outputs/pipelines/pipeline-teads-sci.yaml index b9a6377f5..aca6ca4b9 100644 --- a/manifests/outputs/pipelines/pipeline-teads-sci.yaml +++ b/manifests/outputs/pipelines/pipeline-teads-sci.yaml @@ -96,19 +96,19 @@ execution: /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m manifests/examples/pipelines/pipeline-teads-sci.yml -o - manifests/outputs/pipelines/pipeline-teads-sci.yml + manifests/outputs/pipelines/pipeline-teads-sci.yaml environment: if-version: 0.6.0 os: macOS os-version: 14.6.1 node-version: 18.20.4 - date-time: 2024-09-12T06:13:31.812Z (UTC) + date-time: 2024-10-04T09:52:09.777Z (UTC) dependencies: - '@babel/core@7.22.10' - '@babel/preset-typescript@7.23.3' - '@commitlint/cli@18.6.0' - '@commitlint/config-conventional@18.6.0' - - '@grnsft/if-core@0.0.22' + - '@grnsft/if-core@0.0.25' - '@jest/globals@29.7.0' - '@types/jest@29.5.8' - '@types/js-yaml@4.0.9' @@ -205,6 +205,12 @@ tree: cpu-energy-raw: 0.000020833333333333333 vcpu-ratio: 8 cpu-energy-kwh: 0.0000026041666666666666 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.007927447995941146 carbon-operational: 0.0020833333333333333 carbon: 0.010010781329274479 @@ -229,6 +235,12 @@ tree: cpu-energy-raw: 0.000059375 vcpu-ratio: 8 cpu-energy-kwh: 0.000007421875 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970574 carbon-operational: 0.0059375 carbon: 0.045574739979705736 @@ -253,6 +265,12 @@ tree: cpu-energy-raw: 0.00007267361111111111 vcpu-ratio: 8 cpu-energy-kwh: 0.000009084201388888889 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.05549213597158803 carbon-operational: 0.007267361111111111 carbon: 0.06275949708269914 @@ -277,6 +295,12 @@ tree: cpu-energy-raw: 0.00031145833333333335 vcpu-ratio: 8 cpu-energy-kwh: 0.00003893229166666667 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.2378234398782344 carbon-operational: 0.031145833333333334 carbon: 0.2689692732115677 diff --git a/manifests/outputs/pipelines/sci.yaml b/manifests/outputs/pipelines/sci.yaml index 7a967c9ef..7f080e67c 100644 --- a/manifests/outputs/pipelines/sci.yaml +++ b/manifests/outputs/pipelines/sci.yaml @@ -95,19 +95,19 @@ execution: command: >- /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m - manifests/examples/pipelines/sci.yml -o manifests/outputs/pipelines/sci.yml + manifests/examples/pipelines/sci.yml -o manifests/outputs/pipelines/sci.yaml environment: if-version: 0.6.0 os: macOS os-version: 14.6.1 node-version: 18.20.4 - date-time: 2024-09-12T06:13:59.916Z (UTC) + date-time: 2024-10-04T09:57:49.899Z (UTC) dependencies: - '@babel/core@7.22.10' - '@babel/preset-typescript@7.23.3' - '@commitlint/cli@18.6.0' - '@commitlint/config-conventional@18.6.0' - - '@grnsft/if-core@0.0.22' + - '@grnsft/if-core@0.0.25' - '@jest/globals@29.7.0' - '@types/jest@29.5.8' - '@types/js-yaml@4.0.9' @@ -210,6 +210,12 @@ tree: vcpu-ratio: 4 cpu/energy: 0.000005208333333333333 energy: 0.000006208333333333333 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.007927447995941146 carbon-operational: 0.004966666666666666 carbon: 0.012894114662607812 @@ -237,6 +243,12 @@ tree: vcpu-ratio: 4 cpu/energy: 0.00001484375 energy: 0.00001584375 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.03963723997970574 carbon-operational: 0.012674999999999999 carbon: 0.05231223997970574 @@ -264,6 +276,12 @@ tree: vcpu-ratio: 4 cpu/energy: 0.000018168402777777778 energy: 0.000019168402777777778 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.05549213597158803 carbon-operational: 0.015334722222222222 carbon: 0.07082685819381025 @@ -291,6 +309,12 @@ tree: vcpu-ratio: 4 cpu/energy: 0.00007786458333333334 energy: 0.00007886458333333333 + vCPUs: 1 + memory: 16 + ssd: 0 + hdd: 0 + gpu: 0 + usage-ratio: 1 embodied-carbon: 0.2378234398782344 carbon-operational: 0.06309166666666667 carbon: 0.30091510654490106 diff --git a/package.json b/package.json index bea408854..aceda9ff5 100644 --- a/package.json +++ b/package.json @@ -58,11 +58,12 @@ "homepage": "https://greensoftware.foundation", "keywords": [ "engine", + "framework", "green software foundation", "greensoftware", "if", "impact", - "models" + "plugins" ], "license": "MIT", "publishConfig": { diff --git a/src/__tests__/if-run/builtins/time-sync.test.ts b/src/__tests__/if-run/builtins/time-sync.test.ts index 9994dace5..58863272b 100644 --- a/src/__tests__/if-run/builtins/time-sync.test.ts +++ b/src/__tests__/if-run/builtins/time-sync.test.ts @@ -250,9 +250,7 @@ describe('builtins/time-sync:', () => { ]); } catch (error) { expect(error).toStrictEqual( - new InputValidationError( - '"start-time" parameter is required. Error code: invalid_type.,"end-time" parameter is required. Error code: invalid_type.,"interval" parameter is required. Error code: invalid_type.,"allow-padding" parameter is required. Error code: invalid_type.' - ) + new ConfigError('Config is not provided.') ); } }); diff --git a/src/if-run/builtins/time-sync/index.ts b/src/if-run/builtins/time-sync/index.ts index f0734d61c..0c1ecfb22 100644 --- a/src/if-run/builtins/time-sync/index.ts +++ b/src/if-run/builtins/time-sync/index.ts @@ -31,11 +31,11 @@ const { INCOMPATIBLE_RESOLUTION_WITH_INTERVAL, INCOMPATIBLE_RESOLUTION_WITH_GAPS, INCOMPATIBLE_RESOLUTION_WITH_INPUTS, - INVALID_TIME_NORMALIZATION, INVALID_OBSERVATION_OVERLAP, AVOIDING_PADDING_BY_EDGES, INVALID_DATE_TYPE, START_LOWER_END, + MISSING_CONFIG, } = STRINGS; /** @@ -75,8 +75,8 @@ export const TimeSync = PluginFactory({ }, }, configValidation: (config: ConfigParams): TimeNormalizerConfig => { - if (config === undefined) { - throw new ConfigError(INVALID_TIME_NORMALIZATION); + if (!config || !Object.keys(config)?.length) { + throw new ConfigError(MISSING_CONFIG); } const schema = z diff --git a/src/if-run/config/strings.ts b/src/if-run/config/strings.ts index 5f6115bf6..41b9dc013 100644 --- a/src/if-run/config/strings.ts +++ b/src/if-run/config/strings.ts @@ -1,15 +1,12 @@ export const STRINGS = { MISSING_METHOD: "Initalization param 'method' is missing.", MISSING_PATH: "Initalization param 'path' is missing.", - UNSUPPORTED_PLUGIN: - "Plugin interface doesn't implement 'execute' or 'metadata' methods.", NOT_NATIVE_PLUGIN: (path: string) => ` You are using plugin ${path} which is not part of the Impact Framework standard library. You should do your own research to ensure the plugins are up to date and accurate. They may not be actively maintained.`, INVALID_MODULE_PATH: (path: string, error?: any) => `Provided module \`${path}\` is invalid or not found. ${error ?? ''} `, - INVALID_TIME_NORMALIZATION: 'Start time or end time is missing.', INCOMPATIBLE_RESOLUTION_WITH_INTERVAL: 'The upsampling resolution must be a divisor of the given interval, but the provided value does not satisfy this criteria.', INCOMPATIBLE_RESOLUTION_WITH_INPUTS: @@ -18,21 +15,14 @@ export const STRINGS = { 'The upsampling resolution must be a divisor of gaps and paddings in the time-series, but the provided values do not satisfy this criteria.', UNEXPECTED_TIME_CONFIG: 'Unexpected node-level config provided for time-sync plugin.', - INVALID_TIME_INTERVAL: 'Interval is missing.', - AVOIDING_PADDING: (description: string) => - `Avoiding padding at ${description}`, AVOIDING_PADDING_BY_EDGES: (start: boolean, end: boolean) => `Avoiding padding at ${ start && end ? 'start and end' : start ? 'start' : 'end' }`, - INVALID_AGGREGATION_METHOD: (metric: string) => - `Aggregation is not possible for given ${metric} since method is 'none'.`, METRIC_MISSING: (metric: string, index: number) => `Aggregation metric ${metric} is not found in inputs[${index}].`, INVALID_GROUP_KEY: (key: string) => `Invalid group ${key}.`, REGROUP_ERROR: 'not an array or should contain at least one key', - INVALID_EXHAUST_PLUGIN: (pluginName: string) => - `Invalid exhaust plugin: ${pluginName}.`, UNKNOWN_PARAM: (name: string) => `Unknown parameter: ${name}. Omitting from the output.`, NOT_INITALIZED_PLUGIN: (name: string) => @@ -80,8 +70,6 @@ https://if.greensoftware.foundation/major-concepts/manifest-file`, /** Plugins messages */ INVALID_NAME: '`name` config parameter is empty or contains all spaces', START_LOWER_END: '`start-time` should be lower than `end-time`', - TIMESTAMP_REQUIRED: (index: number) => `required in input[${index}]`, - INVALID_DATETIME: (index: number) => `invalid datetime in input[${index}]`, X_Y_EQUAL: 'The length of `x` and `y` should be equal', ARRAY_LENGTH_NON_EMPTY: 'the length of the input arrays must be greater than 1',