junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-30 13:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding scoring data

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-05-21 19:08:44 +01:00
parent 340e8118eb
commit f9e9cb59a6
2 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
backend/Property.py
View file

@ -230,6 +230,29 @@ class Property:
# self.base_difference_record.df # self.base_difference_record.df
def simulate_all_representative_recommendations(
self, property_representative_recommendations,
):
"""
This method was put together to simulate the impact of the representative recommendations on the property
all at once, for usage within the mds report
:return:
"""
recommendation_record = self.base_difference_record.df.to_dict("records")[
0
].copy()
scoring_dict = self.create_recommendation_scoring_data(
property_id=self.id,
recommendation_record=recommendation_record,
recommendations=property_representative_recommendations,
primary_recommendation_id=self.id,
non_invasive_recommendations=self.non_invasive_recommendations,
)
return scoring_dict
def adjust_difference_record_with_recommendations( def adjust_difference_record_with_recommendations(
self, property_recommendations, property_representative_recommendations self, property_recommendations, property_representative_recommendations
): ):

21
backend/app/plan/router.py
View file

@ -641,9 +641,14 @@ async def build_mds(body: PlanTriggerRequest):
input_properties = [] input_properties = []
for property_id, config in tqdm(enumerate(plan_input), total=len(plan_input)): for property_id, config in tqdm(enumerate(plan_input), total=len(plan_input)):
# We validate each record in the file. If the record is NOT valid, we need to handle this accordingly # We validate each record in the file. If the record is NOT valid, we need to handle this accordingly
uprn = config.get("uprn", None)
if uprn: if config["address"] in ["Flat Over 20 Holborough Road", "Flat above 7 Malling Road"]:
uprn = int(float(uprn)) print("TEMP - not using uprn")
uprn = None
else:
uprn = config.get("uprn", None)
if uprn:
uprn = int(float(uprn))
epc_searcher = SearchEpc( epc_searcher = SearchEpc(
address1=config["address"], address1=config["address"],
@ -728,7 +733,6 @@ async def build_mds(body: PlanTriggerRequest):
p.get_spatial_data(uprn_filenames) p.get_spatial_data(uprn_filenames)
logger.info("Getting components and epc recommendations") logger.info("Getting components and epc recommendations")
recommendations = {}
recommendations_scoring_data = [] recommendations_scoring_data = []
representative_recommendations = {} representative_recommendations = {}
@ -741,6 +745,15 @@ async def build_mds(body: PlanTriggerRequest):
if errors: if errors:
logger.info("Errors occurred during MDS build") logger.info("Errors occurred during MDS build")
representative_recommendations[p.id] = property_representative_recommendations
# Build the scoring data
p.create_base_difference_epc_record(cleaned_lookup=cleaned)
p.simulate_all_representative_recommendations(property_representative_recommendations)
recommendations_scoring_data.extend(p.recommendations_scoring_data)
except IntegrityError: except IntegrityError:
logger.error("Database integrity error occurred", exc_info=True) logger.error("Database integrity error occurred", exc_info=True)