junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-07-27 23:35:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1576 from Hestia-Homes/feat/pashub-wall-construction-1560

Browse source 
PAS Hub mapper: wall_construction label -> SAP10 code (#1560)
This commit is contained in:
KhalimCK 2026-07-14 17:36:16 +01:00 • committed by GitHub
commit de8e5c5621
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 152 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
datatypes/epc/domain/mapper.py
View file

@ -5947,8 +5947,12 @@ def _map_main_building_part(
return SapBuildingPart(
identifier=BuildingPartIdentifier.MAIN,
construction_age_band=_extract_age_band(main.age_range),
wall_construction=main.walls_construction_type,
wall_insulation_type=main.walls_insulation_type,
wall_construction=_pashub_wall_construction_int(
main.walls_construction_type
),
wall_insulation_type=_pashub_wall_insulation_type_int(
main.walls_insulation_type
),
wall_thickness_measured=main.wall_thickness_mm is not None,
party_wall_construction=_pashub_party_wall_construction_int(
main.party_wall_construction_type
@ -5973,8 +5977,12 @@ def _map_extension_building_part(
return SapBuildingPart(
identifier=BuildingPartIdentifier.extension(ext_c.id),
construction_age_band=_extract_age_band(ext_c.age_range),
wall_construction=ext_c.walls_construction_type,
wall_insulation_type=ext_c.walls_insulation_type,
wall_construction=_pashub_wall_construction_int(
ext_c.walls_construction_type
),
wall_insulation_type=_pashub_wall_insulation_type_int(
ext_c.walls_insulation_type
),
wall_thickness_measured=ext_c.wall_thickness_mm is not None,
party_wall_construction=_pashub_party_wall_construction_int(
ext_c.party_wall_construction_type
@ -7137,6 +7145,63 @@ def _pashub_party_wall_construction_int(label: Optional[str]) -> Optional[int]:
return _PASHUB_PARTY_WALL_CONSTRUCTION_TO_SAP10[key]
# PasHub surveyed `walls_construction_type` label → SAP10 `wall_construction`
# code (the WALL_* constants in domain.sap10_ml.rdsap_uvalues) that `u_wall`
# consumes. Same target code-space as the GOV.UK-API (`_api_wall_construction_
# code`) and Elmhurst (`_ELMHURST_WALL_CODE_TO_SAP10`) siblings — PasHub just
# lodges the full human label.
_PASHUB_WALL_CONSTRUCTION_TO_SAP10: Dict[str, int] = {
"Solid brick": 3, # WALL_SOLID_BRICK
"Cavity": 4, # WALL_CAVITY
"Timber frame": 5, # WALL_TIMBER_FRAME
"System Build (i.e Any Other)": 6, # WALL_SYSTEM_BUILT
}
def _pashub_wall_construction_int(label: Optional[str]) -> Union[int, str]:
"""Resolve a PasHub surveyed `walls_construction_type` label to its SAP10
`wall_construction` code at the mapper boundary. A blank label is "no lodging"
and passes through as the empty string (the `SapBuildingPart.wall_construction`
field is `Union[int, str]`, and the calculator's `_int_or_none` resolves a
non-numeric string to None → the age-band/thickness U-value fallback); a
non-empty label the lookup does not cover strict-raises `UnmappedPasHubLabel`
so the coverage gap is fixed here rather than silently dropping the
construction distinction downstream (#1560)."""
if label is None or not label.strip():
return ""
key = label.strip()
if key not in _PASHUB_WALL_CONSTRUCTION_TO_SAP10:
raise UnmappedPasHubLabel("wall construction", label)
return _PASHUB_WALL_CONSTRUCTION_TO_SAP10[key]
# PasHub surveyed `walls_insulation_type` label → SAP10 wall-insulation code that
# `u_wall` consumes. Same target code-space as the Elmhurst sibling
# (`_ELMHURST_WALL_INSULATION_TO_SAP10`) — PasHub just lodges the full human
# label. "As built" is the assumed/default cascade code (Elmhurst "A"=4).
_PASHUB_WALL_INSULATION_TYPE_TO_SAP10: Dict[str, int] = {
"As built": 4, # as built / assumed (default cascade)
"Filled Cavity": 2, # WALL_INSULATION_FILLED_CAVITY
"External": 1, # external wall insulation
}
def _pashub_wall_insulation_type_int(label: Optional[str]) -> Union[int, str]:
"""Resolve a PasHub surveyed `walls_insulation_type` label to its SAP10
wall-insulation code at the mapper boundary. A blank label is "no lodging" and
passes through as the empty string (the field is `Union[int, str]`; the
calculator's `_int_or_none` resolves a non-numeric string to None); a non-empty
label the lookup does not cover strict-raises `UnmappedPasHubLabel` so the
coverage gap is fixed here rather than silently dropping the filled-cavity
U-value credit downstream (#1561)."""
if label is None or not label.strip():
return ""
key = label.strip()
if key not in _PASHUB_WALL_INSULATION_TYPE_TO_SAP10:
raise UnmappedPasHubLabel("wall insulation type", label)
return _PASHUB_WALL_INSULATION_TYPE_TO_SAP10[key]
def _resolve_elmhurst_underfloor_subtype(
main_floor: ElmhurstFloorDetails,
main_age_band: str,

89
datatypes/epc/domain/tests/test_from_site_notes.py
View file

@ -74,6 +74,83 @@ class TestPartyWallConstructionCoding:
EpcPropertyDataMapper.from_site_notes(survey)
class TestWallConstructionCoding:
"""`from_site_notes` must int-code the PAS Hub `walls_construction_type` label
to the SAP10 `wall_construction` code `u_wall` consumes (WALL_* constants),
not copy the raw label. A raw label reads as `None`, so the wall U-value falls
back to age band + thickness only and loses the solid/cavity/timber/system
distinction (Guinness cohort, issue #1560).
"""
@pytest.mark.parametrize(
"label, expected_code",
[
("Solid brick", 3), # WALL_SOLID_BRICK
("Cavity", 4), # WALL_CAVITY
("Timber frame", 5), # WALL_TIMBER_FRAME
("System Build (i.e Any Other)", 6), # WALL_SYSTEM_BUILT
("", ""), # no lodging — passes through (calc nulls it via _int_or_none)
],
)
def test_label_maps_to_sap_code(
self, label: str, expected_code: "int | str"
) -> None:
data = load("pashub_rdsap_site_notes_example1.json")
data["building_construction"]["main_building"][
"walls_construction_type"
] = label
survey = from_dict(PasHubRdSapSiteNotes, data)
result = EpcPropertyDataMapper.from_site_notes(survey)
assert result.sap_building_parts[0].wall_construction == expected_code
def test_unknown_label_strict_raises(self) -> None:
data = load("pashub_rdsap_site_notes_example1.json")
data["building_construction"]["main_building"][
"walls_construction_type"
] = "Woven Basket"
survey = from_dict(PasHubRdSapSiteNotes, data)
with pytest.raises(UnmappedPasHubLabel):
EpcPropertyDataMapper.from_site_notes(survey)
class TestWallInsulationTypeCoding:
"""`from_site_notes` must int-code the PAS Hub `walls_insulation_type` label
to the SAP10 wall-insulation code `u_wall` consumes (matching the Elmhurst
`_ELMHURST_WALL_INSULATION_TO_SAP10` sibling), not copy the raw label. A raw
label reads as `None`, so a filled cavity loses its lower-U credit and the
wall is over-counted (Guinness cohort, issue #1561).
"""
@pytest.mark.parametrize(
"label, expected_code",
[
("As built", 4), # as built / assumed (default cascade)
("Filled Cavity", 2), # WALL_INSULATION_FILLED_CAVITY
("External", 1), # external wall insulation
("", ""), # no lodging — passes through (calc nulls it via _int_or_none)
],
)
def test_label_maps_to_sap_code(
self, label: str, expected_code: "int | str"
) -> None:
data = load("pashub_rdsap_site_notes_example1.json")
data["building_construction"]["main_building"][
"walls_insulation_type"
] = label
survey = from_dict(PasHubRdSapSiteNotes, data)
result = EpcPropertyDataMapper.from_site_notes(survey)
assert result.sap_building_parts[0].wall_insulation_type == expected_code
def test_unknown_label_strict_raises(self) -> None:
data = load("pashub_rdsap_site_notes_example1.json")
data["building_construction"]["main_building"][
"walls_insulation_type"
] = "Aerogel Blanket"
survey = from_dict(PasHubRdSapSiteNotes, data)
with pytest.raises(UnmappedPasHubLabel):
EpcPropertyDataMapper.from_site_notes(survey)
class TestFromSiteNotesExample1:
"""
Fixture: pashub_rdsap_site_notes_example1.json
@ -259,12 +336,12 @@ class TestFromSiteNotesExample1:
assert result.sap_building_parts[0].construction_age_band == "I"
def test_wall_construction(self, result: EpcPropertyData) -> None:
# main_building.walls_construction_type: "Cavity"
assert result.sap_building_parts[0].wall_construction == "Cavity"
# main_building.walls_construction_type: "Cavity" → SAP10 code 4 (WALL_CAVITY)
assert result.sap_building_parts[0].wall_construction == 4
def test_wall_insulation_type(self, result: EpcPropertyData) -> None:
# main_building.walls_insulation_type: "As built"
assert result.sap_building_parts[0].wall_insulation_type == "As built"
# main_building.walls_insulation_type: "As built" → SAP10 code 4 (as built/assumed)
assert result.sap_building_parts[0].wall_insulation_type == 4
def test_wall_thickness_measured(self, result: EpcPropertyData) -> None:
# main_building.wall_thickness_mm: 280 → thickness was measured
@ -509,8 +586,8 @@ class TestFromSiteNotesExample1:
SapBuildingPart(
identifier=BuildingPartIdentifier.MAIN,
construction_age_band="I",
wall_construction="Cavity",
wall_insulation_type="As built",
wall_construction=4, # "Cavity" → SAP10 code 4 (WALL_CAVITY)
wall_insulation_type=4, # "As built" → SAP10 code 4 (as built/assumed)
wall_thickness_measured=True,
party_wall_construction=4, # "Cavity Masonry, Unfilled" → SAP10 code 4 (U=0.5)
sap_floor_dimensions=[