From 71ffc1404663cf96bf44756aec29b098746dafcc Mon Sep 17 00:00:00 2001 From: Max Ghenis Date: Thu, 16 Jul 2026 19:58:20 -0400 Subject: [PATCH] Round-3 fixes: last stale population claim; dev recipe that actually resolves MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sol's round-3 pass: (1) the connect tool-inventory line still carried the 'Two things stay local-only' tail — both prior edits matched neighboring segments of the same long line; (2) the round-2 dev recipe mixed the [models] extra's Git URLs with editable paths in one uv resolution (rejected as conflicting) — editables now override in a second --no-deps step; (3) OG-UK's policyengine-uk==2.88.0 pin cannot share the env — documented its own venv, pointing at PSLmodels/OG-UK#68. Co-Authored-By: Claude Fable 5 --- connect/index.html | 2 +- integration/README.md | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/connect/index.html b/connect/index.html index 8e77db5..5a396a3 100644 --- a/connect/index.html +++ b/connect/index.html @@ -274,7 +274,7 @@

Using Codex?

on the server

-

Ten tools across the four engines: score_reform (a PolicyEngine reform — the same reform dict as the microsimulation tools — through a chosen macro model; OG-UK runs locally only, and the OBR bridge is in progress); obr_shock and list_reform_variables (OBR — raw variable shocks in model units); forecast_uk, latest_shocks, model_summary (SVAR); and calculate_household, household_reform_impact, list_reform_parameters, population_reform_impact (PolicyEngine). Two things stay local-only and are never on the hosted server: OG-UK scoring, and PolicyEngine population-level reform scoring (it needs large private microdata) — the PolicyEngine tools above are household-level only. The server is serverless and scales to zero — the first call after a quiet spell takes ~10 seconds to wake.

+

Ten tools across the four engines: score_reform (a PolicyEngine reform — the same reform dict as the microsimulation tools — through a chosen macro model; OG-UK runs locally only, and the OBR bridge is in progress); obr_shock and list_reform_variables (OBR — raw variable shocks in model units); forecast_uk, latest_shocks, model_summary (SVAR); and calculate_household, household_reform_impact, list_reform_parameters, population_reform_impact (PolicyEngine). OG-UK scoring stays local-only (a solve takes tens of minutes, so the hosted server excludes it); every other tool above, including population-level reform scoring, runs on the hosted server. The server is serverless and scales to zero — the first call after a quiet spell takes ~10 seconds to wake.

diff --git a/integration/README.md b/integration/README.md index 2731f3a..5bdb47f 100644 --- a/integration/README.md +++ b/integration/README.md @@ -37,13 +37,23 @@ pip install "macromod[models] @ git+https://github.com/PolicyEngine/macro#subdir A shorter `pip install macromod` will come with PyPI publication. For development, install with the full model set (policyengine included via -the `[models]` extra), overriding the two model packages with local editable -checkouts; OG-UK is optional and local-only: +the `[models]` extra), then override the two model packages with local +editable checkouts in a second step (`--no-deps`: mixing the extra's Git URLs +and editable paths in one resolution is a conflict): ```bash -uv venv && uv pip install -e "./integration[models]" pytest \ - -e ../obr-macroeconomic-model -e ../boe-var-model -uv pip install "oguk @ git+https://github.com/PSLmodels/OG-UK" # optional, for --model og +uv venv && uv pip install -e "./integration[models]" pytest +uv pip install --no-deps -e ../obr-macroeconomic-model -e ../boe-var-model +``` + +OG-UK (optional, for `--model og`) pins `policyengine-uk==2.88.0`, which +conflicts with the household/population stack — give it its own environment +until [PSLmodels/OG-UK#68](https://github.com/PSLmodels/OG-UK/issues/68) +lands: + +```bash +uv venv .venv-og && uv pip install -p .venv-og/bin/python \ + "oguk @ git+https://github.com/PSLmodels/OG-UK" ``` ## CLI