diff --git a/changelog.d/certify-uk-uk-frs-calibration-attempt-20261115T104657Z-fcfac709.changed.md b/changelog.d/certify-uk-uk-frs-calibration-attempt-20261115T104657Z-fcfac709.changed.md new file mode 100644 index 000000000..29eb464d5 --- /dev/null +++ b/changelog.d/certify-uk-uk-frs-calibration-attempt-20261115T104657Z-fcfac709.changed.md @@ -0,0 +1 @@ +Certify the Microcosm UK pair built on policyengine-uk 2.177.7 and policyengine-core 3.34.10 into the PolicyEngine bundle manifest. The national build is `uk-frs-calibration-attempt-20261115T104657Z-fcfac709` (`microcosm_uk_2024_25`, hub commit `ad84c060`). Constituency and local-authority regions route to the local-area build `uk-local-candidate-f100-s42-20261116T102715Z-e2745e59` (`microcosm_uk_2024_25_dense`, hub commit `4c594d72`). This is the first UK certificate read from Microcosm's build folders: each file is pinned at `releases///` and the commit that published it. The UK pin moves from 2.174.1 to 2.177.7, and the shared core pin from 3.33.3 to 3.34.10, which policyengine-uk 2.177.4 and later require. diff --git a/docs/households.md b/docs/households.md index 7214503f0..57007e5c8 100644 --- a/docs/households.md +++ b/docs/households.md @@ -158,7 +158,7 @@ separate benefit inputs; they do not override SPM measurement composition. These changes require the coordinated canonical country/calculator bundle, which the packaged production manifest now pins and certifies: `policyengine-us` -2.2.2, `policyengine-core` 3.33.3, `spm-calculator` 1.1.0, and the US data +2.2.2, `policyengine-core` 3.34.10, `spm-calculator` 1.1.0, and the US data release `populace-us-2024-spm-20260915`. Local-wheel development manifest fixtures remain explicitly uncertified. The measurement receipt identifies a calculation; it does not certify a population dataset or establish publication diff --git a/pyproject.toml b/pyproject.toml index 0ed87cc00..437b56916 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,17 +40,17 @@ graph = [ "networkx>=3.0", ] models = [ - "policyengine-core==3.33.3", + "policyengine-core==3.34.10", "policyengine-us==2.2.2", - "policyengine-uk==2.174.1", + "policyengine-uk==2.177.7", "spm-calculator==1.1.0", ] uk = [ - "policyengine-core==3.33.3", - "policyengine-uk==2.174.1", + "policyengine-core==3.34.10", + "policyengine-uk==2.177.7", ] us = [ - "policyengine-core==3.33.3", + "policyengine-core==3.34.10", "policyengine-us==2.2.2", "spm-calculator==1.1.0", ] @@ -70,9 +70,9 @@ dev = [ "pytest-cov>=5.0.0", "hypothesis>=6.100.0", "rfc8785>=0.1.4", - "policyengine-core==3.33.3", + "policyengine-core==3.34.10", "policyengine-us==2.2.2", - "policyengine-uk==2.174.1", + "policyengine-uk==2.177.7", "spm-calculator==1.1.0", ] diff --git a/src/policyengine/data/bundle/manifest.json b/src/policyengine/data/bundle/manifest.json index adcc4f908..7a1b051eb 100644 --- a/src/policyengine/data/bundle/manifest.json +++ b/src/policyengine/data/bundle/manifest.json @@ -16,31 +16,31 @@ }, "data_releases": { "uk": { - "build_id": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", + "build_id": "uk-frs-calibration-attempt-20261115T104657Z-fcfac709", "bundle_id": "uk-6.20.0", "certification": { - "built_with_model_version": "2.174.1", + "built_with_model_version": "2.177.7", "certified_by": "policyengine.py bundle certification", - "certified_for_model_version": "2.174.1", + "certified_for_model_version": "2.177.7", "compatibility_basis": "built_with_model_package", "core_binding": "bundle_pin", - "data_build_id": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e" + "data_build_id": "uk-frs-calibration-attempt-20261115T104657Z-fcfac709" }, "certified_data_artifact": { - "build_id": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", + "build_id": "uk-frs-calibration-attempt-20261115T104657Z-fcfac709", "data_package": { "name": "microcosm-data", "version": "0.1.0" }, "dataset": "microcosm_uk_2024_25", - "sha256": "0a9b77db1c0dee2693cb2d47bad68da34cb662916eee4829942bcd45de581f25", - "uri": "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5@microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e" + "sha256": "301d2fe5e7805c5a6242b37843cb118445aefd59a0593833362ab5a6e2f9ba90", + "uri": "hf://policyengine/populace-uk-private/releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/microcosm_uk_2024_25.h5@ad84c0602ed28f694ef52662eb9b063779e4e923" }, "country_id": "uk", "data_package": { "name": "microcosm-data", - "release_manifest_path": "releases/microcosm-uk-2024-25-national/release_manifest.json", - "release_manifest_revision": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", + "release_manifest_path": "releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/release_manifest.json", + "release_manifest_revision": "ad84c0602ed28f694ef52662eb9b063779e4e923", "repo_id": "policyengine/populace-uk-private", "repo_type": "dataset", "version": "0.1.0" @@ -48,89 +48,89 @@ "data_producer": "populace", "datasets": { "calibration_diagnostics": { - "path": "releases/microcosm-uk-2024-25-national/calibration_diagnostics.json", + "path": "releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/calibration_diagnostics.json", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", - "sha256": "7b9685d835db96ad1f687a9407333bdb35c6bc8d1053cbdff12276c7bc5b6a65" + "revision": "ad84c0602ed28f694ef52662eb9b063779e4e923", + "sha256": "f9d7f4a45f641c27e39027532cd55ac09f03e1a0cecfe07a057f04b1ddb1276a" }, "microcosm_uk_2024_25": { - "path": "microcosm_uk_2024_25.h5", + "path": "releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/microcosm_uk_2024_25.h5", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", - "sha256": "0a9b77db1c0dee2693cb2d47bad68da34cb662916eee4829942bcd45de581f25" + "revision": "ad84c0602ed28f694ef52662eb9b063779e4e923", + "sha256": "301d2fe5e7805c5a6242b37843cb118445aefd59a0593833362ab5a6e2f9ba90" }, "microcosm_uk_2024_25_calibration": { - "path": "microcosm_uk_2024_25_calibration.npz", + "path": "releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/microcosm_uk_2024_25_calibration.npz", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", - "sha256": "e94ce3f42a5e35d112320b9413545e32c584cb1b302b050e461bf2dfe679f4fb" + "revision": "ad84c0602ed28f694ef52662eb9b063779e4e923", + "sha256": "d39544332e17154f97342bf443d79a72698cf82ba83a6ef41de98fb944b62d69" }, "microcosm_uk_2024_25_dense": { - "path": "microcosm_uk_2024_25_dense.h5", + "path": "releases/microcosm-uk-2024-25-dense/uk-local-candidate-f100-s42-20261116T102715Z-e2745e59/microcosm_uk_2024_25_dense.h5", "repo_id": "policyengine/populace-uk-private", "repo_type": "dataset", - "revision": "microcosm-uk-2024-25-dense-20261107T173210Z-38605444", - "sha256": "1b71c5c93f47f497b25ec106d3e13017af6e0c41d808cc7db74f4e0a0dff4bf4" + "revision": "4c594d7243fdaec8913ef2543207f1d0934174ab", + "sha256": "436a680b336106b5bf68f766daa8798c903dee701441b2acc67cb57a6da308b8" }, "release_certification": { - "path": "releases/microcosm-uk-2024-25-national/release_certification.json", + "path": "releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/release_certification.json", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", - "sha256": "9bab3aef310183665adb1c7d1ae4a61ef41d21868059535b0c5801fcc6f87dee" + "revision": "ad84c0602ed28f694ef52662eb9b063779e4e923", + "sha256": "f1c925ade94ee48a7846ed14f1d06deab5fbf08315eb756eb3c534777564a4d0" }, "release_cut_gates": { - "path": "releases/microcosm-uk-2024-25-national/release_cut_gates.json", + "path": "releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/release_cut_gates.json", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", - "sha256": "ba6f2efd7c391453eebd48fc02be936dd9d78dbf165f57bc2d52de70846ae000" + "revision": "ad84c0602ed28f694ef52662eb9b063779e4e923", + "sha256": "ecb9be159aed8ac7b98f7f45b350382d493b8c0a47a993d91eee9c5ff0d7ae58" }, - "score_vs_enhanced_frs": { - "path": "releases/microcosm-uk-2024-25-national/score_vs_enhanced_frs.json", + "score_vs_reference": { + "path": "releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/score_vs_reference.json", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", - "sha256": "2b0564603174cc3aeb45b1dc02fd4dcb14dacbf414a5980ae719cd9cafb2d73c" + "revision": "ad84c0602ed28f694ef52662eb9b063779e4e923", + "sha256": "43751f8c625fd3214a0e3bc4f34615522733cfccf9958891def081b766dba310" }, "spine_gates": { - "path": "releases/microcosm-uk-2024-25-national/spine_gates.json", + "path": "releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/spine_gates.json", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", - "sha256": "3708c3314f7ca975b76d9edf96a8dc0777624945cbc7c04e6680aa6d0253a6c7" + "revision": "ad84c0602ed28f694ef52662eb9b063779e4e923", + "sha256": "dc24a2c42359fcaf7e7d57a7fd9cf257a3520ab00c50353c7a365bddac7c2904" }, "terminal_gates": { - "path": "releases/microcosm-uk-2024-25-national/terminal_gates.json", + "path": "releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/terminal_gates.json", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", - "sha256": "a647f8c0ee510044acd962377d71a16f917e4bf7ae66ca63946aac332a0806a0" + "revision": "ad84c0602ed28f694ef52662eb9b063779e4e923", + "sha256": "ddb647f23f1ce8cd069e949fcf2abd7fb32c5d521e8d1392ab42923403e6e5a5" } }, "default_dataset": "microcosm_uk_2024_25", - "default_dataset_uri": "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5@microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", + "default_dataset_uri": "hf://policyengine/populace-uk-private/releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/microcosm_uk_2024_25.h5@ad84c0602ed28f694ef52662eb9b063779e4e923", "model_package": { "name": "policyengine-uk", - "sha256": "1d4d17c74bd5b853a148e9c44b080490dd0393725fe18b2b82ec55eecdb9bb58", - "version": "2.174.1", - "wheel_url": "https://files.pythonhosted.org/packages/35/ed/5ea303be2fd38da4e5f9b9a3fd012a5f9454fd5ef66a1df26c3267fb57a8/policyengine_uk-2.174.1-py3-none-any.whl" + "sha256": "8a8693095e909be36a622ac00b3212215a3577daf413d004321f3f07ec6c1347", + "version": "2.177.7", + "wheel_url": "https://files.pythonhosted.org/packages/38/d3/29440b5fd3bb08d2844b5d41a1c90c204c2fd8f03b6825c5577438ea54d1/policyengine_uk-2.177.7-py3-none-any.whl" }, "policyengine_version": "6.20.0", "region_datasets": { "constituency": { - "path_template": "microcosm_uk_2024_25_dense.h5" + "path_template": "releases/microcosm-uk-2024-25-dense/uk-local-candidate-f100-s42-20261116T102715Z-e2745e59/microcosm_uk_2024_25_dense.h5" }, "local_authority": { - "path_template": "microcosm_uk_2024_25_dense.h5" + "path_template": "releases/microcosm-uk-2024-25-dense/uk-local-candidate-f100-s42-20261116T102715Z-e2745e59/microcosm_uk_2024_25_dense.h5" }, "national": { - "path_template": "microcosm_uk_2024_25.h5" + "path_template": "releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/microcosm_uk_2024_25.h5" } }, "regional_release_kind": "local_area", - "regional_release_manifest_uri": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-dense-20261107T173210Z-38605444/releases/microcosm-uk-2024-25-dense/release_manifest.json", - "regional_source_manifest_sha256": "99d9afb3799cab9df845fef8fb187f6b19241ab6c61711ed298ca365dd4f71c7", - "regional_source_manifest_uri": "hf://dataset/policyengine/populace-uk-private@microcosm-uk-2024-25-dense-20261107T173210Z-38605444/releases/microcosm-uk-2024-25-dense/release_manifest.json", - "release_manifest_uri": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e/releases/microcosm-uk-2024-25-national/release_manifest.json", + "regional_release_manifest_uri": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/4c594d7243fdaec8913ef2543207f1d0934174ab/releases/microcosm-uk-2024-25-dense/uk-local-candidate-f100-s42-20261116T102715Z-e2745e59/release_manifest.json", + "regional_source_manifest_sha256": "0395d6e895f8627a5943a912aef8a6e5d3da17ceddd378c4a8f44cebe7f17bf9", + "regional_source_manifest_uri": "hf://dataset/policyengine/populace-uk-private@4c594d7243fdaec8913ef2543207f1d0934174ab/releases/microcosm-uk-2024-25-dense/uk-local-candidate-f100-s42-20261116T102715Z-e2745e59/release_manifest.json", + "release_manifest_uri": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/ad84c0602ed28f694ef52662eb9b063779e4e923/releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/release_manifest.json", "schema_version": 1, - "source_manifest_uri": "hf://dataset/policyengine/populace-uk-private@microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e/releases/microcosm-uk-2024-25-national/release_manifest.json", - "version": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e" + "source_manifest_uri": "hf://dataset/policyengine/populace-uk-private@ad84c0602ed28f694ef52662eb9b063779e4e923/releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/release_manifest.json", + "version": "uk-frs-calibration-attempt-20261115T104657Z-fcfac709" }, "us": { "build_id": "populace-us-2024-spm-20260915", @@ -15899,18 +15899,18 @@ }, "policyengine-core": { "import_name": "policyengine_core", - "install_requirement": "policyengine-core==3.33.3", + "install_requirement": "policyengine-core==3.34.10", "name": "policyengine-core", "role": "runtime_dependency", - "version": "3.33.3" + "version": "3.34.10" }, "policyengine-uk": { "country": "uk", "import_name": "policyengine_uk", - "install_requirement": "policyengine-uk==2.174.1", + "install_requirement": "policyengine-uk==2.177.7", "name": "policyengine-uk", "role": "country_model", - "version": "2.174.1" + "version": "2.177.7" }, "policyengine-us": { "country": "us", diff --git a/src/policyengine/data/bundle/uk.trace.tro.jsonld b/src/policyengine/data/bundle/uk.trace.tro.jsonld index 820094f36..40a521dc6 100644 --- a/src/policyengine/data/bundle/uk.trace.tro.jsonld +++ b/src/policyengine/data/bundle/uk.trace.tro.jsonld @@ -17,7 +17,7 @@ "schema:name": "PolicyEngine", "schema:url": "https://policyengine.org" }, - "schema:dateCreated": "2026-11-07T03:22:40.126887+00:00", + "schema:dateCreated": "2026-11-15T13:42:23.452413+00:00", "schema:description": "TRACE TRO for certified runtime bundle uk-6.20.0 covering the bundle manifest, the certified dataset artifact, the country model wheel, and the country data release manifest when it is available.", "schema:name": "policyengine uk certified bundle TRO", "trov:createdWith": { @@ -45,7 +45,7 @@ "trov:hasArtifact": { "@id": "composition/1/artifact/data_release_manifest" }, - "trov:hasLocation": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e/releases/microcosm-uk-2024-25-national/release_manifest.json" + "trov:hasLocation": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/ad84c0602ed28f694ef52662eb9b063779e4e923/releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/release_manifest.json" }, { "@id": "arrangement/1/location/dataset", @@ -53,7 +53,7 @@ "trov:hasArtifact": { "@id": "composition/1/artifact/dataset" }, - "trov:hasLocation": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e/microcosm_uk_2024_25.h5" + "trov:hasLocation": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/ad84c0602ed28f694ef52662eb9b063779e4e923/releases/microcosm-uk-2024-25-national/uk-frs-calibration-attempt-20261115T104657Z-fcfac709/microcosm_uk_2024_25.h5" }, { "@id": "arrangement/1/location/model_wheel", @@ -61,7 +61,7 @@ "trov:hasArtifact": { "@id": "composition/1/artifact/model_wheel" }, - "trov:hasLocation": "https://files.pythonhosted.org/packages/35/ed/5ea303be2fd38da4e5f9b9a3fd012a5f9454fd5ef66a1df26c3267fb57a8/policyengine_uk-2.174.1-py3-none-any.whl" + "trov:hasLocation": "https://files.pythonhosted.org/packages/38/d3/29440b5fd3bb08d2844b5d41a1c90c204c2fd8f03b6825c5577438ea54d1/policyengine_uk-2.177.7-py3-none-any.whl" } ] } @@ -75,51 +75,51 @@ "@type": "trov:ResearchArtifact", "schema:name": "policyengine.py bundle manifest for uk", "trov:mimeType": "application/json", - "trov:sha256": "e8e7189903d5bf5990d5da7771720746cd0442f133a8c692e30d6493098b1fe3" + "trov:sha256": "53a05dc9084454cc26a8bad97f0e8fb92cacca7508ac489fbfac306e7bc08683" }, { "@id": "composition/1/artifact/data_release_manifest", "@type": "trov:ResearchArtifact", "schema:name": "microcosm-data release manifest 0.1.0", "trov:mimeType": "application/json", - "trov:sha256": "58b47e8d1b1c2e53a93a59380a7b3ba2a50774226e814eaa9a1e536f43eb4946" + "trov:sha256": "e5021148353cd7511679c4cda9bccd2464ffe759691b63693dd28937000af33c" }, { "@id": "composition/1/artifact/dataset", "@type": "trov:ResearchArtifact", "schema:name": "microcosm_uk_2024_25", "trov:mimeType": "application/x-hdf5", - "trov:sha256": "0a9b77db1c0dee2693cb2d47bad68da34cb662916eee4829942bcd45de581f25" + "trov:sha256": "301d2fe5e7805c5a6242b37843cb118445aefd59a0593833362ab5a6e2f9ba90" }, { "@id": "composition/1/artifact/model_wheel", "@type": "trov:ResearchArtifact", - "schema:name": "policyengine-uk==2.174.1 wheel", + "schema:name": "policyengine-uk==2.177.7 wheel", "trov:mimeType": "application/zip", - "trov:sha256": "1d4d17c74bd5b853a148e9c44b080490dd0393725fe18b2b82ec55eecdb9bb58" + "trov:sha256": "8a8693095e909be36a622ac00b3212215a3577daf413d004321f3f07ec6c1347" } ], "trov:hasFingerprint": { "@id": "composition/1/fingerprint", "@type": "trov:CompositionFingerprint", - "trov:sha256": "890f9948e8ffdce4113b491f2d3fede49abcee1b772bc55809a2227ac5325234" + "trov:sha256": "61cc85b43d5360aeb0daa9d373d9375858cd6169e727f781e84af52080f930b2" } }, "trov:hasPerformance": { "@id": "trp/1", "@type": "trov:TransparentResearchPerformance", - "pe:builtWithModelVersion": "2.174.1", + "pe:builtWithModelVersion": "2.177.7", "pe:certifiedBy": "policyengine.py bundle certification", - "pe:certifiedForModelVersion": "2.174.1", + "pe:certifiedForModelVersion": "2.177.7", "pe:compatibilityBasis": "built_with_model_package", "pe:coreBinding": "bundle_pin", - "pe:dataBuildId": "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e", + "pe:dataBuildId": "uk-frs-calibration-attempt-20261115T104657Z-fcfac709", "pe:emittedIn": "repository-bundle", - "rdfs:comment": "Certification of build microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e for policyengine-uk 2.174.1.", + "rdfs:comment": "Certification of build uk-frs-calibration-attempt-20261115T104657Z-fcfac709 for policyengine-uk 2.177.7.", "trov:accessedArrangement": { "@id": "arrangement/1" }, - "trov:startedAtTime": "2026-11-07T03:22:40.126887+00:00", + "trov:startedAtTime": "2026-11-15T13:42:23.452413+00:00", "trov:wasConductedBy": { "@id": "trs" } diff --git a/src/policyengine/data/bundle/us.trace.tro.jsonld b/src/policyengine/data/bundle/us.trace.tro.jsonld index a50f724a6..2b86ff0fc 100644 --- a/src/policyengine/data/bundle/us.trace.tro.jsonld +++ b/src/policyengine/data/bundle/us.trace.tro.jsonld @@ -74,7 +74,7 @@ "@type": "trov:ResearchArtifact", "schema:name": "policyengine.py bundle manifest for us", "trov:mimeType": "application/json", - "trov:sha256": "e8e7189903d5bf5990d5da7771720746cd0442f133a8c692e30d6493098b1fe3" + "trov:sha256": "53a05dc9084454cc26a8bad97f0e8fb92cacca7508ac489fbfac306e7bc08683" }, { "@id": "composition/1/artifact/data_release_manifest", @@ -101,7 +101,7 @@ "trov:hasFingerprint": { "@id": "composition/1/fingerprint", "@type": "trov:CompositionFingerprint", - "trov:sha256": "b0082ad4a3e62903af6beaac8556f61b93c2620619484bc43a0982599a54913b" + "trov:sha256": "7dc0d3641ba8c70ad5a9f354d0a7f6b709832ba69512cdf394000b321d31df08" } }, "trov:hasPerformance": { diff --git a/tests/fixtures/household_calculator_snapshots/uk_model_surface.json b/tests/fixtures/household_calculator_snapshots/uk_model_surface.json index 34ef7956d..7a0d45f98 100644 --- a/tests/fixtures/household_calculator_snapshots/uk_model_surface.json +++ b/tests/fixtures/household_calculator_snapshots/uk_model_surface.json @@ -5,7 +5,7 @@ "has_income_tax": true, "has_region_registry": true, "model_package_name": "policyengine-uk", - "num_parameters_bucketed_100s": 48, + "num_parameters_bucketed_100s": 50, "num_variables_bucketed_100s": 14, "region_registry_country": "uk" } diff --git a/tests/test_bundle.py b/tests/test_bundle.py index 6c1f82a7c..11b1bc022 100644 --- a/tests/test_bundle.py +++ b/tests/test_bundle.py @@ -40,11 +40,11 @@ def test_bundle_manifest_exposes_data_releases(): # producer label names the strict verification contract, not the producing # repo. assert manifest["data_releases"]["uk"]["data_producer"] == "populace" - assert manifest["data_releases"]["uk"]["version"].startswith( - "microcosm-uk-2024-25-national-" - ) + uk_build = manifest["data_releases"]["uk"]["version"] + assert uk_build == manifest["data_releases"]["uk"]["certification"]["data_build_id"] assert manifest["data_releases"]["uk"]["default_dataset_uri"].startswith( - "hf://policyengine/populace-uk-private/microcosm_uk_" + "hf://policyengine/populace-uk-private/releases/microcosm-uk-2024-25-national/" + f"{uk_build}/microcosm_uk_" ) @@ -95,7 +95,9 @@ def test_selected_dataset_plan_uses_certified_release_metadata(tmp_path): assert plan.country_id == "uk" assert plan.data_package_name == "microcosm-data" assert plan.repo_type == "dataset" - assert plan.destination == tmp_path / "microcosm_uk_2024_25.h5" + # A build-folder file keeps its folder under the data directory. + assert plan.destination == tmp_path / release["datasets"][plan.dataset]["path"] + assert plan.destination.name == "microcosm_uk_2024_25.h5" assert plan.sha256 == release["datasets"][plan.dataset]["sha256"] diff --git a/tests/test_bundle_metadata.py b/tests/test_bundle_metadata.py index 74b744b68..09edab563 100644 --- a/tests/test_bundle_metadata.py +++ b/tests/test_bundle_metadata.py @@ -69,7 +69,12 @@ def test_bundle_manifest_carries_uk_data_release(): assert release["data_package"]["name"] == "microcosm-data" assert release["data_package"]["repo_type"] == "dataset" assert release["default_dataset"] == "microcosm_uk_2024_25" - assert release["version"].startswith("microcosm-uk-2024-25-national-") + # A build-folder certificate names the build: its manifest sits in the + # build's own folder of the national release. + assert release["version"] == release["certification"]["data_build_id"] + assert release["data_package"]["release_manifest_path"] == ( + f"releases/microcosm-uk-2024-25-national/{release['version']}/release_manifest.json" + ) assert release["default_dataset_uri"].startswith( "hf://policyengine/populace-uk-private/" ) diff --git a/tests/test_models.py b/tests/test_models.py index b7e74c683..5c2302034 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -43,13 +43,14 @@ def test_has_release_manifest_metadata(self): assert uk_latest.release_manifest is not None assert uk_latest.release_manifest.country_id == "uk" assert uk_latest.model_package.name == "policyengine-uk" - assert uk_latest.model_package.version == "2.174.1" + assert uk_latest.model_package.version == "2.177.7" assert uk_latest.data_package.name == "microcosm-data" assert uk_latest.data_package.version == "0.1.0" assert ( uk_latest.default_dataset_uri - == "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5" - "@microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e" + == "hf://policyengine/populace-uk-private/releases/microcosm-uk-2024-25-national/" + "uk-frs-calibration-attempt-20261115T104657Z-fcfac709/microcosm_uk_2024_25.h5" + "@ad84c0602ed28f694ef52662eb9b063779e4e923" ) def test_has_hundreds_of_parameters(self): diff --git a/tests/test_release_manifests.py b/tests/test_release_manifests.py index a0d2612c1..fb2023d71 100644 --- a/tests/test_release_manifests.py +++ b/tests/test_release_manifests.py @@ -83,13 +83,16 @@ US_LOCAL_AREA_DATASET_URI = ( f"hf://policyengine/populace-us/{US_LOCAL_AREA_PATH}@{US_LOCAL_AREA_REVISION}" ) -UK_MODEL_VERSION = "2.174.1" -UK_BUILT_WITH_MODEL_VERSION = "2.174.1" +UK_MODEL_VERSION = "2.177.7" +UK_BUILT_WITH_MODEL_VERSION = "2.177.7" UK_DATA_RELEASE_VERSION = "0.1.0" -UK_DATA_RELEASE_ID = "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e" -UK_DATA_RELEASE_REVISION = "microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e" -UK_DATA_RELEASE_PATH = "releases/microcosm-uk-2024-25-national/release_manifest.json" -UK_LOCAL_AREA_RELEASE_ID = "microcosm-uk-2024-25-dense-20261107T173210Z-38605444" +UK_DATA_RELEASE_ID = "uk-frs-calibration-attempt-20261115T104657Z-fcfac709" +UK_DATA_RELEASE_REVISION = "ad84c0602ed28f694ef52662eb9b063779e4e923" +UK_DATA_RELEASE_PATH = ( + f"releases/microcosm-uk-2024-25-national/{UK_DATA_RELEASE_ID}/release_manifest.json" +) +UK_LOCAL_AREA_RELEASE_ID = "uk-local-candidate-f100-s42-20261116T102715Z-e2745e59" +UK_LOCAL_AREA_RELEASE_REVISION = "4c594d7243fdaec8913ef2543207f1d0934174ab" # The prior certified default (policyengine-uk-data 1.58.1), kept resolvable # via dataset_overlays. UK_EFRS_DATASET_URI = ( @@ -106,12 +109,13 @@ ) UK_CERTIFICATION_SOURCE = "policyengine.py bundle certification" UK_CERTIFIED_DATASET_URI = ( - "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5" - f"@{UK_DATA_RELEASE_ID}" + "hf://policyengine/populace-uk-private/releases/microcosm-uk-2024-25-national/" + f"{UK_DATA_RELEASE_ID}/microcosm_uk_2024_25.h5@{UK_DATA_RELEASE_REVISION}" ) UK_LOCAL_AREA_DATASET_URI = ( - "hf://policyengine/populace-uk-private/microcosm_uk_2024_25_dense.h5" - f"@{UK_LOCAL_AREA_RELEASE_ID}" + "hf://policyengine/populace-uk-private/releases/microcosm-uk-2024-25-dense/" + f"{UK_LOCAL_AREA_RELEASE_ID}/microcosm_uk_2024_25_dense.h5" + f"@{UK_LOCAL_AREA_RELEASE_REVISION}" ) @@ -357,9 +361,18 @@ def test__given_uk_manifest__then_area_regions_route_to_local_release(self): region_type: template.path_template for region_type, template in manifest.region_datasets.items() } == { - "national": "microcosm_uk_2024_25.h5", - "constituency": "microcosm_uk_2024_25_dense.h5", - "local_authority": "microcosm_uk_2024_25_dense.h5", + "national": ( + "releases/microcosm-uk-2024-25-national/" + f"{UK_DATA_RELEASE_ID}/microcosm_uk_2024_25.h5" + ), + "constituency": ( + "releases/microcosm-uk-2024-25-dense/" + f"{UK_LOCAL_AREA_RELEASE_ID}/microcosm_uk_2024_25_dense.h5" + ), + "local_authority": ( + "releases/microcosm-uk-2024-25-dense/" + f"{UK_LOCAL_AREA_RELEASE_ID}/microcosm_uk_2024_25_dense.h5" + ), } assert ( resolve_dataset_reference("uk", "microcosm_uk_2024_25_dense") diff --git a/tests/test_uk_regions.py b/tests/test_uk_regions.py index 82258aa84..b885faf6b 100644 --- a/tests/test_uk_regions.py +++ b/tests/test_uk_regions.py @@ -23,12 +23,14 @@ # The certified bundle's national dataset, and the Microcosm local-area # release its constituency and local-authority regions are routed to. UK_CERTIFIED_NATIONAL_URI = ( - "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5" - "@microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e" + "hf://policyengine/populace-uk-private/releases/microcosm-uk-2024-25-national/" + "uk-frs-calibration-attempt-20261115T104657Z-fcfac709/microcosm_uk_2024_25.h5" + "@ad84c0602ed28f694ef52662eb9b063779e4e923" ) UK_CERTIFIED_LOCAL_AREA_URI = ( - "hf://policyengine/populace-uk-private/microcosm_uk_2024_25_dense.h5" - "@microcosm-uk-2024-25-dense-20261107T173210Z-38605444" + "hf://policyengine/populace-uk-private/releases/microcosm-uk-2024-25-dense/" + "uk-local-candidate-f100-s42-20261116T102715Z-e2745e59/microcosm_uk_2024_25_dense.h5" + "@4c594d7243fdaec8913ef2543207f1d0934174ab" ) UK_AREA_REGION_COUNT = 650 + 361 diff --git a/uv.lock b/uv.lock index 5adf42166..b5c96c158 100644 --- a/uv.lock +++ b/uv.lock @@ -1890,13 +1890,13 @@ requires-dist = [ { name = "pandas", specifier = ">=2.0.0" }, { name = "plotly", marker = "extra == 'dev'", specifier = ">=5.0.0" }, { name = "plotly", marker = "extra == 'plotting'", specifier = ">=5.0.0" }, - { name = "policyengine-core", marker = "extra == 'dev'", specifier = "==3.33.3" }, - { name = "policyengine-core", marker = "extra == 'models'", specifier = "==3.33.3" }, - { name = "policyengine-core", marker = "extra == 'uk'", specifier = "==3.33.3" }, - { name = "policyengine-core", marker = "extra == 'us'", specifier = "==3.33.3" }, - { name = "policyengine-uk", marker = "extra == 'dev'", specifier = "==2.174.1" }, - { name = "policyengine-uk", marker = "extra == 'models'", specifier = "==2.174.1" }, - { name = "policyengine-uk", marker = "extra == 'uk'", specifier = "==2.174.1" }, + { name = "policyengine-core", marker = "extra == 'dev'", specifier = "==3.34.10" }, + { name = "policyengine-core", marker = "extra == 'models'", specifier = "==3.34.10" }, + { name = "policyengine-core", marker = "extra == 'uk'", specifier = "==3.34.10" }, + { name = "policyengine-core", marker = "extra == 'us'", specifier = "==3.34.10" }, + { name = "policyengine-uk", marker = "extra == 'dev'", specifier = "==2.177.7" }, + { name = "policyengine-uk", marker = "extra == 'models'", specifier = "==2.177.7" }, + { name = "policyengine-uk", marker = "extra == 'uk'", specifier = "==2.177.7" }, { name = "policyengine-us", marker = "extra == 'dev'", specifier = "==2.2.2" }, { name = "policyengine-us", marker = "extra == 'models'", specifier = "==2.2.2" }, { name = "policyengine-us", marker = "extra == 'us'", specifier = "==2.2.2" }, @@ -1918,7 +1918,7 @@ provides-extras = ["plotting", "graph", "models", "uk", "us", "dev"] [[package]] name = "policyengine-core" -version = "3.33.3" +version = "3.34.10" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "dpath" }, @@ -1939,14 +1939,14 @@ dependencies = [ { name = "standard-imghdr" }, { name = "wheel" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/17/af/e8449e8a488468e5ce28b6b9066a2372e05bc7971ad9a441eb4e6efbb740/policyengine_core-3.33.3.tar.gz", hash = "sha256:7da78ae9cc7b1d6833dc30651a0a4775edd2d5e205a73bbafcc0b15c988c880e", size = 693203, upload-time = "2026-10-12T20:53:17.299Z" } +sdist = { url = "https://files.pythonhosted.org/packages/39/15/8526adf38be5c96324f458886a2622704daec39b7e487899a7e922e299eb/policyengine_core-3.34.10.tar.gz", hash = "sha256:d232ddc415c3fa65bad31c0be25ff0f2c5826a5ae4cae10a47e6cd0a2102931d", size = 779988, upload-time = "2026-11-08T01:59:34.917Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c8/d6/253cc99d853e36996f264138f4f8a2c662047da3eda8e37ddf39959397fc/policyengine_core-3.33.3-py3-none-any.whl", hash = "sha256:5847d9938412095fe9848c2ce535838a7dc8fac9238d8fd9e6c9d0a0648e0888", size = 301905, upload-time = "2026-10-12T20:53:15.706Z" }, + { url = "https://files.pythonhosted.org/packages/ef/2e/b92cc4271bd5d02cc7830201316514cef91128861074cc5e06d6ac3c3dd2/policyengine_core-3.34.10-py3-none-any.whl", hash = "sha256:5045ed5e4d157eefab22bd285c8ba09e107f5c3a5a61e380fc2a85163259982a", size = 311145, upload-time = "2026-11-08T01:59:32.984Z" }, ] [[package]] name = "policyengine-uk" -version = "2.174.1" +version = "2.177.7" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "microdf-python" }, @@ -1954,9 +1954,9 @@ dependencies = [ { name = "pydantic" }, { name = "tables" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/be/3a/fbf290895263fd4f8394f76fe1694e90e2c7b8b51a5a18f45f9bda16a4e2/policyengine_uk-2.174.1.tar.gz", hash = "sha256:c8302686c4d7c6fa92fb87febe1ad8130b7a0dd7987d5b14104384bd171f2245", size = 4434552, upload-time = "2026-11-04T07:36:05.319Z" } +sdist = { url = "https://files.pythonhosted.org/packages/52/43/1838e81e296fcaa5b817ebeafb21d1ef0867e265f70e13cd293fc8fa250a/policyengine_uk-2.177.7.tar.gz", hash = "sha256:f5ac7f95142f0bbf382459813d9899339ba69883421d24332274ef5537820964", size = 5026546, upload-time = "2026-11-10T16:33:19.136Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/35/ed/5ea303be2fd38da4e5f9b9a3fd012a5f9454fd5ef66a1df26c3267fb57a8/policyengine_uk-2.174.1-py3-none-any.whl", hash = "sha256:1d4d17c74bd5b853a148e9c44b080490dd0393725fe18b2b82ec55eecdb9bb58", size = 6313656, upload-time = "2026-11-04T07:36:02.964Z" }, + { url = "https://files.pythonhosted.org/packages/38/d3/29440b5fd3bb08d2844b5d41a1c90c204c2fd8f03b6825c5577438ea54d1/policyengine_uk-2.177.7-py3-none-any.whl", hash = "sha256:8a8693095e909be36a622ac00b3212215a3577daf413d004321f3f07ec6c1347", size = 7063207, upload-time = "2026-11-10T16:33:16.375Z" }, ] [[package]]