2d9cb995e6
Per SAP 10.2 Table 12a Grid 2 (PDF p.191) + Table 12d / 12e (PDF p.194-195):
Table 12a Grid 2 row "All other uses" (lighting + pumps + locally
generated electricity + ... ) × tariff column:
SEVEN_HOUR → 0.90 high-rate fraction
TEN_HOUR → 0.80 high-rate fraction
Table 12d header (p.194): "Where electricity is the fuel used, the
relevant set of factors in the table below should be used to calculate
the monthly CO2 emissions INSTEAD of the annual average factor given
in Table 12."
Identical wording on Table 12e (p.195) for primary energy. The cascade
must therefore blend Table 12d / 12e high-rate × low-rate codes for the
end-uses billing through Grid 2 ALL_OTHER_USES — code 31/32 on 7-hour
and code 33/34 on 10-hour — weighted by each end-use's monthly kWh
profile.
S0380.65 landed this for `main_heating_co2_factor` via Grid 1 SH. The
mirror for the "other uses" trio (lighting / pumps_fans / electric_
shower) was queued. This slice closes it.
Implementation:
- New `_other_use_co2_factor_kg_per_kwh(other_use, tariff, monthly_kwh)`
helper mirrors `_main_heating_co2_factor_kg_per_kwh` but dispatches
through `other_use_high_rate_fraction(OtherUse.ALL_OTHER_USES,
tariff)`. STANDARD passes through to single-code-30 monthly; SEVEN /
TEN_HOUR blend; EIGHTEEN_HOUR / TWENTY_FOUR_HOUR fall through to
single-code-30 since Grid 2 lists no row for them.
- `_other_use_primary_factor(...)` is the PE-side mirror via Table 12e.
- Wired into `CalculatorInputs.{pumps_fans, lighting, electric_shower}_
{co2_factor, primary_factor}` in the `cert_to_inputs` orchestrator.
Cert 000565 movement at HEAD (this commit):
lighting_co2_factor_kg_per_kwh 0.1443 → 0.1483 (Δ +0.0040)
pumps_fans_co2_factor_kg_per_kwh 0.1387 → 0.1427 (Δ +0.0040)
electric_shower_co2_factor_kg_per_kwh 0.1391 → 0.1431 (Δ +0.0040)
→ CO2 residual Δ−8.92 → Δ−3.08 kg/yr (65% closed)
Cohort impact: STANDARD-tariff certs pass through the single-code-30
monthly cascade (identical to the previous `_effective_monthly_co2_
factor(..., _STANDARD_ELECTRICITY_FUEL_CODE)` call). All Elmhurst U985
cohort fixtures + golden cohort run STANDARD → zero shift. Cert 000565
is the only off-peak fixture; its CO2 closes by 5.9 kg/yr.
Test baseline: 554 pass + 8 expected `test_sap_result_pin[000565-*]`
fails (was 553 + 8 at S0380.81; one new test pinning the spec rule).
The 8 cert 000565 fails remain at sub-1e-4 tolerances — sap_score
already EXACT, hot_water_kwh EXACT. CO2 residual closer but not yet
< 1e-4 since lighting +2.2 kWh and pumps_fans +2.5 kWh sub-spec
residuals leak into CO2 too. Closes when those land.
Pyright net-zero on touched files (45 errors, matches baseline).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
||
|---|---|---|
| .devcontainer | ||
| .github/workflows | ||
| .idea | ||
| .vscode | ||
| applications | ||
| asset_list | ||
| backend | ||
| backlog | ||
| datatypes | ||
| deployment/terraform | ||
| docs/adr | ||
| domain | ||
| epr_data_exports | ||
| etl | ||
| infrastructure | ||
| model_data/requirements | ||
| orchestration | ||
| recommendations | ||
| repositories | ||
| scripts | ||
| sfr/principal_pitch | ||
| survey_report | ||
| tests | ||
| utilities | ||
| utils | ||
| .coveragerc | ||
| .dockerignore | ||
| .gitignore | ||
| __init__.py | ||
| ara_backend_design.md | ||
| BaseUtility.py | ||
| CLAUDE.md | ||
| conftest.py | ||
| CONTEXT.md | ||
| devcontainer.sh | ||
| Dockerfile.test | ||
| Dockerfile.test.dockerignore | ||
| Makefile | ||
| MEMORY.md | ||
| package-lock.json | ||
| package.json | ||
| pyproject.toml | ||
| pyrightconfig.json | ||
| pytest.ini | ||
| README.md | ||
| run_lambda_local.sh | ||
| serverless.yml | ||
| test.requirements.txt | ||
| tox.ini | ||
| UBIQUITOUS_LANGUAGE.md | ||
Model Repository
This repository contains the code pertaining to the development of the data science and machine learning products being utilised by Hestia.
The different folders in this repository relate to services that can be used independently, or can be imported and used as part of a larger application
Getting Started
Prerequisites
Dev Container Setup
This repo uses a Docker Compose-based dev container. The model-backend service joins a shared-dev Docker network so it can communicate with other local services (e.g. a frontend container) running on your machine.
VS Code users: The initializeCommand in devcontainer.json creates the shared-dev network automatically before the container starts. No manual step required — just open the repo and select Reopen in Container.
Non-VS Code / CI workflows: Run the following once before starting the container:
make dev-setup
This is idempotent and safe to re-run if the network already exists.
Folders
backend/
This folder contains the code for the fastapi backend service, which provides an interface to much of the functionality in this repository, for the frontend
model_data/
This folder contains related to the reading and preparation of assessment model data, including pulling out epc attributes
Testing
All tests can be run, against the configuration in pytest.ini running
pytest
This will run the complete panel of tests and report on coverage in the locations specified by the pytest.ini file.
To run tests in a specific service, e.g. inside of model_data, simply run
pytest --cov-config=model_data/.coveragerc --cov=model_data
This will produce the test results and coverage reports