Merge pull request #150 from Hestia-Homes/sap-dev-floorthermal

Sap dev floorthermal

MODEL_REGISTRY.md

@@ -8,25 +8,65 @@
         "active": true
     },
     "sap": {
-        "version": "v0.14.0",
+        "version": "v0.15.0",
         "stage": {
-            "dev": "v0.14.0"
+            "dev": "v0.15.0"
         },
         "registered": true,
         "active": true
     },
     "heat": {
-        "version": "v0.5.0",
+        "version": "v0.6.0",
         "stage": {
-            "dev": "v0.5.0"
+            "dev": "v0.6.0"
         },
         "registered": true,
         "active": true
     },
     "carbon": {
-        "version": "v0.5.0",
+        "version": "v0.6.0",
         "stage": {
-            "dev": "v0.5.0"
+            "dev": "v0.6.0"
+        },
+        "registered": true,
+        "active": true
+    },
+    "hotwater": {
+        "version": "v1.0.0",
+        "stage": {
+            "dev": "v1.0.0"
+        },
+        "registered": true,
+        "active": true
+    },
+    "heating": {
+        "version": "v1.0.0",
+        "stage": {
+            "dev": "v1.0.0"
+        },
+        "registered": true,
+        "active": true
+    },
+    "lighting": {
+        "version": "v1.0.0",
+        "stage": {
+            "dev": "v1.0.0"
+        },
+        "registered": true,
+        "active": true
+    },
+    "hotwaterkwh": {
+        "version": "v1.3.0",
+        "stage": {
+            "dev": "v1.3.0"
+        },
+        "registered": true,
+        "active": true
+    },
+    "heatingkwh": {
+        "version": "v1.5.0",
+        "stage": {
+            "dev": "v1.5.0"
         },
         "registered": true,
         "active": true

deployment/Dockerfile.prediction.lambda

@@ -13,7 +13,11 @@ RUN yum install -y gcc python3-devel gcc-c++
 
 # Install python packages
 COPY modules/ml-pipeline/src/pipeline/requirements/predictions/requirements.txt ./requirements.txt
-RUN pip install --no-cache-dir -r ./requirements.txt
+
+RUN pip install uv
+
+RUN uv pip install -r requirements.txt --system
+# RUN pip install --no-cache-dir -r ./requirements.txt
 
 # Copy the project code
 COPY modules/ml-pipeline/src/pipeline ./pipeline

modules/ml-pipeline/src/Prediction.Dockerfile

@@ -6,7 +6,12 @@ RUN apt-get update && apt-get install -y libgomp1 gcc python3-dev
 COPY pipeline/requirements/predictions/requirements.txt requirements.txt
 
 RUN pip install --upgrade pip
-RUN pip install -r requirements.txt
+
+RUN pip install uv
+
+RUN uv pip install -r requirements.txt --system
+
+# RUN pip install -r requirements.txt
 
 # Assuming in the CI/CD step, there will be a dvc pull step to get data and model, so will just need to run a single script
 COPY pipeline/ /home/pipeline/

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

@@ -3,11 +3,10 @@ default:
     input_dataclient_type: aws-s3
     output_dataclient_type: local
     scenario_data_filepaths:
-      # - s3://retrofit-data-dev/scenario_data/22-03-2024-19-20-09/recommendations_scoring_data.parquet
+      # - s3://retrofit-data-dev/scenario_data/28-05-2024-19-22-41/recommendations_scoring_data.parquet
-      # - s3://retrofit-data-dev/scenario_data/24-03-2024-20-23-25/recommendations_scoring_data.parquet
+      # - s3://retrofit-data-dev/scenario_data/07-10-2024-16-26-06/recommendations_scoring_data.parquet
-      # - s3://retrofit-data-dev/scenario_data/27-03-2024-11-38-15/recommendations_scoring_data.parquet
+      # - s3://retrofit-data-dev/scenario_data/08-10-2024-15-07-33/recommendations_scoring_data.parquet
-      # - s3://retrofit-data-dev/scenario_data/26-05-2024-08-47-45/recommendations_scoring_data.parquet
+      # - s3://retrofit-data-dev/scenario_data/08-10-2024-22-18-44/recommendations_scoring_data.parquet
-      # - s3://retrofit-data-dev/scenario_data/26-05-2024-10-44-53/recommendations_scoring_data.parquet
+      - s3://retrofit-data-dev/scenario_data/09-10-2024-18-21-08/recommendations_scoring_data.parquet
-      - s3://retrofit-data-dev/scenario_data/28-05-2024-19-22-41/recommendations_scoring_data.parquet
     comparison_output_filepath: ./metrics/scenario_table.md
     metrics_output_filepath: ./metrics/scenario_metrics.md

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

@@ -18,10 +18,9 @@ default:
   prepare_data:
     input_dataclient_type: aws-s3
     output_dataclient_type: local
-    # data_filepath: s3://retrofit-data-dev/sap_change_model/2024-03-22-18-56-53/dataset_rooms.parquet
+    # data_filepath: s3://retrofit-data-dev/sap_change_model/2024-05-28-19-08-25/dataset_rooms.parquet
-    # data_filepath: s3://retrofit-data-dev/sap_change_model/2024-05-25-08-36-36/dataset_rooms.parquet
+    # data_filepath: s3://retrofit-data-dev/sap_change_model/2024-10-03-22-57-23/dataset_rooms.parquet
-    # data_filepath: s3://retrofit-data-dev/sap_change_model/2024-05-26-10-31-39/dataset_rooms.parquet
+    data_filepath: s3://retrofit-data-dev/sap_change_model/2024-10-08-21-58-03/dataset_rooms.parquet
-    data_filepath: s3://retrofit-data-dev/sap_change_model/2024-05-28-19-08-25/dataset_rooms.parquet
     train_proportion: 0.9
     output_train_filepath: ./data/prepared_data/train.parquet
     output_test_filepath: ./data/prepared_data/test.parquet
@@ -37,7 +36,9 @@ default:
       drop_columns: [
         "heat_demand_change", "carbon_change", "rdsap_change", "heat_demand_ending", "carbon_ending", "days_to_starting", "days_to_ending",
         'number_habitable_rooms_starting', 'number_habitable_rooms_ending', 'number_heated_rooms_starting', 'number_heated_rooms_ending',
-        'number_habitable_rooms', 'number_heated_rooms']
+        'number_habitable_rooms', 'number_heated_rooms', 'lighting_cost_starting',
+        'lighting_cost_ending', 'heating_cost_starting', 'heating_cost_ending', 'hot_water_cost_starting', 'hot_water_cost_ending',
+        'floor_thermal_transmittance', 'floor_thermal_transmittance_ending']
       retain_features: null
       # retain_features: ['uprn', 'sap_starting', 'hot_water_energy_eff_ending',
       #  'mainheat_energy_eff_ending', 'constituency', 'roof_energy_eff_ending',

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

@@ -34,13 +34,21 @@ stages:
         - number_heated_rooms_ending
         - number_habitable_rooms
         - number_heated_rooms
+        - lighting_cost_starting
+        - lighting_cost_ending
+        - heating_cost_starting
+        - heating_cost_ending
+        - hot_water_cost_starting
+        - hot_water_cost_ending
+        - floor_thermal_transmittance
+        - floor_thermal_transmittance_ending
         default.feature_processor.feature_processor_config.retain_features:
         default.feature_processor.feature_processor_config.subsample_amount:
         default.feature_processor.feature_processor_config.subsample_seed: 0
         default.feature_processor.feature_processor_config.target: sap_ending
         default.feature_processor.feature_processor_type: dataframe
         default.prepare_data.data_filepath:
-          s3://retrofit-data-dev/sap_change_model/2024-05-28-19-08-25/dataset_rooms.parquet
+          s3://retrofit-data-dev/sap_change_model/2024-10-08-21-58-03/dataset_rooms.parquet
         default.prepare_data.input_dataclient_type: aws-s3
         default.prepare_data.output_dataclient_type: local
         default.prepare_data.output_test_filepath: ./data/prepared_data/test.parquet
@@ -49,8 +57,8 @@ stages:
     outs:
     - path: data/prepared_data/
       hash: md5
-      md5: 80c9e138146a1d96b9d16091c207e2e8.dir
+      md5: 9159a400187e6d65687b5e411a4cb0de.dir
-      size: 45056059
+      size: 48034631
       nfiles: 2
   build_model:
     cmd: python 2_build_model.py
@@ -61,8 +69,8 @@ stages:
       size: 4820
     - path: data/prepared_data
       hash: md5
-      md5: 80c9e138146a1d96b9d16091c207e2e8.dir
+      md5: 9159a400187e6d65687b5e411a4cb0de.dir
-      size: 45056059
+      size: 48034631
       nfiles: 2
     params:
       configs/build_model.yaml:
@@ -94,18 +102,18 @@ stages:
     outs:
     - path: data/fit_predictions/
       hash: md5
-      md5: d9c9afc05e8780db47c0548b19bf7d19.dir
+      md5: 6ac50c46e6fd740ccf76da4c2bf6735d.dir
-      size: 3349989
+      size: 3615441
       nfiles: 1
     - path: data/model/
       hash: md5
-      md5: 13c3100e1486c27a83a8a47491077842.dir
+      md5: 2212643103819177f58da1d3063c8c94.dir
-      size: 773523079
+      size: 761489901
-      nfiles: 36
+      nfiles: 35
     - path: metrics/fit_metrics.json
       hash: md5
-      md5: 2ff70a2a45813e1bcdf2ea3aa8e07d4a
+      md5: d379cf95e07eb7c8797b4b766f8292cf
-      size: 224
+      size: 225
   generate_predictions:
     cmd: python 3_generate_predictions.py
     deps:
@@ -115,13 +123,13 @@ stages:
       size: 2464
     - path: data/model
       hash: md5
-      md5: 13c3100e1486c27a83a8a47491077842.dir
+      md5: 2212643103819177f58da1d3063c8c94.dir
-      size: 773523079
+      size: 761489901
-      nfiles: 36
+      nfiles: 35
     - path: data/prepared_data
       hash: md5
-      md5: 80c9e138146a1d96b9d16091c207e2e8.dir
+      md5: 9159a400187e6d65687b5e411a4cb0de.dir
-      size: 45056059
+      size: 48034631
       nfiles: 2
     params:
       configs/settings.yaml:
@@ -133,8 +141,8 @@ stages:
     outs:
     - path: data/predictions/
       hash: md5
-      md5: 5d07bcebf3160a72bb18dfd79106e85c.dir
+      md5: e8bd8e8ba88a667ccea645890d348e62.dir
-      size: 463197
+      size: 507948
       nfiles: 1
   generate_metrics:
     cmd: python 4_generate_metrics.py
@@ -145,13 +153,13 @@ stages:
       size: 3484
     - path: data/predictions
       hash: md5
-      md5: 5d07bcebf3160a72bb18dfd79106e85c.dir
+      md5: e8bd8e8ba88a667ccea645890d348e62.dir
-      size: 463197
+      size: 507948
       nfiles: 1
     - path: data/prepared_data
       hash: md5
-      md5: 80c9e138146a1d96b9d16091c207e2e8.dir
+      md5: 9159a400187e6d65687b5e411a4cb0de.dir
-      size: 45056059
+      size: 48034631
       nfiles: 2
     params:
       configs/settings.yaml:
@@ -161,8 +169,8 @@ stages:
     outs:
     - path: metrics/metrics.json
       hash: md5
-      md5: 3e08df02fd5c5d094bcf936e1338d596
+      md5: a8cf405272776730f5818d50b20c6f43
-      size: 223
+      size: 222
   generate_scenerio_metrics:
     cmd: python 5_generate_scenarios.py
     deps:
@@ -176,15 +184,15 @@ stages:
           input_dataclient_type: aws-s3
           output_dataclient_type: local
           scenario_data_filepaths:
-          - s3://retrofit-data-dev/scenario_data/28-05-2024-19-22-41/recommendations_scoring_data.parquet
+          - s3://retrofit-data-dev/scenario_data/09-10-2024-18-21-08/recommendations_scoring_data.parquet
           comparison_output_filepath: ./metrics/scenario_table.md
           metrics_output_filepath: ./metrics/scenario_metrics.md
     outs:
     - path: metrics/scenario_metrics.md
       hash: md5
-      md5: fa4d6d7bbd7818613800da5f8f37ea96
+      md5: a5d9c42d38ef50e4fdf99a3e6043af2a
-      size: 363
+      size: 356
     - path: metrics/scenario_table.md
       hash: md5
-      md5: d6baf100a1623cc2467c2f8221d314c9
+      md5: 3e48c953451af8852572299b66988910
-      size: 2133
+      size: 872