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

added better logging on dupes and adding new types to material table

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2025-09-28 15:34:05 +01:00
parent 00827b7bd7
commit 7c5c7ceb0c
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
backend/Funding.py
View file

@ -578,6 +578,11 @@ class Funding:
return pps.squeeze()["Cost Savings"] return pps.squeeze()["Cost Savings"]
if measure_type == "flat_roof_insulation": if measure_type == "flat_roof_insulation":
# Not funding for properties starting at C or above
if self.starting_sap_band in ["Low_C", "High_C", "Low_B", "High_B", "Low_A", "High_A"]:
return 0
pps = filtered_pps_matrix[filtered_pps_matrix["Measure_Type"] == "FRI"] pps = filtered_pps_matrix[filtered_pps_matrix["Measure_Type"] == "FRI"]
if pps.shape[0] != 1: if pps.shape[0] != 1:
raise ValueError("Invalid FRI category") raise ValueError("Invalid FRI category")

2
backend/app/db/models/materials.py
View file

@ -45,6 +45,8 @@ class MaterialType(enum.Enum):
scaffolding = "scaffolding" scaffolding = "scaffolding"
high_heat_retention_storage_heaters = "high_heat_retention_storage_heaters" high_heat_retention_storage_heaters = "high_heat_retention_storage_heaters"
sealing_fireplace = "sealing_fireplace" sealing_fireplace = "sealing_fireplace"
roomstat_programmer_trvs = "roomstat_programmer_trvs"
time_temperature_zone_control = "time_temperature_zone_control"
class DepthUnit(enum.Enum): class DepthUnit(enum.Enum):

5
backend/engine/engine.py
View file

@ -534,7 +534,10 @@ async def model_engine(body: PlanTriggerRequest):
if input_uprns: if input_uprns:
# Check for dupes # Check for dupes
if len(input_uprns) != len(set(input_uprns)): if len(input_uprns) != len(set(input_uprns)):
raise ValueError("Duplicate UPRNs in the input data") # Find the duplicate UPRNs
duplicates = set([x for x in input_uprns if input_uprns.count(x) > 1])
# de-dupe input_uprns
raise ValueError(f"Duplicate UPRNs in the input data: {duplicates}")
# If we have patches or overrides, we should read them in here # If we have patches or overrides, we should read them in here
patches, already_installed, non_invasive_recommendations, valuation_data = get_request_property_data(body) patches, already_installed, non_invasive_recommendations, valuation_data = get_request_property_data(body)