From fe80fa3036689ed7e10887dab534c3f6e217647c Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Fri, 9 Aug 2024 12:32:33 +0100 Subject: [PATCH] renamed set_features --- backend/Property.py | 2 +- backend/app/plan/router.py | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/backend/Property.py b/backend/Property.py index 5c065458..96e3a308 100644 --- a/backend/Property.py +++ b/backend/Property.py @@ -582,7 +582,7 @@ class Property: return output - def get_components( + def set_features( self, cleaned, kwh_client, diff --git a/backend/app/plan/router.py b/backend/app/plan/router.py index 56b4909e..d0922a2b 100644 --- a/backend/app/plan/router.py +++ b/backend/app/plan/router.py @@ -437,7 +437,7 @@ async def trigger_plan(body: PlanTriggerRequest): epcs_for_scoring = kwh_client.transform(data=kwh_client.prepare_epc(input_properties), cleaned=cleaned) - kwh_predictions = model_api.predict_all( + kwh_preds = model_api.predict_all( df=epcs_for_scoring, bucket=get_settings().DATA_BUCKET, prediction_buckets=get_prediction_buckets(), @@ -449,11 +449,8 @@ async def trigger_plan(body: PlanTriggerRequest): logger.info("Getting spatial data") input_properties = OpenUprnClient.set_spatial_data(input_properties, bucket_name=get_settings().DATA_BUCKET) - logger.info("Setting property components") - for p in tqdm(input_properties): - p.get_components( - cleaned=cleaned, kwh_client=kwh_client, kwh_predictions=kwh_predictions - ) + logger.info("Setting property features") + [p.set_features(cleaned=cleaned, kwh_client=kwh_client, kwh_predictions=kwh_preds) for p in input_properties] logger.info("Performing solar analysis") # TODO: Tidy this up