Added overrides and patches to router

.idea/Model.iml

@@ -7,7 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/open_uprn" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/recommendations" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.10 (model_data)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.10 (backend)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyNamespacePackagesService">

.idea/misc.xml

@@ -3,7 +3,7 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.10 (backend)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (model_data)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (backend)" project-jdk-type="Python SDK" />
   <component name="PythonCompatibilityInspectionAdvertiser">
     <option name="version" value="3" />
   </component>

backend/Property.py

@@ -60,7 +60,7 @@ class Property:
     n_bedrooms = None
 
     def __init__(
-        self, id, postcode, address, epc_record, **kwargs
+        self, id, postcode, address, epc_record, overrides=None, **kwargs
     ):
 
         self.epc_record = epc_record
@@ -74,6 +74,10 @@ class Property:
         }
         self.old_data = epc_record.get("old_data")
         self.property_dimensions = None
+        # This is a list of measures that have already been installed in the property, typically found as a result
+        # of the non-invasive surveys. We reflect that this has been installed in the recommendations, but remove the
+        # cost and instead, provide a message that the measure has already been installed
+        self.overrides = overrides
 
         self.uprn = epc_record.get("uprn")
         self.full_sap_epc = epc_record.get("full_sap_epc")

backend/app/plan/router.py

@@ -44,20 +44,15 @@ BATCH_SIZE = 5
 SCORING_BATCH_SIZE = 400
 
 
-def patch_epc(config, epc_records):
+def patch_epc(patch, epc_records):
     """
     This utility function is useful to patch the epc data if we have data from the customer
     :return:
     """
 
-    number_habitable_rooms = config.get("number-habitable-rooms", None)
-    number_heated_rooms = config.get("number-heated-rooms", None)
-
-    if number_habitable_rooms is not None:
-        epc_records["original_epc"]["number-habitable-rooms"] = int(number_habitable_rooms)
-
-    if number_heated_rooms is not None:
-        epc_records["original_epc"]["number-heated-rooms"] = int(number_heated_rooms)
+    for patch_variable, patch_value in patch.items():
+        if patch_variable in epc_records["original_epc"]:
+            epc_records["original_epc"][patch_variable] = patch_value
 
     return epc_records
 
@@ -85,6 +80,17 @@ async def trigger_plan(body: PlanTriggerRequest):
         session.begin()
         logger.info("Getting the inputs")
         plan_input = read_csv_from_s3(bucket_name=get_settings().PLAN_TRIGGER_BUCKET, filepath=body.trigger_file_path)
+        # If we have patches or overrides, we should read them in here
+        patches = []
+        if body.patches_file_path:
+            patches = read_csv_from_s3(bucket_name=get_settings().PLAN_TRIGGER_BUCKET, filepath=body.patches_file_path)
+
+        overrides = []
+        if body.overrides_file_path:
+            overrides = read_csv_from_s3(
+                bucket_name=get_settings().PLAN_TRIGGER_BUCKET, filepath=body.overrides_file_path
+            )
+
         cleaning_data = read_dataframe_from_s3_parquet(
             bucket_name=get_settings().DATA_BUCKET, file_key="sap_change_model/cleaning_dataset.parquet",
         )
@@ -124,7 +130,11 @@ async def trigger_plan(body: PlanTriggerRequest):
                 'full_sap_epc': epc_searcher.full_sap_epc.copy(),
                 'old_data': epc_searcher.older_epcs.copy(),
             }
-            epc_records = patch_epc(config, epc_records)
+
+            patch = next((
+                x for x in patches if (x["address"] == config["address"]) and (x["postcode"] == config["postcode"])
+            ), None)
+            epc_records = patch_epc(patch, epc_records)
 
             prepared_epc = EPCRecord(
                 epc_records=epc_records,
@@ -132,12 +142,16 @@ async def trigger_plan(body: PlanTriggerRequest):
                 cleaning_data=cleaning_data
             )
 
+            overrides = next((
+                x for x in overrides if (x["address"] == config["address"]) and (x["postcode"] == config["postcode"])
+            ), None)
             input_properties.append(
                 Property(
                     id=property_id,
                     address=epc_searcher.address_clean,
                     postcode=epc_searcher.postcode_clean,
                     epc_record=prepared_epc,
+                    overrides=overrides,
                     **Property.extract_kwargs(config)
                 )
             )

backend/app/plan/schemas.py

@@ -9,6 +9,8 @@ class PlanTriggerRequest(BaseModel):
     goal_value: str
     portfolio_id: int
     trigger_file_path: str
+    overrides_file_path: Optional[str] = None
+    patches_file_path: Optional[str] = None
     exclusions: Optional[conlist(str, min_items=1)] = None
 
     # Pre-defined list of possibilities for exclusions

etl/customers/immo/pilot/asset_list.py

@@ -24,7 +24,7 @@ council_tax_bands = pd.DataFrame(council_tax_bands)
 patches = [
     {
         'address': '6 Beech Road', 'postcode': 'DY1 4BP',
-        'walls-description': 'Mixed: Filled cavity and external insulated solid brick',
+        'walls-description': 'Cavity wall, filled cavity',
         'walls-energy-eff': 'Good',
         'roof-description': 'Pitched, 12 mm loft insulation',
         'roof-energy-eff': 'Very Poor',
@@ -36,7 +36,7 @@ patches = [
         'mainheatc-energy-eff': 'Good',
         'lighting-description': 'Low energy lighting in 25% of fixed outlets',
         'lighting-energy-eff': 'Good',
-        'floor-description': 'Mixed: Solid no insulation and suspended no insulation',
+        'floor-description': 'Solid, no insulation (assumed)',
         'secondheat-description': 'None',
         'current-energy-efficiency': '32',
     }