mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-06-30 13:10:47 +00:00
29ac35ccbe
Migration of the SAP 10.2 calculator package from the uv-workspace
src-layout (`packages/domain/src/domain/sap`) to the root-level layout
(`domain/sap10_calculator`), matching the pattern already used by
`domain.addresses` / `domain.tasks` / `domain.postcode`.
Changes:
- `git mv packages/domain/src/domain/sap → domain/sap10_calculator`
(92 files; git auto-detected all as renames so blame/history is
preserved).
- Subpackage rename: `domain.sap` → `domain.sap10_calculator`. 48
Python files rewritten (`from domain.sap.X` → `from domain.sap10_
calculator.X`); zero remaining `domain.sap` refs after the sed pass.
- Path-string updates: 3 .py files (test fixtures + xlsx loader) +
6 markdown docs (CONTEXT.md, 2 ADRs, 3 sap-spec docs, sap10_
calculator/README.md) had hard-coded `packages/domain/src/domain/
sap/...` paths rewritten to `domain/sap10_calculator/...`.
- `Path(__file__).parents[N]` rebasing: the old tree was 3 levels
deeper than the new one (`packages/domain/src/`), so 4× `parents[7]`
became `parents[4]` and 1× `parents[6]` became `parents[3]` across
`tables/pcdb/{__init__.py, postcode_weather.py, etl.py}`,
`worksheet/tests/_xlsx_loader.py`, and `tests/test_pcdb_etl.py`.
- PEP 420 namespace package: deleted both `domain/__init__.py`
(root + workspace, both load-bearing only as empty/docstring) so
Python combines `domain.sap10_calculator` (root) and `domain.ml`
(workspace) into one namespace package. Confirmed via
`domain.__path__ == ['/workspaces/model/domain',
'/workspaces/model/packages/domain/src/domain']`. Without this,
the root `domain/__init__.py` shadowed the workspace one and
`domain.ml` was unreachable.
Verified:
- Full sweep (`backend/documents_parser/tests/test_summary_pdf_
mapper_chain.py + domain/sap10_calculator/worksheet/tests/test_
e2e_elmhurst_sap_score.py + domain/sap10_calculator/rdsap/tests/
test_golden_fixtures.py`): 99 passed / 19 failed — exact same
counts as pre-refactor. All 19 failures pre-existing (9 hand-built
001479 + 6 cohort diff + 4 cohort chain non-spec).
- Wider sweep (all sap10_calculator + domain.ml): 1654 passed /
20 failed (the +1 vs the focused sweep is the pre-existing
`test_roof_insulated_assumed_with_ni_thickness_uses_50mm_per_
section_5_11_4` which was already failing on the previous baseline).
- Pyright net-zero on the three load-bearing baselines:
`heat_transmission.py` 13, `cert_to_inputs.py` 35, `mapper.py` 33.
Lift-and-shift only — no semantic renames (`Sap10Calculator` stays
`Sap10Calculator`), no testpaths edits in pytest.ini (sap tests
continue to be invoked by explicit pytest paths).
Note: `domain.ml` still lives at `packages/domain/src/domain/ml/`.
Migrating it would close out the dual-`domain/` layout but is
out of scope for this commit.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
30 lines
1.3 KiB
Python
30 lines
1.3 KiB
Python
"""SAP 10.2 §8f Fabric Energy Efficiency — line ref (109).
|
|
|
|
Spec line 7898: (109) = (98a) ÷ (4) + (108). The FEE is the dwelling's
|
|
intrinsic fabric demand in kWh/m²/yr — space heating per m² (pre Appendix
|
|
H solar offset) plus space cooling per m². §11 of the spec says FEE is
|
|
"calculated only under special conditions" — new-build compliance — and
|
|
under those conditions the whole worksheet is re-run with different
|
|
ventilation / hot water / lighting / gains-column assumptions. For
|
|
existing-dwelling ratings we expose FEE as a transparency output computed
|
|
off rating-conditions (98a) and (108); a future §11 compliance slice
|
|
would invoke this function with §11-conditions upstream values.
|
|
|
|
Reference: SAP 10.2 specification (14-03-2025) worksheet block §8f
|
|
(line 7898) and §11 (lines 2151-2164).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
def fabric_energy_efficiency_kwh_per_m2_yr(
|
|
*,
|
|
space_heating_kwh_per_yr: float,
|
|
total_floor_area_m2: float,
|
|
space_cooling_per_m2_kwh: float,
|
|
) -> float:
|
|
"""SAP 10.2 (109) = (98a) ÷ (4) + (108). Returns 0.0 if TFA ≤ 0 (matches
|
|
the §8 (99) / §8c (108) edge-case convention)."""
|
|
if total_floor_area_m2 <= 0:
|
|
return 0.0
|
|
return space_heating_kwh_per_yr / total_floor_area_m2 + space_cooling_per_m2_kwh
|