Merge pull request #166 from Hestia-Homes/sap_baseline-dev-model

Sap baseline dev model - initial te

.github/workflows/Deploy.yml

@@ -2,7 +2,17 @@ name: Sap Change Model Deploy
 
 on:
   push:
-    branches: [ sap-dev, sap-prod, heat-dev, heat-prod, carbon-dev, carbon-prod]
+    branches:
+      [
+        sap-dev,
+        sap-prod,
+        heat-dev,
+        heat-prod,
+        carbon-dev,
+        carbon-prod,
+        "sap_baseline-dev",
+        "sap_baseline-prod",
+      ]
 
 jobs:
   deploy:
@@ -31,8 +41,8 @@ jobs:
       - name: set secret prefix which is used across multiple steps
         id: secret_prefix
         run: |
-            # Convert branch name to uppercase and replace hyphens with underscores
-            echo "::set-output name=secret_prefix::$(echo "${{ github.ref_name }}" | tr 'a-z-' 'A-Z_')"
+          # Convert branch name to uppercase and replace hyphens with underscores
+          echo "::set-output name=secret_prefix::$(echo "${{ github.ref_name }}" | tr 'a-z-' 'A-Z_')"
 
       - name: Set domain name
         id: set_domain
@@ -116,7 +126,7 @@ jobs:
         env:
           RUNTIME_ENVIRONMENT: ${{ steps.set_runtime_environment.outputs.runtime_environment }}
           PREDICTIONS_BUCKET: ${{ steps.set_s3_buckets.outputs.predictions_bucket }}
-          DATA_BUCKET:  ${{ steps.set_s3_buckets.outputs.data_bucket }}
+          DATA_BUCKET: ${{ steps.set_s3_buckets.outputs.data_bucket }}
           DOMAIN_NAME: ${{ steps.set_domain.outputs.domain }}
           ECR_URI: ${{ steps.set_ecr_credentials.outputs.ecr_uri }}
           GITHUB_SHA: ${{ github.sha }}

.github/workflows/MLPipelinePostMerge.yml

@@ -13,7 +13,7 @@ on:
       - "sap-dev"
       - "heat-dev"
       - "carbon-dev"
-      - "sap_starting-dev"
+      - "sap_baseline-dev"
 
 permissions: write-all
 

.github/workflows/MLPipelinePullRequest.yml

@@ -5,7 +5,7 @@ on:
   #   branches:
   #     - "model-**"
   pull_request:
-    branches: ["sap-dev", "heat-dev", "carbon-dev", "sap_starting-dev"]
+    branches: ["sap-dev", "heat-dev", "carbon-dev", "sap_baseline-dev"]
   label:
     types: ["created", "edited"]
 

modules/ml-pipeline/src/pipeline/configs/settings.yaml

@@ -45,7 +45,9 @@ default:
           "heat_demand_change",
           "carbon_change",
           "rdsap_change",
+          "heat_demand_starting",
           "heat_demand_ending",
+          "carbon_starting",
           "carbon_ending",
           "days_to_starting",
           "days_to_ending",

modules/ml-pipeline/src/pipeline/dvc.lock

@@ -29,7 +29,9 @@ stages:
         - heat_demand_change
         - carbon_change
         - rdsap_change
+        - heat_demand_starting
         - heat_demand_ending
+        - carbon_starting
         - carbon_ending
         - days_to_starting
         - days_to_ending
@@ -169,8 +171,8 @@ stages:
     outs:
     - path: data/prepared_data/
       hash: md5
-      md5: dd0f94a24ee81f56ee81ec2e2cd16930.dir
-      size: 28011379
+      md5: 2e33489c17eff1a60079e26d370a9058.dir
+      size: 26013963
       nfiles: 3
   build_model:
     cmd: python 2_build_model.py
@@ -181,8 +183,8 @@ stages:
       size: 4820
     - path: data/prepared_data
       hash: md5
-      md5: dd0f94a24ee81f56ee81ec2e2cd16930.dir
-      size: 28011379
+      md5: 2e33489c17eff1a60079e26d370a9058.dir
+      size: 26013963
       nfiles: 3
     params:
       configs/build_model.yaml:
@@ -283,18 +285,18 @@ stages:
     outs:
     - path: data/fit_predictions/
       hash: md5
-      md5: 32ca8d6ae9247cc1f14d331d42e9a906.dir
-      size: 3457647
+      md5: 701063eff6ee4444971742f05c4de861.dir
+      size: 3453673
       nfiles: 1
     - path: data/model/
       hash: md5
-      md5: de9d3888df7a1c5afffe54625569d4e0.dir
-      size: 660397572
-      nfiles: 31
+      md5: 9c3e945f96fc2c95f2962a98af5c04fe.dir
+      size: 594127389
+      nfiles: 30
     - path: metrics/fit_metrics.json
       hash: md5
-      md5: 38875a7edc13ace91ae9478bee9e070f
-      size: 227
+      md5: f1df654cc38d2c73261bfaed0a1ef277
+      size: 223
   generate_predictions:
     cmd: python 3_generate_predictions.py
     deps:
@@ -304,13 +306,13 @@ stages:
       size: 2464
     - path: data/model
       hash: md5
-      md5: de9d3888df7a1c5afffe54625569d4e0.dir
-      size: 660397572
-      nfiles: 31
+      md5: 9c3e945f96fc2c95f2962a98af5c04fe.dir
+      size: 594127389
+      nfiles: 30
     - path: data/prepared_data
       hash: md5
-      md5: dd0f94a24ee81f56ee81ec2e2cd16930.dir
-      size: 28011379
+      md5: 2e33489c17eff1a60079e26d370a9058.dir
+      size: 26013963
       nfiles: 3
     params:
       configs/settings.yaml:
@@ -324,8 +326,8 @@ stages:
     outs:
     - path: data/predictions/
       hash: md5
-      md5: 822173b06528b9520a47d84c16b39eb3.dir
-      size: 480674
+      md5: 3dfb21b2918e954e657f0c7cbeca308f.dir
+      size: 479298
       nfiles: 1
   generate_metrics:
     cmd: python 4_generate_metrics.py
@@ -336,13 +338,13 @@ stages:
       size: 3484
     - path: data/predictions
       hash: md5
-      md5: 822173b06528b9520a47d84c16b39eb3.dir
-      size: 480674
+      md5: 3dfb21b2918e954e657f0c7cbeca308f.dir
+      size: 479298
       nfiles: 1
     - path: data/prepared_data
       hash: md5
-      md5: dd0f94a24ee81f56ee81ec2e2cd16930.dir
-      size: 28011379
+      md5: 2e33489c17eff1a60079e26d370a9058.dir
+      size: 26013963
       nfiles: 3
     params:
       configs/settings.yaml:
@@ -352,8 +354,8 @@ stages:
     outs:
     - path: metrics/metrics.json
       hash: md5
-      md5: c4d89ad0cc8b17cdff7ef52bc5260a3c
-      size: 226
+      md5: 365cf4dc2ac89b4df55dc7ae6862d8b1
+      size: 222
   generate_scenerio_metrics:
     cmd: python 5_generate_scenarios.py
     deps: