mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-07-12 13:29:04 +00:00
086187ddc7
Add a `predicted_epc` slot to the Property aggregate and a "predicted" branch to SourcePath / source_path / effective_epc (ADR-0031 decisions 1+3). A neighbour-synthesised EpcPropertyData resolves as the Effective EPC ONLY when there is neither a lodged EPC nor Site Notes — a real source always wins (prediction is last-resort gap-fill). The slot is distinct from `epc` so a predicted picture coexists with any lodged one (provenance is structural, not a flag on EpcPropertyData); downstream consumers are untouched. 3 tests: predicted resolves when sole source; lodged EPC wins over predicted; Site Notes win over predicted. 10/10 green, pyright strict clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
93 lines
3.8 KiB
Python
93 lines
3.8 KiB
Python
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass
|
|
from typing import Literal, Optional
|
|
|
|
from datatypes.epc.domain.epc_property_data import EpcPropertyData
|
|
from domain.geospatial.planning_restrictions import PlanningRestrictions
|
|
from domain.property.site_notes import SiteNotes
|
|
|
|
SourcePath = Literal["site_notes", "epc_with_overlay", "predicted"]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class PropertyIdentity:
|
|
"""Identifies a single Property within a portfolio.
|
|
|
|
Keyed by `(portfolio_id, uprn)` or `(portfolio_id, landlord_property_id)` —
|
|
a UPRN is permanent but each portfolio gets its own Property against it
|
|
(CONTEXT.md: UPRN).
|
|
"""
|
|
|
|
portfolio_id: int
|
|
postcode: str
|
|
address: str
|
|
uprn: Optional[int] = None
|
|
landlord_property_id: Optional[str] = None
|
|
|
|
|
|
@dataclass
|
|
class Property:
|
|
"""The Ara modelling aggregate root for a single dwelling (ADR-0002).
|
|
|
|
Holds identity plus the source data the pipeline reasons about. Enrichments
|
|
(geospatial, solar) and modelling outputs (baseline performance, plans) are
|
|
added by later slices — this is the minimal-and-growing shape for First Run.
|
|
"""
|
|
|
|
identity: PropertyIdentity
|
|
epc: Optional[EpcPropertyData] = None
|
|
site_notes: Optional[SiteNotes] = None
|
|
# A neighbour-synthesised EpcPropertyData (EPC Prediction gap-fill, ADR-0031),
|
|
# held in its own slot so it coexists with any lodged `epc` (provenance is
|
|
# structural). Used as the Effective EPC only as a last resort — when there is
|
|
# neither a lodged EPC nor Site Notes; a real source always wins.
|
|
predicted_epc: Optional[EpcPropertyData] = None
|
|
# The current open-market value (a Property Valuation) — externally sourced
|
|
# and mostly absent; feeds the Plan's Valuation Uplift £ forms (ADR-0018).
|
|
current_market_value: Optional[float] = None
|
|
# Planning protections resolved from the geospatial layer (ADR-0020); gate
|
|
# wall insulation (ADR-0019). Defaults to unrestricted when unknown.
|
|
planning_restrictions: PlanningRestrictions = PlanningRestrictions()
|
|
|
|
@property
|
|
def source_path(self) -> SourcePath:
|
|
"""Which of the two disjoint source paths models this Property (ADR-0001).
|
|
|
|
Site Notes alone, or the public EPC (with Landlord Overrides, once that
|
|
slice lands). When both exist the newer wins (Recency Tie-Break); on an
|
|
equal date the survey wins, as it reflects on-site observation.
|
|
"""
|
|
if self.site_notes is not None and self.epc is not None:
|
|
epc_date = self.epc.registration_date or self.epc.inspection_date
|
|
if self.site_notes.surveyed_at >= epc_date:
|
|
return "site_notes"
|
|
return "epc_with_overlay"
|
|
if self.site_notes is not None:
|
|
return "site_notes"
|
|
if self.epc is not None:
|
|
return "epc_with_overlay"
|
|
if self.predicted_epc is not None:
|
|
return "predicted"
|
|
raise ValueError(
|
|
"Property has neither Site Notes, an EPC, nor a predicted EPC; "
|
|
"no source path to model from"
|
|
)
|
|
|
|
@property
|
|
def effective_epc(self) -> EpcPropertyData:
|
|
"""The EpcPropertyData the modelling pipeline scores against.
|
|
|
|
Path 1: the Site Notes' surveyed data. Path 2: the public EPC (Landlord
|
|
Overrides overlay is a later slice — returned as-is for now). Path 3: a
|
|
neighbour-synthesised EPC (EPC Prediction gap-fill, ADR-0031), used only
|
|
when neither real source is present.
|
|
"""
|
|
if self.source_path == "site_notes":
|
|
assert self.site_notes is not None
|
|
return self.site_notes.to_epc_property_data()
|
|
if self.source_path == "predicted":
|
|
assert self.predicted_epc is not None
|
|
return self.predicted_epc
|
|
assert self.epc is not None
|
|
return self.epc
|